Merge pull request jakartaee#1568 from alwin-joseph/jpa_fixappcliente…

…rrors Persistence : Fix some of the appclient tests errors
scottmarlow · Oct 7, 2024 · cd4e9bd · cd4e9bd
2 parents 2b0e807 + b06e35e
commit cd4e9bd
Show file tree

Hide file tree

Showing 367 changed files with 3,653 additions and 552 deletions.
diff --git a/glassfish-runner/jpa-platform-tck/pom.xml b/glassfish-runner/jpa-platform-tck/pom.xml
@@ -88,7 +88,7 @@
         <version.jakarta.inject>2.0.1</version.jakarta.inject>
         <version.jakarta.persistence>3.2.0</version.jakarta.persistence>
         <version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
-        <version.jakarta.tck.arquillian>1.0.0-M16</version.jakarta.tck.arquillian>
+        <version.jakarta.tck.arquillian>1.0.0-M17</version.jakarta.tck.arquillian>
     </properties>
 
     <dependencyManagement>
@@ -233,7 +233,7 @@
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>arquillian-protocol-javatest</artifactId>
-            <version>1.0.0-M15</version>
+            <version>${version.jakarta.tck.arquillian}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.jboss.shrinkwrap.resolver</groupId>
@@ -265,7 +265,7 @@
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>arquillian-protocol-lib</artifactId>
-            <version>1.0.0-M15</version>
+            <version>${version.jakarta.tck.arquillian}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
@@ -462,7 +462,6 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
-                            <workingDirectory>${derby.basedir}</workingDirectory>
                             <arguments>
                                 <argument>start-database</argument>
                             </arguments>
@@ -570,7 +569,7 @@
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-naming.jar</additionalClasspathElement>
                             </additionalClasspathElements>
                             <includes>
-                                <!-- <include>ee/jakarta/tck/persistence/**/*Test.java</include> -->
+                                <include>ee/jakarta/tck/persistence/**/*Test.java</include>
                             </includes>
                             <!-- Select the @Tag("tck-javatest") tests -->
                             <groups>tck-javatest</groups>

diff --git a/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java b/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java
@@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
             ee.jakarta.tck.persistence.common.PMClientBase.class,
             ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.ClientAppmanagedTest.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
             com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class,
             com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class,
@@ -83,6 +84,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
             com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
             );
             // The application-client.xml descriptor

diff --git a/...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java b/...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java
@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -98,7 +98,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
             ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
             ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
-            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
+            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
+            ClientAppmanagednotxTest.class
             );
             // The application-client.xml descriptor
             URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml");

diff --git a/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java b/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,21 @@
 public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.EntityGraph.Client {
     static final String VEHICLE_ARCHIVE = "jpa_core_EntityGraph_stateful3_vehicle";
 
+    public static void main(String[] args) {
+      ClientStateful3Test theTests = new ClientStateful3Test();
+      Status s = theTests.run(args, System.out, System.err);
+      s.exit();
+    }
+
+    public void setup(String[] args, Properties p) throws Fault {
+      try {
+        super.setup(args, p);
+      } catch (Exception e) {
+        logErr("Exception: ", e);
+        throw new Fault("Setup failed:", e);
+      }
+    }
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_EntityGraph: META-INF/persistence.xml
@@ -82,7 +98,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
-            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
+            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
+            ClientStateful3Test.class
             );
             // The application-client.xml descriptor
             URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml");

diff --git a/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java b/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,12 @@
 public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.EntityGraph.Client {
     static final String VEHICLE_ARCHIVE = "jpa_core_EntityGraph_stateless3_vehicle";
 
+    public static void main(String[] args) {
+      ClientStateless3Test theTests = new ClientStateless3Test();
+      Status s = theTests.run(args, System.out, System.err);
+      s.exit();
+    }
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_EntityGraph: META-INF/persistence.xml
@@ -82,7 +89,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
-            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
+            com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Department.class,
+            ee.jakarta.tck.persistence.core.EntityGraph.Client.class,
+            ClientStateless3Test.class
             );
             // The application-client.xml descriptor
             URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml");

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,16 @@
 public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
     static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_appmanaged_vehicle";
 
