Merge pull request #132 from jakartaredhat/master

Many updates for outstanding issues
eclipse-ee4j · Aug 28, 2024 · d0d92fd · d0d92fd
2 parents e60a0b2 + 03ae086
commit d0d92fd
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 3 deletions.
diff --git a/...lient/src/main/java/tck/arquillian/protocol/appclient/AppClientProtocolConfiguration.java b/...lient/src/main/java/tck/arquillian/protocol/appclient/AppClientProtocolConfiguration.java
@@ -38,6 +38,8 @@ public class AppClientProtocolConfiguration implements ProtocolConfiguration, Pr
     private String workDir;
     // EE10 type of ts.jte file location
     private String tsJteFile;
+    // EE10 type of tssql.stmt file location
+    private String tsSqlStmtFile;
     // harness.log.traceflag
     private boolean trace;
 
@@ -75,6 +77,15 @@ public void setTsJteFile(String tsJteFile) {
         this.tsJteFile = tsJteFile;
     }
 
+    @Override
+    public String getTsSqlStmtFile() {
+        return tsSqlStmtFile;
+    }
+    @Override
+    public void setTsSqlStmtFile(String tsSqlStmtFile) {
+        this.tsSqlStmtFile = tsSqlStmtFile;
+    }
+
     public String getClientEnvString() {
         return clientEnvString;
     }

diff --git a/arquillian/common/src/main/java/tck/arquillian/protocol/common/ProtocolCommonConfig.java b/arquillian/common/src/main/java/tck/arquillian/protocol/common/ProtocolCommonConfig.java
@@ -9,4 +9,7 @@ public interface ProtocolCommonConfig {
 
     public String getTsJteFile();
     public void setTsJteFile(String tsJteFile);
+
+    public String getTsSqlStmtFile();
+    public void setTsSqlStmtFile(String tsJteFile);
 }
