#23507 Fixed connector tests + compatible with JDK17

eclipse-ee4j · Mar 3, 2022 · 05fb554 · 05fb554
1 parent fd1b5a7
commit 05fb554
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 36 deletions.
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -58,7 +58,7 @@ public int getCoffeeCount() {
             iSpec.setFunctionName("COUNTCOFFEE");
             RecordFactory rf = cf.getRecordFactory();
             IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
-            Record oRec = ix.execute(iSpec, iRec);
+            jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec);
             Iterator iterator = ((IndexedRecord)oRec).iterator();
             while(iterator.hasNext()) {
                 Object obj = iterator.next();

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
@@ -17,11 +17,17 @@
 package com.sun.s1peqe.connector.cci;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Iterator;
 import jakarta.ejb.*;
-import jakarta.resource.cci.*;
+import jakarta.resource.cci.Connection;
+import jakarta.resource.cci.ConnectionSpec;
+import jakarta.resource.cci.ConnectionFactory;
+import jakarta.resource.cci.IndexedRecord;
+import jakarta.resource.cci.Interaction;
+import jakarta.resource.cci.RecordFactory;
 import jakarta.resource.ResourceException;
 import javax.naming.*;
+
 import com.sun.connector.cciblackbox.*;
 
 public class CoffeeBean implements SessionBean {
@@ -38,7 +44,7 @@ public void ejbCreate() throws CreateException {
     public void setSessionContext(SessionContext sc) {
         try {
             this.sc = sc;
-            Context ic = new InitialContext();
+            InitialContext ic = new InitialContext();
             user = (String) ic.lookup("java:comp/env/user");
             password = (String) ic.lookup("java:comp/env/password");
             cf = (jakarta.resource.cci.ConnectionFactory) ic.lookup("java:comp/env/eis/CCIEIS");
@@ -58,7 +64,7 @@ public int getCoffeeCount() {
             iSpec.setFunctionName("COUNTCOFFEE");
             RecordFactory rf = cf.getRecordFactory();
             IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
-            Record oRec = ix.execute(iSpec, iRec);
+            jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec);
             Iterator iterator = ((IndexedRecord)oRec).iterator();
             while(iterator.hasNext()) {
                 Object obj = iterator.next();

diff --git a/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties b/appserver/tests/appserv-tests/devtests/connector/config/das-config.properties
@@ -22,10 +22,10 @@ admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=admin123
 master.password=admin123

diff --git a/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/connector/config/pe-config.properties
@@ -15,17 +15,17 @@
 #
 
 execution.mode=pe
-admin.port=4848
+admin.port=${env.PORT_ADMIN}
 admin.user=admin
 admin.host=localhost
 admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=adminadmin
 master.password=changeit

diff --git a/...erver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java b/...erver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS);
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...erver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/...erver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -59,7 +59,7 @@ public int getCoffeeCount() {
             iSpec.setFunctionName("COUNTCOFFEE");
             RecordFactory rf = cf.getRecordFactory();
             IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
-            Record oRec = ix.execute(iSpec, iRec);
+            jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec);
             Iterator iterator = ((IndexedRecord) oRec).iterator();
             while (iterator.hasNext()) {
                 Object obj = iterator.next();

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS);
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
@@ -17,9 +17,14 @@
 package com.sun.s1peqe.connector.cci;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Iterator;
 import jakarta.ejb.*;
-import jakarta.resource.cci.*;
+import jakarta.resource.cci.Connection;
+import jakarta.resource.cci.ConnectionSpec;
+import jakarta.resource.cci.ConnectionFactory;
+import jakarta.resource.cci.IndexedRecord;
+import jakarta.resource.cci.Interaction;
+import jakarta.resource.cci.RecordFactory;
 import jakarta.resource.ResourceException;
 import javax.naming.*;
 
@@ -59,7 +64,7 @@ public int getCoffeeCount() {
             iSpec.setFunctionName("COUNTCOFFEE");
             RecordFactory rf = cf.getRecordFactory();
             IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
-            Record oRec = ix.execute(iSpec, iRec);
+            jakarta.resource.cci.Record oRec = ix.execute(iSpec, iRec);
             Iterator iterator = ((IndexedRecord) oRec).iterator();
             while (iterator.hasNext()) {
                 Object obj = iterator.next();

diff --git a/...rv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java b/...rv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");
         stat.printSummary(TEST_NAME);

diff --git a/...s/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java b/...s/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...erv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java b/...erv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...sts/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java b/...sts/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = Integer.valueOf(portS);
+        int port = Integer.parseInt(portS);
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");
         stat.printSummary(TEST_NAME);

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...ppserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java b/...ppserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java b/...devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/.../appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java b/.../appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/WebTest.java
@@ -37,7 +37,7 @@ public static void main(String args[]) {
         String versionToTest = args[3];
         versionToTest = versionToTest.trim();
 
-        int port = new Integer(portS);
+        int port = Integer.parseInt(portS);
         String name;
 
         int testVersion = Integer.valueOf(versionToTest);

diff --git a/...sts/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java b/...sts/appserv-tests/devtests/connector/v3/installed-libraries-resources/client/WebTest.java
@@ -37,7 +37,7 @@ public static void main(String args[]) {
 
         stat.addDescription(TEST_NAME);
 
-        int port = Integer.valueOf(portS);
+        int port = Integer.parseInt(portS);
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");
         stat.printSummary(TEST_NAME);

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = Integer.valueOf(portS);
+        int port = Integer.parseInt(portS);
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");
         stat.printSummary(TEST_NAME);

diff --git a/...ts/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java b/...ts/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/...ts/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java b/...ts/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/client/WebTest.java
@@ -36,7 +36,7 @@ public static void main(String args[]) {
         String contextRoot = args[2];
         String expectedCount = args[3];
 
-        int port = Integer.valueOf(portS);
+        int port = Integer.parseInt(portS);
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet", expectedCount);
         stat.printSummary(TEST_NAME);

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/WebTest.java
@@ -37,7 +37,7 @@ public static void main(String args[]) {
         String versionToTest = args[3];
         versionToTest = versionToTest.trim();
 
-        int port = new Integer(portS);
+        int port = Integer.parseInt(portS);
         String name;
 
         int testVersion = Integer.valueOf(versionToTest);

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh b/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh
@@ -29,7 +29,6 @@ test_run(){
   echo Running target: ${TARGET}
   time ant clean-all start-record ${TARGET} stop-record report | tee ${TEST_RUN_LOG}
   antStatus=${?}
-  cp connector.output tests-run.log
   ant stopDomain stopDerby
 }
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
@@ -447,6 +447,7 @@
           fork="true"
     >
       <arg line="${db.driver}" />
+      <arg line="${http.port}" />
     </java>
     <antcall target="drop-table" />
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/client/WebTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +34,7 @@
 public class WebTest {
 
     static String host = "localhost";
-    static int port = 8080;
+    static int port;
 
     private static SimpleReporterAdapter status = new SimpleReporterAdapter();
 
@@ -44,7 +45,7 @@ public class WebTest {
     public static void main(String[] args) {
 
         driver = args[0];
-
+        port = Integer.parseInt(args[1]);
         status.addDescription("SecurityMap WebTest");
         try {
             runTests();

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/WebTest.java
@@ -35,7 +35,7 @@ public static void main(String args[]) {
         String portS = args[1];
         String contextRoot = args[2];
 
-        int port = new Integer(portS).intValue();
+        int port = Integer.parseInt(portS);
         String name;
 
         goGet(host, port, "TEST", contextRoot + "/SimpleServlet");