+    public static void main(String[] args) {
+        Client1AppmanagedTest theTests = new Client1AppmanagedTest();
+        Status s = theTests.run(args, System.out, System.err);
+        s.exit();
+      }
+
+      public void setup(String[] args, Properties p) throws Exception {
+        super.setup(args, p);
+      }
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
@@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
             com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
+            Client1AppmanagedTest.class
             );
             // The application-client.xml descriptor
             URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml");
@@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 com.sun.ts.lib.harness.EETest.SetupException.class,
                 com.sun.ts.tests.common.vehicle.VehicleClient.class,
                 com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+                Client1AppmanagedTest.class
             );
             // The ejb-jar.xml descriptor
             URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");

diff --git a/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java b/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,16 @@
 public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
     static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle";
 
+    public static void main(String[] args) {
+        Client1AppmanagednotxTest theTests = new Client1AppmanagednotxTest();
+        Status s = theTests.run(args, System.out, System.err);
+        s.exit();
+      }
+
+    public void setup(String[] args, Properties p) throws Exception {
+        super.setup(args, p);
+    }
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
@@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
             com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
+            Client1AppmanagednotxTest.class
             );
             // The application-client.xml descriptor
             URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml");
@@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 com.sun.ts.tests.common.vehicle.VehicleClient.class,
                 com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
                 com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class,
-                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+                Client1AppmanagednotxTest.class
             );
             // The ejb-jar.xml descriptor
             URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml");

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,17 @@
 public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
     static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_stateful3_vehicle";
 
+    public static void main(String[] args) {
+        Client1Stateful3Test theTests = new Client1Stateful3Test();
+        Status s = theTests.run(args, System.out, System.err);
+        s.exit();
+      }
+
+    public void setup(String[] args, Properties p) throws Exception {
+        super.setup(args, p);
+    }
+
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
@@ -83,7 +95,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
             com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
+            Client1Stateful3Test.class
             );
             // The application-client.xml descriptor
             URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml");
@@ -122,7 +137,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 com.sun.ts.lib.harness.EETest.SetupException.class,
                 com.sun.ts.tests.common.vehicle.VehicleClient.class,
                 com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+                Client1Stateful3Test.class
             );
             // The ejb-jar.xml descriptor
             URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml");

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java
@@ -21,7 +21,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
 import tck.arquillian.protocol.common.TargetVehicle;
-
+import com.sun.ts.lib.harness.Status;
+import java.util.Properties;
 
 
 @ExtendWith(ArquillianExtension.class)
@@ -33,6 +34,16 @@
 public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1 {
     static final String VEHICLE_ARCHIVE = "jpa_core_StoredProcedureQuery_stateless3_vehicle";
 
+    public static void main(String[] args) {
+        Client1Stateless3Test theTests = new Client1Stateless3Test();
+        Status s = theTests.run(args, System.out, System.err);
+        s.exit();
+      }
+
+    public void setup(String[] args, Properties p) throws Exception {
+        super.setup(args, p);
+    }
+
         /**
         EE10 Deployment Descriptors:
         jpa_core_StoredProcedureQuery: myMappingFile.xml,META-INF/persistence.xml
@@ -83,7 +94,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.lib.harness.EETest.SetupException.class,
             com.sun.ts.tests.common.vehicle.VehicleClient.class,
             com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+            ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
+            Client1Stateless3Test.class,
+            Client1Stateless3Test.class
             );
             // The application-client.xml descriptor
             URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml");
@@ -122,7 +136,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 com.sun.ts.lib.harness.EETest.SetupException.class,
                 com.sun.ts.tests.common.vehicle.VehicleClient.class,
                 com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
-                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
+                ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class,
+                Client1Stateless3Test.class
             );
             // The ejb-jar.xml descriptor
             URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml");