split JPA LRG into smaller buckets
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 11ca764..5e451d2 100644
--- a/jpa/eclipselink.jpa.test/antbuild.xml
+++ b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -1915,6 +1915,16 @@
<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.AllCMP3TestRunModel2"/>
+ <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
new file mode 100644
index 0000000..18b931a
--- /dev/null
+++ b/jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/AllCMP3TestRunModel2.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;
+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());
+ }
+}
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 1a26904..c199164 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1998, 2016 Oracle and/or its affiliates, IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2018 Oracle and/or its affiliates, IBM Corporation. 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.
@@ -253,6 +253,43 @@
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());
+ fullSuite.addTest(XMLPLSQLTestSuite.suite());
+ // Has security manager issues on some JVMs.
+ //fullSuite.addTest(RemoteEntityManagerTestSuite.suite());
+
+ // Composite tests.
+ fullSuite.addTest(org.eclipse.persistence.testing.tests.jpa.composite.advanced.EntityManagerJUnitTestSuite.suite());
+
+ // Fetch Groups tests.
+ suite = new TestSuite();
+ suite.setName("Extensibility");
+ suite.addTest(ExtensibilityTests.suite());
+ fullSuite.addTest(suite);
+
+ return fullSuite;
+ }
+
+ public static TestSuite suite2() {
+ TestSuite fullSuite = new TestSuite();
+
// XML model
fullSuite.addTest(EntityMappingsJUnitTestSuite.suite());
@@ -289,7 +326,7 @@
fullSuite.addTest(org.eclipse.persistence.testing.tests.jpa.metamodel.MetamodelTestSuite.suite());
// JPA 2.0 Criteria JPQL model
- suite = new TestSuite();
+ TestSuite suite = new TestSuite();
suite.setName("Criteria");
suite.addTest(org.eclipse.persistence.testing.tests.jpa.criteria.JUnitCriteriaUnitTestSuite.suite());
suite.addTest(org.eclipse.persistence.testing.tests.jpa.criteria.AdvancedCompositePKJunitTest.suite());
@@ -311,37 +348,6 @@
fullSuite.addTest(QueryCastTestSuite.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());
- fullSuite.addTest(XMLPLSQLTestSuite.suite());
- // Has security manager issues on some JVMs.
- //fullSuite.addTest(RemoteEntityManagerTestSuite.suite());
-
- // Composite tests.
- fullSuite.addTest(org.eclipse.persistence.testing.tests.jpa.composite.advanced.EntityManagerJUnitTestSuite.suite());
-
- // Fetch Groups tests.
- suite = new TestSuite();
- suite.setName("Extensibility");
- suite.addTest(ExtensibilityTests.suite());
- fullSuite.addTest(suite);
-
// XML Mapping Metadata Complete
fullSuite.addTest(XMLMappingMetadataCompleteJunitTestCase.suite());
