Skip to content

Commit

Permalink
Add compiled state integrity tests for several modules (finos#3190)
Browse files Browse the repository at this point in the history
* Fix typos in names of compiled state integrity tests

* Clean up compiled state integrity test for core

* Add compiled state integrity test for core_diagram_metamodel

* Add compiled state integrity test for core_diagram

* Add compiled state integrity test for core_external_language_java

* Add compiled state integrity test for core_external_language_java_feature_based_generation

* Add compiled state integrity test for core_java_platform_binding

* Add compiled state integrity test for core_java_platform_binding_external_format

* Add compiled state integrity test for core_external_format_json

* Add compiled state integrity test for core_external_format_json_java_platform_binding

* Add compiled state integrity test for core_text_metamodel

* Add compiled state integrity test for core_external_format_xml

* Add compiled state integrity test for core_external_format_xml_java_platform_binding
  • Loading branch information
kevin-m-knight-gs authored Oct 22, 2024
1 parent 2c326f2 commit a4b22af
Show file tree
Hide file tree
Showing 28 changed files with 567 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@
<artifactId>legend-engine-pure-runtime-java-extension-compiled-functions-unclassified</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>
</plugin>
</plugins>
Expand Down Expand Up @@ -251,14 +250,6 @@
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-runtime-java-engine-compiled</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.finos.legend.pure</groupId>-->
<!-- <artifactId>legend-pure-runtime-java-engine-shared</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.finos.legend.pure</groupId>-->
<!-- <artifactId>legend-pure-runtime-java-extension-shared-functions-conversion</artifactId>-->
<!-- </dependency>-->

<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -303,16 +294,7 @@
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-java-extension-compiled-functions-json</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.finos.legend.engine</groupId>-->
<!-- <artifactId>legend-engine-pure-platform-store-relational-java</artifactId>-->
<!-- </dependency>-->


<!-- <dependency>-->
<!-- <groupId>org.finos.legend.pure</groupId>-->
<!-- <artifactId>legend-pure-runtime-java-extension-functions</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-runtime-java-extension-compiled-store-relational</artifactId>
Expand Down Expand Up @@ -444,14 +426,19 @@
<configuration>
<target name="protocol">
<copy todir="${basedir}/src/main/resources/${folderBindingPath}/${protocol.TargetVersion}">
<fileset dir="${basedir}/src/main/resources/${folderBindingPath}/${protocol.SourceVersion}" />
<fileset
dir="${basedir}/src/main/resources/${folderBindingPath}/${protocol.SourceVersion}"/>
</copy>
<replace dir="${basedir}/src/main/resources/${folderBindingPath}/${protocol.TargetVersion}" token="${protocol.SourceVersion}" value="${protocol.TargetVersion}" />
<copy todir="${basedir}/src/main/resources/${folderCorePath}/${protocol.TargetVersion}">
<fileset dir="${basedir}/src/main/resources/${folderCorePath}/${protocol.SourceVersion}" />
<replace
dir="${basedir}/src/main/resources/${folderBindingPath}/${protocol.TargetVersion}"
token="${protocol.SourceVersion}" value="${protocol.TargetVersion}"/>
<copy todir="${basedir}/src/main/resources/${folderCorePath}/${protocol.TargetVersion}">
<fileset
dir="${basedir}/src/main/resources/${folderCorePath}/${protocol.SourceVersion}"/>
</copy>
<replace dir="${basedir}/src/main/resources/${folderCorePath}/${protocol.TargetVersion}" token="${protocol.SourceVersion}" value="${protocol.TargetVersion}" />

<replace
dir="${basedir}/src/main/resources/${folderCorePath}/${protocol.TargetVersion}"
token="${protocol.SourceVersion}" value="${protocol.TargetVersion}"/>
</target>
</configuration>
</execution>
Expand All @@ -461,9 +448,4 @@
</build>
</profile>
</profiles>





</project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@

package org.finos.legend.engine.pure.code.core;

import org.finos.legend.pure.m3.serialization.filesystem.repository.CodeRepositoryProviderHelper;
import org.finos.legend.pure.m3.serialization.filesystem.usercodestorage.MutableRepositoryCodeStorage;
import org.finos.legend.pure.m3.serialization.filesystem.usercodestorage.classpath.ClassLoaderCodeStorage;
import org.finos.legend.pure.m3.serialization.filesystem.usercodestorage.composite.CompositeCodeStorage;
import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
Expand All @@ -28,8 +24,7 @@ public class TestCoreCompiledStateIntegrity extends AbstractCompiledStateIntegri
@BeforeClass
public static void initialize()
{
MutableRepositoryCodeStorage codeStorage = new CompositeCodeStorage(new ClassLoaderCodeStorage(CodeRepositoryProviderHelper.findCodeRepositories()));
initialize(codeStorage);
initialize("core");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestFunctionsJsonCompiledStateStrategy extends AbstractCompiledStateIntegrityTest
public class TestFunctionsJsonCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestFunctionsRelationCompiledStateStrategy extends AbstractCompiledStateIntegrityTest
public class TestFunctionsRelationCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_functions_relation");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestFunctionsStandardCompiledStateStrategy extends AbstractCompiledStateIntegrityTest
public class TestFunctionsStandardCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_functions_standard");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestFunctionsUnclassifiedCompiledStateStrategy extends AbstractCompiledStateIntegrityTest
public class TestFunctionsUnclassifiedCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_functions_unclassified");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-mapping-grammar</artifactId>
<version>${legend.pure.version}</version>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
Expand All @@ -109,6 +104,11 @@
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-pure</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-runtime-java-engine-compiled</artifactId>
Expand All @@ -126,5 +126,23 @@
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-api</artifactId>
</dependency>

<!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<scope>test</scope>
</dependency>
<!-- TEST -->
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2024 Goldman Sachs
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.finos.legend.pure.code.core;

import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestCoreDiagramMetamodelCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_diagram_metamodel");
}
}
18 changes: 18 additions & 0 deletions legend-engine-xts-diagram/legend-engine-xt-diagram-pure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,23 @@
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-api</artifactId>
</dependency>

