From e681a16fde56f279b05dfadc521fb8a1a048153c Mon Sep 17 00:00:00 2001
From: Scott M Stark <starksm64@gmail.com>
Date: Fri, 8 Nov 2024 22:53:25 -0600
Subject: [PATCH] Update the tests

Signed-off-by: Scott M Stark <starksm@starkinternational.com>
---
 glassfish-runner/jpa-platform-tck/pom.xml           | 13 +++++++++++++
 .../tck/persistence/ee/cdi/ServletEMLookupTest.java |  4 ++--
 .../jakarta/tck/persistence/ee/cdi/TestBeanEM.java  | 11 ++++++-----
 .../jakarta/tck/persistence/ee/cdi/persistence.xml  |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/glassfish-runner/jpa-platform-tck/pom.xml b/glassfish-runner/jpa-platform-tck/pom.xml
index 6fdc6365a3..e96aa6196f 100644
--- a/glassfish-runner/jpa-platform-tck/pom.xml
+++ b/glassfish-runner/jpa-platform-tck/pom.xml
@@ -332,6 +332,17 @@
             <artifactId>derbytools</artifactId>
             <version>10.15.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${glassfish.container.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>persistence-platform-tck-tests</artifactId>
+            <version>11.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -616,6 +627,8 @@
                                 <java.io.tmpdir>/tmp</java.io.tmpdir>
                                 <project.basedir>${project.basedir}</project.basedir>
                                 <arquillian.xml>rest-arquillian.xml</arquillian.xml>
+                                <glassfish.debug>true</glassfish.debug>
+                                <glassfish.suspend>false</glassfish.suspend>
                             </systemPropertyVariables>
                             <environmentVariables>
                                 <GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/ServletEMLookupTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/ServletEMLookupTest.java
index 42421108e0..d4692ad56d 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/ServletEMLookupTest.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/ServletEMLookupTest.java
@@ -27,9 +27,9 @@ public class ServletEMLookupTest {
     @ArquillianResource
     URL contextPath;
 
-    @Deployment(name = "rest-em-lookup", testable = false)
+    @Deployment(name = "jpa-cdi-em-inject", testable = false)
     public static WebArchive deployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
-        WebArchive war = ShrinkWrap.create(WebArchive.class, "rest-em-lookup.war")
+        WebArchive war = ShrinkWrap.create(WebArchive.class)
                 .addClasses(CtsEmQualifier.class, CtsEmNoTxQualifier.class, JaxRsActivator.class,
                         TestBeanEM.class, RestEndpoint.class);
 
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/TestBeanEM.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/TestBeanEM.java
index 1318f56199..7097fe1450 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/TestBeanEM.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/TestBeanEM.java
@@ -3,6 +3,7 @@
 import jakarta.inject.Inject;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import java.util.logging.Logger;
 
@@ -13,12 +14,12 @@
 public class TestBeanEM {
     Logger logger = Logger.getLogger(TestBeanEM.class.getName());
 
-    //@PersistenceUnit(unitName = "CTS-EM")
-    @CtsEmQualifier
-    @Inject
+    @PersistenceContext(unitName = "CTS-EM")
+    //@CtsEmQualifier
+    //@Inject
     private EntityManager em1;
-    //@PersistenceUnit(unitName = "CTS-EM-NOTX")
-    @CtsEmNoTxQualifier
+    //@PersistenceContext(unitName = "CTS-EM2")
+    @CtsEmQualifier
     @Inject
     private EntityManager em2;
 
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/persistence.xml
index 991638ee39..4d33a9dc07 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/persistence.xml
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/cdi/persistence.xml
@@ -29,6 +29,7 @@
   </persistence-unit>
   <persistence-unit name="CTS-EM2" transaction-type="JTA">
     <description>Persistence Unit for CTS Vehicle Tests</description>
+    <qualifier>ee.jakarta.tck.persistence.ee.cdi.CtsEmQualifier</qualifier>
     <jta-data-source>jdbc/DB1</jta-data-source>
     <class>ee.jakarta.tck.persistence.ee.entityManager.Order</class>
   </persistence-unit>
@@ -36,7 +37,6 @@
     <description>The persistence.xml file may be used to designate
                   more than one persistence unit within the same scope.
                   Persistence Unit for Application Managed Resource Local</description>
-    <qualifier>ee.jakarta.tck.persistence.ee.cdi.CtsEmNoTxQualifier</qualifier>
     <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
     <class>ee.jakarta.tck.persistence.ee.entityManager.Order</class>
   </persistence-unit>