Native profile tokens testing (#118)

* Native Profile Handle Test changes Signed-off-by: John Eberhard <[email protected]> * Cleanup JDRS testcases Signed-off-by: John Eberhard <[email protected]> --------- Signed-off-by: John Eberhard <[email protected]>
IBM · Jan 9, 2025 · 1101284 · 1101284
1 parent d14e6ca
commit 1101284
Show file tree

Hide file tree

Showing 111 changed files with 803 additions and 1,357 deletions.
diff --git a/src/test/JD/RS/JDRSAbsolute.java b/src/test/JD/RS/JDRSAbsolute.java
@@ -21,13 +21,13 @@
 import test.JDTestcase;
 
 import java.io.FileOutputStream;
-import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Hashtable;
+import java.util.Vector;
 
 
 
@@ -64,7 +64,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSAbsolute (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 
@@ -1105,6 +1105,7 @@ public void Var036 ()
 /**
 absolute() - Should clear any warnings.
 **/
+    @SuppressWarnings("deprecation")
     public void Var037 ()
     {
         if (checkJdbc20 ()) {

diff --git a/src/test/JD/RS/JDRSAfterLast.java b/src/test/JD/RS/JDRSAfterLast.java
@@ -29,6 +29,7 @@
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Hashtable;
+import java.util.Vector;
 
 
 
@@ -71,7 +72,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSAfterLast (AS400 systemObject,
-                          Hashtable namesAndVars,
+                          Hashtable<String,Vector<String>> namesAndVars,
                           int runMode,
                           FileOutputStream fileOutputStream,
 
@@ -585,6 +586,7 @@ public void Var018 ()
 /**
 afterLast() - Should clear any warnings.
 **/
+    @SuppressWarnings("deprecation")
     public void Var019 ()
     {
         if (checkJdbc20 ()) {
@@ -1950,6 +1952,7 @@ public void Var078 ()
 /**
 afterLast() - Should clear any warnings.
 **/
+    @SuppressWarnings("deprecation")
     public void Var079 ()
     {
         if (checkJdbc20 ()) {

diff --git a/src/test/JD/RS/JDRSBeforeFirst.java b/src/test/JD/RS/JDRSBeforeFirst.java
@@ -30,6 +30,7 @@
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Hashtable;
+import java.util.Vector;
 
 
 
@@ -72,7 +73,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSBeforeFirst (AS400 systemObject,
-                            Hashtable namesAndVars,
+                            Hashtable<String,Vector<String>> namesAndVars,
                             int runMode,
                             FileOutputStream fileOutputStream,
 
@@ -601,6 +602,7 @@ public void Var018 ()
 /**
 beforeFirst() - Should clear any warnings.
 **/
+    @SuppressWarnings("deprecation")
     public void Var019 ()
     {
         if (checkJdbc20 ()) {
@@ -1878,6 +1880,7 @@ public void Var068 ()
 /**
 beforeFirst() - Should clear any warnings.
 **/
+    @SuppressWarnings("deprecation")
     public void Var069 ()
     {
         if (checkJdbc20 ()) {

diff --git a/src/test/JD/RS/JDRSCachedRowSet.java b/src/test/JD/RS/JDRSCachedRowSet.java
@@ -22,12 +22,12 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Hashtable;
+import java.util.Vector;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 import javax.sql.RowSet;
-import javax.sql.rowset.CachedRowSet;
 
 import com.ibm.as400.access.AS400;
 
@@ -68,7 +68,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSCachedRowSet (AS400 systemObject,
-                               Hashtable namesAndVars,
+                               Hashtable<String,Vector<String>> namesAndVars,
                                int runMode,
                                FileOutputStream fileOutputStream,
 

diff --git a/src/test/JD/RS/JDRSCursorScroll.java b/src/test/JD/RS/JDRSCursorScroll.java
@@ -67,7 +67,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSCursorScroll (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 
@@ -81,7 +81,7 @@ public JDRSCursorScroll (AS400 systemObject,
 
     public JDRSCursorScroll (AS400 systemObject,
 			     String testName, 
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 
@@ -1600,7 +1600,7 @@ public void Var049() {
   public void stressScroll(long seed, int RUNMILLIS, String info) {
 
     boolean success = true;
-    Vector log = new Vector();
+    Vector<String> log = new Vector<String>();
     StringBuffer sb = new StringBuffer();
     String firstMethodString = null;
 
@@ -1786,7 +1786,7 @@ public void stressScroll(long seed, int RUNMILLIS, String info) {
           if (!success) {
             sb.append(" -- Table is " + table49);
             sb.append(" -- Log is \n");
-            Enumeration enumeration = log.elements();
+            Enumeration<String> enumeration = log.elements();
             while (enumeration.hasMoreElements()) {
               sb.append((String) enumeration.nextElement());
               sb.append("\n");
@@ -1827,7 +1827,7 @@ public void Var050()
 	   return; 
        } 
 	    boolean success=true; 
-        Vector log = new Vector(); 
+        Vector<String> log = new Vector<String>(); 
         StringBuffer sb = new StringBuffer(); 
 
 	CallableStatement cs = null; 
@@ -1992,7 +1992,7 @@ public void Var050()
                   if (!success) {
 		    sb.append(" -- Table is "+table49); 
                     sb.append(" -- Log is \n"); 
-                    Enumeration enumeration = log.elements(); 
+                    Enumeration<String> enumeration = log.elements(); 
                     while (enumeration.hasMoreElements()) {
                       sb.append((String) enumeration.nextElement()); 
                       sb.append("\n"); 

diff --git a/src/test/JD/RS/JDRSCursorScrollInsensitiveFromCall.java b/src/test/JD/RS/JDRSCursorScrollInsensitiveFromCall.java
@@ -17,7 +17,6 @@
 import com.ibm.as400.access.AS400;
 
 import java.io.FileOutputStream;
-import java.sql.*;
 import java.util.*;
 
 
@@ -47,7 +46,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSCursorScrollInsensitiveFromCall (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 

diff --git a/src/test/JD/RS/JDRSCursorScrollSensitiveFromCall.java b/src/test/JD/RS/JDRSCursorScrollSensitiveFromCall.java
@@ -17,7 +17,6 @@
 import com.ibm.as400.access.AS400;
 
 import java.io.FileOutputStream;
-import java.sql.*;
 import java.util.*;
 
 
@@ -47,7 +46,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSCursorScrollSensitiveFromCall (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 

diff --git a/src/test/JD/RS/JDRSCursorSensitivity.java b/src/test/JD/RS/JDRSCursorSensitivity.java
@@ -62,7 +62,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSCursorSensitivity (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,
 

diff --git a/src/test/JD/RS/JDRSDataCompression.java b/src/test/JD/RS/JDRSDataCompression.java
@@ -21,14 +21,11 @@
 
 import java.io.FileOutputStream;
 import java.sql.Connection;
-import java.sql.DataTruncation;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Hashtable;
+import java.util.Vector;
 
 
 
@@ -71,7 +68,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSDataCompression (AS400 systemObject,
-                                Hashtable namesAndVars,
+                                Hashtable<String,Vector<String>> namesAndVars,
                                 int runMode,
                                 FileOutputStream fileOutputStream,
 
@@ -183,11 +180,11 @@ private boolean testDataCompression(String dc)
         rs.next();
         boolean check = (rs.getInt(1) == 1);
         check = check && (rs.getString(2).equals(repeatingString_));
-        check = check && (isEqual(rs.getBytes(3), repeatingBytes_));
+        check = check && (areEqual(rs.getBytes(3), repeatingBytes_));
         rs.next();
         check = check && (rs.getInt(1) == 2);
         check = check && (rs.getString(2).equals(nonRepeatingString_));
-        check = check && (isEqual(rs.getBytes(3), nonRepeatingBytes_));
+        check = check && (areEqual(rs.getBytes(3), nonRepeatingBytes_));
 
         rs.close();
 
@@ -227,8 +224,8 @@ private boolean testRLECompression(String dc, byte[] odd, byte[] even, String te
         String text3 = rs.getString(5);
 
         boolean check = true;
-        check = check && (isEqual(odd, odd2));
-        check = check && (isEqual(even, even2));
+        check = check && (areEqual(odd, odd2));
+        check = check && (areEqual(even, even2));
         check = check && (text.equals(text2));
         check = check && (text.equals(text3));
         check = check && (rs.next() == false);

diff --git a/src/test/JD/RS/JDRSDeleteRow.java b/src/test/JD/RS/JDRSDeleteRow.java
@@ -21,7 +21,6 @@
 import test.JDTestcase;
 
 import java.io.FileOutputStream;
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Hashtable;
@@ -68,7 +67,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
     public JDRSDeleteRow (AS400 systemObject,
-                                    Hashtable namesAndVars,
+                                    Hashtable<String,Vector<String>> namesAndVars,
                                     int runMode,
                                     FileOutputStream fileOutputStream,
 
@@ -232,7 +231,7 @@ public void Var005()
             try {
                 rs_.beforeFirst ();
                 int rowCountBefore = 0;
-                Vector keysBefore = new Vector ();
+                Vector<String> keysBefore = new Vector<String> ();
                 while (rs_.next ()) {
                     ++rowCountBefore;
                     keysBefore.addElement (rs_.getString ("C_KEY"));
@@ -243,7 +242,7 @@ public void Var005()
 
                 ResultSet rs2 = statement2_.executeQuery (select_);
                 int rowCountAfter = 0;
-                Vector keysAfter = new Vector ();
+                Vector<String> keysAfter = new Vector<String> ();
                 while (rs2.next ()) {
                     ++rowCountAfter;
                     keysAfter.addElement (rs2.getString ("C_KEY"));
@@ -289,7 +288,7 @@ public void Var006()
             try {
                 rs_.beforeFirst ();
                 int rowCountBefore = 0;
-                Vector keysBefore = new Vector ();
+                Vector<String> keysBefore = new Vector<String> ();
                 while (rs_.next ()) {
                     ++rowCountBefore;
                     keysBefore.addElement (rs_.getString ("C_KEY"));
@@ -300,7 +299,7 @@ public void Var006()
 
                 ResultSet rs2 = statement2_.executeQuery (select_);
                 int rowCountAfter = 0;
-                Vector keysAfter = new Vector ();
+                Vector<String> keysAfter = new Vector<String> ();
                 while (rs2.next ()) {
                     ++rowCountAfter;
                     keysAfter.addElement (rs2.getString ("C_KEY"));
@@ -355,7 +354,7 @@ public void Var007()
             try {
                 rs_.beforeFirst ();
                 int rowCountBefore = 0;
-                Vector keysBefore = new Vector ();
+                Vector<String> keysBefore = new Vector<String> ();
                 while (rs_.next ()) {
                     ++rowCountBefore;
                     keysBefore.addElement (rs_.getString ("C_KEY"));
@@ -366,7 +365,7 @@ public void Var007()
 
                 ResultSet rs2 = statement2_.executeQuery (select_);
                 int rowCountAfter = 0;
-                Vector keysAfter = new Vector ();
+                Vector<String> keysAfter = new Vector<String> ();
                 while (rs2.next ()) {
                     ++rowCountAfter;
                     keysAfter.addElement (rs2.getString ("C_KEY"));
@@ -416,7 +415,7 @@ public void Var008()
 
                  rs1.beforeFirst ();
                  int rowCountBefore = 0;
-                 Vector keysBefore = new Vector ();
+                 Vector<String> keysBefore = new Vector<String> ();
                  while (rs1.next ()) {
                      ++rowCountBefore;
                      keysBefore.addElement (rs1.getString ("C_KEY"));
@@ -428,7 +427,7 @@ public void Var008()
 
                  ResultSet rs2 = statement2_.executeQuery (select_);
                  int rowCountAfter = 0;
-                 Vector keysAfter = new Vector ();
+                 Vector<String> keysAfter = new Vector<String> ();
                  while (rs2.next ()) {
                      ++rowCountAfter;
                      keysAfter.addElement (rs2.getString ("C_KEY"));
@@ -481,7 +480,7 @@ public void Var009()
 
                 rs.beforeFirst ();
                 int rowCountBefore = 0;
-                Vector keysBefore = new Vector ();
+                Vector<String> keysBefore = new Vector<String> ();
                 while (rs.next ()) {
                     ++rowCountBefore;
                     keysBefore.addElement (rs.getString ("C_KEY"));
@@ -492,7 +491,7 @@ public void Var009()
 
                 ResultSet rs2 = statement2_.executeQuery (select_);
                 int rowCountAfter = 0;
-                Vector keysAfter = new Vector ();
+                Vector<String> keysAfter = new Vector<String> ();
                 while (rs2.next ()) {
                     ++rowCountAfter;
                     keysAfter.addElement (rs2.getString ("C_KEY"));

diff --git a/src/test/JD/RS/JDRSFetchSize.java b/src/test/JD/RS/JDRSFetchSize.java
@@ -27,6 +27,7 @@
 import java.sql.Statement;
 import java.sql.DatabaseMetaData;
 import java.util.Hashtable;
+import java.util.Vector;
 
 
 
@@ -65,7 +66,7 @@ public static void main(String args[]) throws Exception {
 Constructor.
 **/
    public JDRSFetchSize (AS400 systemObject,
-                         Hashtable namesAndVars,
+                         Hashtable<String,Vector<String>> namesAndVars,
                          int runMode,
                          FileOutputStream fileOutputStream,