<!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<scope>test</scope>
</dependency>
<!-- TEST -->
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2024 Goldman Sachs
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.finos.legend.pure.code.core;

import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;

public class TestCoreDiagramCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_diagram");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,10 @@
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
</dependency>

<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-runtime-java-engine-compiled</artifactId>
</dependency>

<!-- PURE -->

<!-- ENGINE -->
Expand Down Expand Up @@ -193,7 +191,17 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<scope>test</scope>
</dependency>
<!-- TEST -->
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2024 Goldman Sachs
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package org.finos.legend.engine.pure.code.core;

import org.finos.legend.pure.m3.tests.AbstractCompiledStateIntegrityTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;

public class TestCoreExternalLanguageJavaFeatureBasedGenerationCompiledStateIntegrity extends AbstractCompiledStateIntegrityTest
{
@BeforeClass
public static void initialize()
{
initialize("core_external_language_java_feature_based_generation");
}

@Test
@Ignore
@Override
public void testReferenceUsages()
{
// TODO fix this test
super.testReferenceUsages();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,17 @@
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-graph-grammar</artifactId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<version>${legend.pure.version}</version>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-mapping-grammar</artifactId>
<artifactId>legend-pure-m2-dsl-graph-grammar</artifactId>
<version>${legend.pure.version}</version>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<artifactId>legend-pure-m2-dsl-mapping-grammar</artifactId>
<version>${legend.pure.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -197,7 +197,27 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m3-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-diagram-grammar</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-graph-grammar</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.pure</groupId>
<artifactId>legend-pure-m2-dsl-path-grammar</artifactId>
<scope>test</scope>
</dependency>
<!-- TEST -->
</dependencies>
</project>
Loading

0 comments on commit a4b22af

Please sign in to comment.