Fix jpa tests that were missing client setup calls

Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Dec 13, 2024 · 94a984d · 94a984d
1 parent 7dc120c
commit 94a984d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/...a/tck/persistence/common/pluggability/altprovider/implementation/PersistenceProvider.java b/...a/tck/persistence/common/pluggability/altprovider/implementation/PersistenceProvider.java
@@ -44,7 +44,7 @@ public class PersistenceProvider
 	protected TSLogger logger;
 
 	public PersistenceProvider() {
-		// logger = TSLogger.getInstance();
+		callLogger("PersistenceProvider.ctor");
 	}
 
 	private void callLogger(String s) {

diff --git a/...c/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java b/...c/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java
@@ -90,11 +90,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(warResURL != null) {
               jpa_core_annotations_version_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
             }
-            // The sun-web.xml descriptor
-            warResURL = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml");
-            if(warResURL != null) {
-              jpa_core_annotations_version_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
-            }
 
             // Any libraries added to the war
 
@@ -103,10 +98,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(warResURL != null) {
               jpa_core_annotations_version_pmservlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/lib/jpa_core_annotations_version.jar");
             }
-            warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml");
-            if(warResURL != null) {
-              jpa_core_annotations_version_pmservlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/pmservlet_vehicle_web.xml");
-            }
 
            // Call the archive processor
            archiveProcessor.processWebArchive(jpa_core_annotations_version_pmservlet_vehicle_web, Client1.class, warResURL);

diff --git a/...in/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java b/...in/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java
@@ -96,11 +96,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 }
                 // Call the archive processor
                 archiveProcessor.processParArchive(jpa_ee_pluggability_contracts_jta, Client.class, parURL);
-                // The orm.xml file
+                // The orm.xml and mapping files
                 parURL = Client.class.getResource("orm.xml");
-                if(parURL != null) {
-                  jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "orm.xml");
-                }
+                jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "orm.xml");
+                parURL = Client.class.getResource("myMappingFile1.xml");
+                jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "myMappingFile1.xml");
+                parURL = Client.class.getResource("myMappingFile2.xml");
+                jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "myMappingFile2.xml");
+
             JavaArchive jpa_alternate_provider = ShrinkWrap.create(JavaArchive.class,"jpa_alternate_provider.jar");
             jpa_alternate_provider.addClasses(
                     ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class,

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
@@ -36,7 +36,7 @@ public Client2() {
 	}
 
 
-	public void setupData(String[] args, Properties p) throws Exception {
+	public void setup(String[] args, Properties p) throws Exception {
 		logTrace( "setupData");
 		try {
 			super.setup(args,p);

diff --git a/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java b/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java
@@ -33,7 +33,7 @@ public static void main(String[] args) {
 		s.exit();
 	}
 
-	public void setupShortData(String[] args, Properties p) throws Exception {
+	public void setup(String[] args, Properties p) throws Exception {
 		logTrace( "setupShortData");
 		try {
 			super.setup(args,p);

diff --git a/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java b/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java
@@ -33,7 +33,7 @@ public static void main(String[] args) {
 		s.exit();
 	}
 
-	public void setupLongData(String[] args, Properties p) throws Exception {
+	public void setup(String[] args, Properties p) throws Exception {
 		logTrace( "setupLongData");
 		try {
 			super.setup(args,p);

diff --git a/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java b/...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java
@@ -35,8 +35,7 @@ public static void main(String[] args) {
 		s.exit();
 	}
 
-
-	public void setupTimestampData(String[] args, Properties p) throws Exception {
+	public void setup(String[] args, Properties p) throws Exception {
 		logTrace( "setupTimestampData");
 		try {
 			super.setup(args,p);