diff --git a/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java b/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java
@@ -22,8 +22,15 @@ public class TsTestPropsBuilder {
             "Driver",
             "authpassword",
             "authuser",
+            "binarySize",
+            "cofSize",
+            "cofTypeSize",
+            "db.dml.file",
             "db.supports.sequence",
             "db1",
+            "db2",
+            "DriverManager",
+            "ftable",
             "generateSQL",
             "harness.log.port",
             "harness.log.traceflag",
@@ -39,6 +46,7 @@ public class TsTestPropsBuilder {
             "jstl.db.password",
             "log.file.location",
             "logical.hostname.servlet",
+            "longvarbinarySize",
             "org.omg.CORBA.ORBClass",
             "password",
             "platform.mode",
@@ -53,6 +61,7 @@ public class TsTestPropsBuilder {
             // These two are probably not useful
             "porting.ts.deploy.class.1",
             "porting.ts.deploy.class.2",
+            "ptable",
             "rapassword1",
             "rapassword2",
             "rauser1",
@@ -61,6 +70,8 @@ public class TsTestPropsBuilder {
             "sigTestClasspath",
             "ts_home",
             "user",
+            "user1",
+            "varbinarySize",
             "webServerHost",
             "webServerPort",
             "whitebox-anno_no_md",
@@ -122,6 +133,7 @@ public static String[] runArgs(ProtocolCommonConfig config, Deployment deploymen
 
         // We need the JavaTest ts.jte file for now
         Path tsJte = Paths.get(config.getTsJteFile());
+        Path tssqlStmt = Paths.get(config.getTsSqlStmtFile());
         // Create a test properties file
         Path testProps = Paths.get(config.getWorkDir(), "tstest.jte");
 
@@ -176,6 +188,7 @@ public static String[] runArgs(ProtocolCommonConfig config, Deployment deploymen
         String[] args = {
                 // test props are needed by EETest.run
                 "-p", testProps.toFile().getAbsolutePath(),
+                "-ap", tssqlStmt.toFile().getAbsolutePath(),
                 "classname", testMethodExecutor.getMethod().getDeclaringClass().getName(),
                 "-t", tsTestMethodName,
                 "-vehicle", vehicle,

diff --git a/...avatest/src/main/java/tck/arquillian/protocol/javatest/JavaTestProtocolConfiguration.java b/...avatest/src/main/java/tck/arquillian/protocol/javatest/JavaTestProtocolConfiguration.java
@@ -10,6 +10,8 @@ public class JavaTestProtocolConfiguration implements ProtocolConfiguration, Pro
     private String workDir;
     // EE10 type of ts.jte file location
     private String tsJteFile;
+    // EE10 type of tssql.stmt file location
+    private String tsSqlStmtFile;
     // harness.log.traceflag
     private boolean trace;
     // Should the VehicleClient main be run in a separate JVM
@@ -31,6 +33,15 @@ public void setTsJteFile(String tsJteFile) {
         this.tsJteFile = tsJteFile;
     }
 
+    @Override
+    public String getTsSqlStmtFile() {
+        return tsSqlStmtFile;
+    }
+    @Override
+    public void setTsSqlStmtFile(String tsSqlStmtFile) {
+        this.tsSqlStmtFile = tsSqlStmtFile;
+    }
+
     public boolean isTrace() {
         return trace;
     }

diff --git a/arquillian/protocol-lib/pom.xml b/arquillian/protocol-lib/pom.xml
@@ -73,8 +73,7 @@
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                  <includes>**/*.class,**/*.xml</includes>
-                  <excludes>com/sun/ts/tests/common/vehicle/**</excludes>
+                  <includes>**/*.class</includes>
                 </artifactItem>
               </artifactItems>
             </configuration>

diff --git a/tools/tck-rewrite-ant/pom.xml b/tools/tck-rewrite-ant/pom.xml
@@ -132,6 +132,11 @@
             <artifactId>ejb32</artifactId>
             <version>${version.platform.tck}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>${version.platform.tck}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>jms</artifactId>

diff --git a/tools/tck-rewrite-ant/src/main/java/tck/jakarta/platform/ant/api/DefaultEEMapping.java b/tools/tck-rewrite-ant/src/main/java/tck/jakarta/platform/ant/api/DefaultEEMapping.java
@@ -17,6 +17,7 @@ public class DefaultEEMapping implements EE11toEE10Mapping {
     };
     // Packages removed from EE11. Mostly ejb module classes that are not in the EE11 TCK
     private static final String[] EE11_PKG_EXCLUDES = {
+            "com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome",
             "com.sun.ts.tests.common.dao",
             "com.sun.ts.tests.assembly.util.refbean",
             "com.sun.ts.tests.ejb.ee.bb.entity",

diff --git a/tools/tck-rewrite-ant/src/main/java/tck/jakarta/platform/ant/api/TestPackageInfoBuilder.java b/tools/tck-rewrite-ant/src/main/java/tck/jakarta/platform/ant/api/TestPackageInfoBuilder.java
@@ -371,6 +371,15 @@ private void populateDeployment(EE11toEE10Mapping mapping, DeploymentInfo deploy
         Vehicles vehicleDef = pkgTargetWrapper.getVehiclesDef();
         ArrayList<String> foundDescriptors = new ArrayList<>();
         String extraClientClass = mapping.getMappedTestClass();
+        // Validate the extraClientClass exists in
+        if(extraClientClass != null) {
+            try {
+                deployment.testClass.getClassLoader().loadClass(extraClientClass);
+            } catch (ClassNotFoundException e) {
+                info("Failed to locate extra client class: %s\n", extraClientClass);
+                extraClientClass = null;
+            }
+        }
         // Client
         if(pkgTargetWrapper.hasClientJarDef()) {
             ClientJar clientJarDef = pkgTargetWrapper.getClientJarDef();

diff --git a/tools/tck-rewrite-ant/src/main/resources/TsClientJar.stg b/tools/tck-rewrite-ant/src/main/resources/TsClientJar.stg
@@ -25,7 +25,7 @@ genClientJar(client, testClass) ::= <<
     if(resURL != null) {
       #client.typedArchiveName#.addAsManifestResource(resURL, "application-client.xml");
     }
-    #client.typedArchiveName#.addAsManifestResource(new StringAsset("Main-Class: " + #testClass#.class.getName() + "\n"), "MANIFEST.MF");
+    #client.typedArchiveName#.addAsManifestResource(new StringAsset("Main-Class: #client.mainClass#\n"), "MANIFEST.MF");
     // Call the archive processor
     archiveProcessor.processClientArchive(#client.typedArchiveName#, #testClass#.class, resURL);
 >>
diff --git a/tools/tck-rewrite-ant/src/test/java/tck/conversion/ant/api/DeploymentMethodTest.java b/tools/tck-rewrite-ant/src/test/java/tck/conversion/ant/api/DeploymentMethodTest.java
@@ -709,6 +709,47 @@ public void test_jpa_core_types_generator() throws IOException {
         System.out.println(packageInfo.getTestClientFiles());
     }
 
+    @Test
+    public void test_jdbc_ee_batchUpdate() throws IOException {
+        TestPackageInfoBuilder builder = new TestPackageInfoBuilder(tsHome);
+        List<TestMethodInfo> testMethods = Arrays.asList(
+                new TestMethodInfo("sequenceGeneratorOnPropertyTest", "Exception")
+        );
+        Class<?> baseTestClass = com.sun.ts.tests.jdbc.ee.batchUpdate.batchUpdateClient.class;
+        TestPackageInfo packageInfo = builder.buildTestPackgeInfoEx(baseTestClass, testMethods, DefaultEEMapping.getInstance());
+        System.out.println(packageInfo);
+
+        DeploymentInfo deploymentInfo = packageInfo.getTestClients().get(0).getTestDeployment().getDebugInfo();
+        System.out.printf("Client: %s\n", deploymentInfo.getClientJar());
+        System.out.printf("Client.mainClass: %s\n", deploymentInfo.getClientJar().getMainClass());
+        System.out.printf("Client.classes: %s\n", deploymentInfo.getClientJar().getClassFilesString());
+        System.out.printf("Ejbs: %s\n", deploymentInfo.getEjbJars());
+        System.out.printf("Ejb1.classes: %s\n", deploymentInfo.getEjbJar().getClassFilesString());
+
+        System.out.println("---- TestClientFiles ----");
+        System.out.println(packageInfo.getTestClientFiles());
+    }
+
+
+    @Test
+    public void test_jpa_core_annotations_orderby() throws IOException {
+        TestPackageInfoBuilder builder = new TestPackageInfoBuilder(tsHome);
+        List<TestMethodInfo> testMethods = Arrays.asList(
+                new TestMethodInfo("test1", "Exception")
+        );
+        Class<?> baseTestClass = ee.jakarta.tck.persistence.core.annotations.orderby.Client1.class;
+        TestPackageInfo packageInfo = builder.buildTestPackgeInfoEx(baseTestClass, testMethods, DefaultEEMapping.getInstance());
+        System.out.println(packageInfo);
+
+        DeploymentInfo deploymentInfo = packageInfo.getTestClients().get(0).getTestDeployment().getDebugInfo();
+        System.out.printf("Client: %s\n", deploymentInfo.getClientJar());
+        System.out.printf("Client.mainClass: %s\n", deploymentInfo.getClientJar().getMainClass());
+        System.out.printf("Client.classes: %s\n", deploymentInfo.getClientJar().getClassFilesString());
+
+        System.out.println("---- TestClientFiles ----");
+        System.out.println(packageInfo.getTestClientFiles());
+    }
+
     @Test
     public void test_jpa_core_entitytest_persist_oneXmany() throws IOException {
         TestPackageInfoBuilder builder = new TestPackageInfoBuilder(tsHome);