[nobug] jpa-lrg split to smaller parts
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jpa/eclipselink.jpa.test/antbuild.xml b/jpa/eclipselink.jpa.test/antbuild.xml
index 5e451d2..b3cf7fc 100644
--- a/jpa/eclipselink.jpa.test/antbuild.xml
+++ b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -793,7 +793,7 @@
<exclude name="org/eclipse/persistence/testing/models/jpa/metamodel/**"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa22/**"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java"/>
- <exclude name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel.java"/>
+ <exclude name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel*.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/criteria/CriteriaServerTestSuite.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaMetamodelTestSuite.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/deployment/CompositeEnumerationTest.java"/>
@@ -819,7 +819,7 @@
<exclude name="org/eclipse/persistence/testing/models/jpa/advanced/**"/>
<exclude name="org/eclipse/persistence/testing/models/jpa/metamodel/**"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java"/>
- <exclude name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel.java"/>
+ <exclude name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel*.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/criteria/CriteriaServerTestSuite.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/criteria/JUnitCriteriaMetamodelTestSuite.java"/>
<exclude name="org/eclipse/persistence/testing/tests/jpa/deployment/CompositeEnumerationTest.java"/>
@@ -841,7 +841,7 @@
deprecation="${javac.deprecation}"
failonerror="true">
<include name="org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java"/>
- <include name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel.java"/>
+ <include name="org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel*.java"/>
<include name="org/eclipse/persistence/testing/tests/jpa/criteria/CriteriaServerTestSuite.java"/>
<classpath>
<path refid="compile.path"/>
@@ -1925,6 +1925,26 @@
<param name="DB_URL" value="${db.url}"/>
</antcall>
<antcall target="run-test" inheritRefs="true">
+ <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.AllCMP3TestRunModel3"/>
+ <param name="TEST_AGENT" value="${test.agent}"/>
+ <param name="TEST_WEAVING" value="${test.weaving}"/>
+ <param name="TEST_WEAVING_OPTION" value="${test.weaving.option}"/>
+ <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
+ <!-- param name="RUN_PATH" value="run.classpath"/ -->
+ <param name="RUN_PATH" value="jpa22.run.classpath"/>
+ <param name="DB_URL" value="${db.url}"/>
+ </antcall>
+ <antcall target="run-test" inheritRefs="true">
+ <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.AllCMP3TestRunModel4"/>
+ <param name="TEST_AGENT" value="${test.agent}"/>
+ <param name="TEST_WEAVING" value="${test.weaving}"/>
+ <param name="TEST_WEAVING_OPTION" value="${test.weaving.option}"/>
+ <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
+ <!-- param name="RUN_PATH" value="run.classpath"/ -->
+ <param name="RUN_PATH" value="jpa22.run.classpath"/>
+ <param name="DB_URL" value="${db.url}"/>
+ </antcall>
+ <antcall target="run-test" inheritRefs="true">
<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>
<param name="TEST_AGENT" value="${test.agent}"/>
<param name="TEST_WEAVING" value="${test.weaving}"/>
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel2.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel2.java
index 18b931a..78d1ad2 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel2.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel2.java
@@ -13,23 +13,22 @@
package org.eclipse.persistence.testing.tests.jpa;
import org.eclipse.persistence.testing.framework.TestModel;
-import org.eclipse.persistence.testing.tests.jpa.FullRegressionTestSuite;
/**
* <p><b>Purpose</b>: Test run for all CMP3 tests.
*/
public class AllCMP3TestRunModel2 extends TestModel {
- /**
- * Return the JUnit suite to allow JUnit runner to find it.
- * Unfortunately JUnit only allows suite methods to be static,
- * so it is not possible to generically do this.
- */
- public static junit.framework.TestSuite suite()
- {
- return new AllCMP3TestRunModel2();
- }
- public AllCMP3TestRunModel2() {
- addTest(FullRegressionTestSuite.suite2());
- }
+ /**
+ * Return the JUnit suite to allow JUnit runner to find it. Unfortunately
+ * JUnit only allows suite methods to be static, so it is not possible to
+ * generically do this.
+ */
+ public static junit.framework.TestSuite suite() {
+ return new AllCMP3TestRunModel2();
+ }
+
+ public AllCMP3TestRunModel2() {
+ addTest(FullRegressionTestSuite.suite2());
+ }
}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel3.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel3.java
new file mode 100644
index 0000000..932684c
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel3.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation from Oracle TopLink
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.jpa;
+
+import org.eclipse.persistence.testing.framework.TestModel;
+
+/**
+ * <p>
+ * <b>Purpose</b>: Test run for all CMP3 tests.
+ */
+public class AllCMP3TestRunModel3 extends TestModel {
+
+ /**
+ * Return the JUnit suite to allow JUnit runner to find it. Unfortunately
+ * JUnit only allows suite methods to be static, so it is not possible to
+ * generically do this.
+ */
+ public static junit.framework.TestSuite suite() {
+ return new AllCMP3TestRunModel3();
+ }
+
+ public AllCMP3TestRunModel3() {
+ addTest(FullRegressionTestSuite.suite3());
+ }
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel4.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel4.java
new file mode 100644
index 0000000..9ec6b2f
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel4.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation from Oracle TopLink
+ ******************************************************************************/
+package org.eclipse.persistence.testing.tests.jpa;
+
+import org.eclipse.persistence.testing.framework.TestModel;
+
+/**
+ * <p>
+ * <b>Purpose</b>: Test run for all CMP3 tests.
+ */
+public class AllCMP3TestRunModel4 extends TestModel {
+
+ /**
+ * Return the JUnit suite to allow JUnit runner to find it. Unfortunately
+ * JUnit only allows suite methods to be static, so it is not possible to
+ * generically do this.
+ */
+ public static junit.framework.TestSuite suite() {
+ return new AllCMP3TestRunModel4();
+ }
+
+ public AllCMP3TestRunModel4() {
+ addTest(FullRegressionTestSuite.suite4());
+ }
+}
diff --git a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
index c199164..82736cc 100644
--- a/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/FullRegressionTestSuite.java
@@ -161,42 +161,6 @@ public static Test suite() {
suite.addTest(InvalidNamedQueryTest.suite());
fullSuite.addTest(suite);
- // FieldAccess advanced model
- suite = new TestSuite();
- suite.setName("fieldaccess");
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.NamedNativeQueryJUnitTest.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.CallbackEventJUnitTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.EntityManagerJUnitTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.SQLResultSetMappingTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.JoinedAttributeAdvancedJunitTest.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ReportQueryMultipleReturnTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ExtendedPersistenceContextJUnitTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ReportQueryConstructorExpressionTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.OptimisticConcurrencyJUnitTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.AdvancedJPAJunitTest.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.AdvancedJunitTest.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.UpdateAllQueryAdvancedJunitTest.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.UniAndBiDirectionalMappingTestSuite.suite());
- suite.addTestSuite(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.ExpressionJUnitTestSuite.class);
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.RelationshipModelJUnitTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.IsolatedCacheTestSuite.suite());
- suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.JAXBTestSuite.suite());
- // Fetch Groups tests.
- TestSuite suiteFg = new TestSuite();
- suiteFg.setName("fieldaccess.FetchGroups");
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.FetchGroupTrackerWeavingTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleDefaultFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleNamedFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleSerializeFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedDefaultFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedNamedFetchGroupTests.suite());
- suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.FetchGroupMergeWithCacheTests.suite());
- suite.addTest(suiteFg);
-
- fullSuite.addTest(suite);
-
// Inheritance model.
suite = new TestSuite();
suite.setName("inheritance");
@@ -220,8 +184,14 @@ public static Test suite() {
suite.addTest(EmbeddableSuperclassJunitTest.suite());
fullSuite.addTest(suite);
+ return fullSuite;
+ }
+
+ public static TestSuite suite2() {
+ TestSuite fullSuite = new TestSuite();
+
// Relationship model.
- suite = new TestSuite();
+ TestSuite suite = new TestSuite();
suite.setName("relationships");
suite.addTest(EMQueryJUnitTestSuite.suite());
suite.addTest(ExpressionJUnitTestSuite.suite());
@@ -253,21 +223,6 @@ public static Test suite() {
suite.addTest(AbstractEntityWithColumnDiscriminatorTest.suite());
fullSuite.addTest(suite);
- // Fetch Groups tests.
- suite = new TestSuite();
- suite.setName("FetchGroups");
- suite.addTest(FetchGroupAPITests.suite());
- suite.addTest(FetchGroupTrackerWeavingTests.suite());
- suite.addTest(SimpleDefaultFetchGroupTests.suite());
- suite.addTest(SimpleFetchGroupTests.suite());
- suite.addTest(SimpleNamedFetchGroupTests.suite());
- suite.addTest(SimpleSerializeFetchGroupTests.suite());
- suite.addTest(NestedDefaultFetchGroupTests.suite());
- suite.addTest(NestedFetchGroupTests.suite());
- suite.addTest(NestedNamedFetchGroupTests.suite());
- suite.addTest(FetchGroupMergeWithCacheTests.suite());
- fullSuite.addTest(suite);
-
fullSuite.addTest(PartitionedTestSuite.suite());
fullSuite.addTest(PartitionedXMLTestSuite.suite());
fullSuite.addTest(PLSQLTestSuite.suite());
@@ -287,7 +242,65 @@ public static Test suite() {
return fullSuite;
}
- public static TestSuite suite2() {
+ public static TestSuite suite3() {
+ TestSuite fullSuite = new TestSuite();
+
+ // FieldAccess advanced model
+ TestSuite suite = new TestSuite();
+ suite.setName("fieldaccess");
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.NamedNativeQueryJUnitTest.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.CallbackEventJUnitTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.EntityManagerJUnitTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.SQLResultSetMappingTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.JoinedAttributeAdvancedJunitTest.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ReportQueryMultipleReturnTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ExtendedPersistenceContextJUnitTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.ReportQueryConstructorExpressionTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.OptimisticConcurrencyJUnitTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.AdvancedJPAJunitTest.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.AdvancedJunitTest.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.advanced.UpdateAllQueryAdvancedJunitTest.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.UniAndBiDirectionalMappingTestSuite.suite());
+ suite.addTestSuite(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.ExpressionJUnitTestSuite.class);
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.RelationshipModelJUnitTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.IsolatedCacheTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.relationships.JAXBTestSuite.suite());
+
+ // Fetch Groups tests.
+ TestSuite suiteFg = new TestSuite();
+ suiteFg.setName("fieldaccess.FetchGroups");
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.FetchGroupTrackerWeavingTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleDefaultFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleNamedFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.SimpleSerializeFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedDefaultFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.NestedNamedFetchGroupTests.suite());
+ suiteFg.addTest(org.eclipse.persistence.testing.tests.jpa.fieldaccess.fetchgroups.FetchGroupMergeWithCacheTests.suite());
+ suite.addTest(suiteFg);
+
+ fullSuite.addTest(suite);
+
+ // Fetch Groups tests.
+ suite = new TestSuite();
+ suite.setName("FetchGroups");
+ suite.addTest(FetchGroupAPITests.suite());
+ suite.addTest(FetchGroupTrackerWeavingTests.suite());
+ suite.addTest(SimpleDefaultFetchGroupTests.suite());
+ suite.addTest(SimpleFetchGroupTests.suite());
+ suite.addTest(SimpleNamedFetchGroupTests.suite());
+ suite.addTest(SimpleSerializeFetchGroupTests.suite());
+ suite.addTest(NestedDefaultFetchGroupTests.suite());
+ suite.addTest(NestedFetchGroupTests.suite());
+ suite.addTest(NestedNamedFetchGroupTests.suite());
+ suite.addTest(FetchGroupMergeWithCacheTests.suite());
+ fullSuite.addTest(suite);
+
+ return fullSuite;
+ }
+
+ public static TestSuite suite4() {
TestSuite fullSuite = new TestSuite();
// XML model
