Started other changes

Signed-off-by: John Eberhard <[email protected]>
IBM · Sep 14, 2024 · d2b0d73 · d2b0d73
1 parent 7aeb373
commit d2b0d73
Show file tree

Hide file tree

Showing 19 changed files with 176 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ For example, the following will run the AS400JPingTest.
 ```
 java AS400JPingTest  -lib <libraryForTest> -system <systemName> -uid <userId> -pwd <password> -pwrSys <privilegedUserid,privilegedPassword> -directory / -misc <testtype>,<release> -asp <IASPname>
 ```
+A recent change also allows running a test with no parameters.  The needed parameters are taken from environment variables or from a ini/defaults.ini file that resides in the current diretory.  A test run will indicate where those values are obtained from. 
+```
+Java AS400JPingTestcase
+```
 Here is an example of running the JDAcceptsURL testcase (replace the $... variables with the correct values). 
 ```
 java -cp JTOpen-test.jar:jt400.jar test.JDDriverTest -tc JDDriverAcceptsURL -lib JDTEST -system $SYS -uid $UID -pwd $PWD -pwrSys $PWRUID,$PWRSYS -directory / -misc toolbox,v7r5m0 -asp IASP33 

diff --git a/src/test/AS400/AS400NewInstance.java b/src/test/AS400/AS400NewInstance.java
@@ -38,6 +38,15 @@
  * public static AS400 newInstance(boolean useSSL, AS400 system)
  **/
 public class AS400NewInstance extends Testcase {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400NewInstance";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400Test.main(newArgs); 
+   }
 
   StringBuffer sb = new StringBuffer();
   private Connection connection_; 

diff --git a/src/test/AS400JDBC/AS400JDBCConnectionPoolBeanInfoTestcase.java b/src/test/AS400JDBC/AS400JDBCConnectionPoolBeanInfoTestcase.java
@@ -33,6 +33,15 @@
  **/
 public class AS400JDBCConnectionPoolBeanInfoTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCConnectionPoolBeanInfoTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCConnectionPoolTest.main(newArgs); 
+   }
    // private AS400JDBCConnectionPool pool_;
 
    /**

diff --git a/src/test/AS400JDBC/AS400JDBCConnectionPoolDataSourceBeanInfoTestcase.java b/src/test/AS400JDBC/AS400JDBCConnectionPoolDataSourceBeanInfoTestcase.java
@@ -33,6 +33,15 @@
  **/
 public class AS400JDBCConnectionPoolDataSourceBeanInfoTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCConnectionPoolDataSourceBeanInfoTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
 
    /**
      Constructor.  This is called from the AS400JDBCDataSourceTest constructor.

diff --git a/src/test/AS400JDBC/AS400JDBCConnectionPoolDataSourceTestcase.java b/src/test/AS400JDBC/AS400JDBCConnectionPoolDataSourceTestcase.java
@@ -54,6 +54,15 @@
  **/
 public class AS400JDBCConnectionPoolDataSourceTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCConnectionPoolDataSourceTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
    private PrintWriter writer_ = null;
    private String filename_ = "/tmp/poolds.log";
    private String tag = null;

diff --git a/src/test/AS400JDBC/AS400JDBCDataSourceBeanInfoTestcase.java b/src/test/AS400JDBC/AS400JDBCDataSourceBeanInfoTestcase.java
@@ -34,6 +34,15 @@
  **/
 public class AS400JDBCDataSourceBeanInfoTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCDataSourceBeanInfoTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
 
    /**
      Constructor.  This is called from the AS400JDBCDataSourcePropertiesTest constructor.

diff --git a/src/test/AS400JDBC/AS400JDBCDataSourcePropertiesTestcase.java b/src/test/AS400JDBC/AS400JDBCDataSourcePropertiesTestcase.java
@@ -38,6 +38,15 @@
  **/
 public class AS400JDBCDataSourcePropertiesTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCDataSourcePropertiesTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
     private static String logFileName = "/tmp/AS400JDBCDSPT.log"; 
    private AS400JDBCDataSource dataSource_;
    private DataSourcePropertyListener dataSourcePropertyListener_;

diff --git a/src/test/AS400JDBC/AS400JDBCDataSourceSerialTestcase.java b/src/test/AS400JDBC/AS400JDBCDataSourceSerialTestcase.java
@@ -45,6 +45,15 @@
  **/
 public class AS400JDBCDataSourceSerialTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCDataSourceSerialTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
     // Environment variables.
     private static final int OS_AS400 = 0;
     private static final int OS_WINDOWS = 1;

diff --git a/src/test/AS400JDBC/AS400JDBCDataSourceTestcase.java b/src/test/AS400JDBC/AS400JDBCDataSourceTestcase.java
@@ -44,6 +44,15 @@
  **/
 public class AS400JDBCDataSourceTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCDataSourceTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
     // Environment variables.
     private static final int OS_AS400 = 0;
     private static final int OS_WINDOWS = 1;

diff --git a/src/test/AS400JDBC/AS400JDBCMCPDSTestcase.java b/src/test/AS400JDBC/AS400JDBCMCPDSTestcase.java
@@ -43,6 +43,15 @@
  **/
 public class AS400JDBCMCPDSTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCMCPDSTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
    private PrintWriter writer_ = null;
    private String filename_ = "/tmp/poolds.log";
    // private String tag = null;

diff --git a/src/test/AS400JDBC/AS400JDBCMDSTestcase.java b/src/test/AS400JDBC/AS400JDBCMDSTestcase.java
@@ -48,6 +48,15 @@
  **/
 public class AS400JDBCMDSTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCMDSTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCDataSourceTest.main(newArgs); 
+   }
 
     public static String logFileName = "/tmp/AJCTS.log"; 
     // Environment variables.

diff --git a/src/test/AS400JDBC/AS400JDBCManagedConnectionPool2Testcase.java b/src/test/AS400JDBC/AS400JDBCManagedConnectionPool2Testcase.java
@@ -39,6 +39,15 @@
  **/
 public class AS400JDBCManagedConnectionPool2Testcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCManagedConnectionPool2Testcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCConnectionPoolTest.main(newArgs); 
+   }
     private static final boolean DEBUG = false;
 
     // If you turn this flag on, be sure to also turn on the following flag:

diff --git a/src/test/AS400JDBC/AS400JDBCManagedConnectionPoolTestcase.java b/src/test/AS400JDBC/AS400JDBCManagedConnectionPoolTestcase.java
@@ -39,6 +39,15 @@
  **/
 public class AS400JDBCManagedConnectionPoolTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCManagedConnectionPoolTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCConnectionPoolTest.main(newArgs); 
+   }
     private static final boolean DEBUG = true;
 
     // If you turn this flag on, be sure to also turn on the following flag:

diff --git a/src/test/AS400JDBC/AS400JDBCPooledConnectionTestcase.java b/src/test/AS400JDBC/AS400JDBCPooledConnectionTestcase.java
@@ -32,6 +32,15 @@
  **/
 public class AS400JDBCPooledConnectionTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCPooledConnectionTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCConnectionPoolTest.main(newArgs); 
+   }
    // private PrintWriter print = null;
    // private String tag = null;
    // private boolean rejectChange = false;

diff --git a/src/test/AS400JDBC/AS400JDBCRowSetBeanInfoTestcase.java b/src/test/AS400JDBC/AS400JDBCRowSetBeanInfoTestcase.java
@@ -53,6 +53,15 @@
  **/
 public class AS400JDBCRowSetBeanInfoTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCRowSetBeanInfoTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCRowSetTest.main(newArgs); 
+   }
    private AS400JDBCRowSet rowset_;
 
    /**

diff --git a/src/test/AS400JDBC/AS400JDBCRowSetCtorTestcase.java b/src/test/AS400JDBC/AS400JDBCRowSetCtorTestcase.java
@@ -40,6 +40,15 @@
  **/
 public class AS400JDBCRowSetCtorTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCRowSetCtorTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCRowSetTest.main(newArgs); 
+   }
     private static final String JNDI_FILE = "com.sun.jndi.fscontext.RefFSContextFactory";
     private static final String JNDI_LDAP = "com.ibm.jndi.LDAPCtxFactory";
     private static final String TEST_FILE_NAME = "/tmp/AS400JDBCRowSetCtorTestcase.file"; 

diff --git a/src/test/AS400JDBC/AS400JDBCRowSetTestcase.java b/src/test/AS400JDBC/AS400JDBCRowSetTestcase.java
@@ -41,6 +41,15 @@
  **/
 public class AS400JDBCRowSetTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JDBCRowSetTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JDBCRowSetTest.main(newArgs); 
+   }
     // Environment variables.
     // private static final int OS_AS400 = 0;
     // private static final int OS_WINDOWS = 1;

diff --git a/src/test/JTOpenDownloadDevJars.java b/src/test/JTOpenDownloadDevJars.java
@@ -130,6 +130,9 @@ public static void main(String args[]) {
 	    }
 
 	    String disableSSL = System.getenv("DISABLESSL");
+	    if (disableSSL != null) { 
+	      disableSSL = System.getProperty("DISABLESSL"); 
+	    }
 	    if (disableSSL != null) {
 		System.out.println("DISABLESSL set");
 		DisableSSL.go(); 
@@ -149,18 +152,19 @@ public static void main(String args[]) {
             sql = "SELECT URL,"
                 + "TIMESTAMP( SUBSTRING(UPDATED_AT,1,10) || ' ' || SUBSTRING(UPDATED_AT,12,8)) + CURRENT TIMEZONE AS UPDATED , "
                 + "CURRENT TIMEZONE as CURRENT_TIMEZONE, "
-                + " BRANCH"
+                + " NAME, BRANCH"
                 + " FROM JSON_TABLE( HTTP_GET('"+artifactsUrl+"','{\"headers\":{\"Accept\":\"application/vnd.github+json\"}, \"sslTolerate\":true}'), '$.artifacts[*]' "
                 + "COLUMNS ( "
                 + "URL VARCHAR(200) CCSID 1208 PATH '$.url', "
                 + "UPDATED_AT VARCHAR(40) PATH '$.updated_at', "
+                + "NAME VARCHAR(40) PATH '$.name',"
                 + "BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  ))  "
                 + "ORDER BY UPDATED_AT desc FETCH FIRST 10 ROWS ONLY";
             System.out.println("FYI:  Latests artifacts are the following: "+sql); 
             ResultSet rs = stmt.executeQuery(sql);
-            System.out.println("URL,UPDATED_CURRENT_TIMEZONE,TIMEZONE,BRANCH"); 
+            System.out.println("URL,UPDATED_CURRENT_TIMEZONE,TIMEZONE,NAME,BRANCH"); 
             while (rs.next()) { 
-              System.out.println(rs.getString(1)+","+rs.getTimestamp(2)+","+rs.getString(3)+","+rs.getString(4));
+              System.out.println(rs.getString(1)+","+rs.getTimestamp(2)+","+rs.getString(3)+","+rs.getString(4)+","+rs.getString(5));
             }
             rs.close(); 
             // run the query to get the latest URL
@@ -172,13 +176,20 @@ public static void main(String args[]) {
 		    + "COLUMNS ( "
 		    + "URL VARCHAR(200) CCSID 1208 PATH '$.url', "
 		    + "UPDATED_AT VARCHAR(40) PATH '$.updated_at', "
-		    + "BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  )) WHERE BRANCH='main' ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
+	            + "NAME VARCHAR(40) PATH '$.name',"
+		    + "BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  )) WHERE BRANCH='main' AND NAME='Package' ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
 	    } else if ("ANY".equalsIgnoreCase(branch)) {
-		sql = "SELECT * FROM JSON_TABLE( HTTP_GET('"+artifactsUrl+"','{\"headers\":{\"Accept\":\"application/vnd.github+json\"}, \"sslTolerate\":true}'), '$.artifacts[*]' COLUMNS ( URL VARCHAR(200) CCSID 1208 PATH '$.url', UPDATED_AT VARCHAR(40) PATH '$.updated_at', BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  ))  ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
+		sql = "SELECT * FROM JSON_TABLE( HTTP_GET('"+artifactsUrl+"','{\"headers\":{\"Accept\":\"application/vnd.github+json\"}, \"sslTolerate\":true}'), '$.artifacts[*]' "
+		    + "COLUMNS ( URL VARCHAR(200) CCSID 1208 PATH '$.url', UPDATED_AT VARCHAR(40) PATH '$.updated_at', "
+                    + "NAME VARCHAR(40) PATH '$.name',"
+		    + "BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  )) WHERE NAME='Package' ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
 	    } else {
-		sql = "SELECT * FROM JSON_TABLE( HTTP_GET('"+artifactsUrl+"','{\"headers\":{\"Accept\":\"application/vnd.github+json\"}, \"sslTolerate\":true}'), '$.artifacts[*]' COLUMNS ( URL VARCHAR(200) CCSID 1208 PATH '$.url', UPDATED_AT VARCHAR(40) PATH '$.updated_at', BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  )) WHERE BRANCH='"+branch+"' ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
+		sql = "SELECT * FROM JSON_TABLE( HTTP_GET('"+artifactsUrl+"','{\"headers\":{\"Accept\":\"application/vnd.github+json\"}, \"sslTolerate\":true}'), '$.artifacts[*]' "
+		    + "COLUMNS ( URL VARCHAR(200) CCSID 1208 PATH '$.url', UPDATED_AT VARCHAR(40) PATH '$.updated_at', "
+                    + "NAME VARCHAR(40) PATH '$.name',"
+		    + "BRANCH VARCHAR(120) PATH '$.workflow_run.head_branch'  )) WHERE  NAME='Package' and BRANCH='"+branch+"' ORDER BY UPDATED_AT desc FETCH FIRST 1 ROWS ONLY";
 	    }
-	    System.out.println("Running to get latest artifact from BRANCH: "+sql); 
+	    System.out.println("Running to get latest Package artifact from BRANCH: "+sql); 
 	    rs = stmt.executeQuery(sql);
 	    String downloadUrl;
 	    String updatedAt;

diff --git a/src/test/MiscAH/AS400JPingTestcase.java b/src/test/MiscAH/AS400JPingTestcase.java
@@ -27,6 +27,16 @@
  **/
 public class AS400JPingTestcase extends Testcase
 {
+  public static void main(String args[]) throws Exception {
+    String[] newArgs = new String[args.length+2];
+     newArgs[0] = "-tc";
+     newArgs[1] = "AS400JPingTestcase";
+     for (int i = 0; i < args.length; i++) {
+       newArgs[2+i]=args[i];
+     }
+     test.AS400JPingTest.main(newArgs); 
+   }
+
     boolean deleteFile(String fileName)
     {
         try