Jdbc verificationID tests

src/jdbc/client/exp/Coverage13.rxp

@@ -12,8 +12,9 @@ BAIS=java.io.ByteArrayInputStream@.*
 >!SETNEWVAR S1=java.lang.String(my:test:string)
 S1=my:test:string
 >-- Call method that returns an array
->!CALLMETHOD S1.split(':',20)
-Call returned [Ljava.lang.String;@.*
+>!CALLMETHOD S1.split(':.*
+IGNORE_EXTRA:Call returned [Ljava.lang.String;@.*
+IGNORE_EXTRA:1f043
   .. Array of size 3
 [0][java.lang.String]=my
 [1][java.lang.String]=test
@@ -87,9 +88,6 @@ Call returned null
 >!SETVAR STMT1=CON.createStatement()
 STMT1=STMT0001
 >!CALLMETHOD STMT1.checkOpen()
-No matching method found, possible errors are the following:
-ERROR:  Method not found checkOpen
-
 Call returned null
 >
 >-- error situations
@@ -148,22 +146,33 @@ L1=100
 >!setnewvar bitset=java.util.BitSet()
 bitset={}
 >!showvarmethods bitset
+IGNORE_EXTRA:static void static checkRange(int,int)
+IGNORE_EXTRA:static java.util.BitSet static valueOf([B)
+IGNORE_EXTRA:static java.util.BitSet static valueOf([J)
+IGNORE_EXTRA:static java.util.BitSet static valueOf(java.nio.ByteBuffer)
+IGNORE_EXTRA:static java.util.BitSet static valueOf(java.nio.LongBuffer)
+IGNORE_EXTRA:static int static wordIndex(int)
 void and(java.util.BitSet)
 void andNot(java.util.BitSet)
 int cardinality()
+IGNORE_EXTRA:void checkInvariants()
 void clear()
 void clear(int)
 void clear(int,int)
 java.lang.Object clone()
+IGNORE_EXTRA:void ensureCapacity(int)
 boolean equals(java.lang.Object)
+IGNORE_EXTRA:void expandTo(int)
 void flip(int)
 void flip(int,int)
 boolean get(int)
 java.util.BitSet get(int,int)
 java.lang.Class getClass()
 int hashCode()
+IGNORE_EXTRA:void initWords(int)
 boolean intersects(java.util.BitSet)
 boolean isEmpty()
+IGNORE_EXTRA:java.util.Spliterator$OfInt lambda$stream$0()
 int length()
 int nextClearBit(int)
 int nextSetBit(int)
@@ -172,6 +181,8 @@ void notifyAll()
 void or(java.util.BitSet)
 IGNORE_EXTRA:int previousClearBit(int)
 IGNORE_EXTRA:int previousSetBit(int)
+IGNORE_EXTRA:void readObject(java.io.ObjectInputStream)
+IGNORE_EXTRA:void recalculateWordsInUse()
 void set(int)
 void set(int,boolean)
 void set(int,int)
@@ -181,14 +192,17 @@ IGNORE_EXTRA:java.util.stream.IntStream stream()
 IGNORE_EXTRA:[B toByteArray()
 IGNORE_EXTRA:[J toLongArray()
 java.lang.String toString()
+IGNORE_EXTRA:void trimToSize()
 IGNORE_EXTRA:java.util.BitSet valueOf([B)
 IGNORE_EXTRA:java.util.BitSet valueOf([J)
 IGNORE_EXTRA:java.util.BitSet valueOf(java.nio.ByteBuffer)
 IGNORE_EXTRA:java.util.BitSet valueOf(java.nio.LongBuffer)
 void wait()
 void wait(long)
-void wait(long,int)
+IGNORE_EXTRA:void wait(long,int)
+IGNORE_EXTRA:void writeObject(java.io.ObjectOutputStream)
 void xor(java.util.BitSet)
+IGNORE_EXTRA:
 >
 >
 >

src/test/Conv/ConvTableSingleBytesTestcase.java

@@ -161,19 +161,22 @@ public void compareTables(ConvTableSingleMap c) throws Exception
             return;
         }
         StringBuffer charFailures = new StringBuffer();
-        for (int i = 0; i < established.length; ++i)
-        {
-            int est = (int)(established[i] & 0xFFFF);
-            int gen = (int)(generated[i] & 0xFFFF);
-            if (est != gen)
-            {
-                if(!(i == 0xBC) && !(systemObject_.getVRM() < 0x00060100) && !(est == 0x00AF) && !(gen == 0x203E))  //@A1A
-                    charFailures.append(hex(i) + ":{'" + hex(est) + "','" + hex(gen) + "'}\n");
+        for (int i = 0; i < established.length; ++i) {
+          int est = (int) (established[i] & 0xFFFF);
+          int gen = (int) (generated[i] & 0xFFFF);
+          if (est != gen) {
+            if (ccsid == 1132 && i == 0x70 && est == 0x20AD && gen == 0x006B) {
+              /* ignore this.  For ccsid 1132 the KIP symbol should be 0x20AD but the system translates as 0x0068 (k)  */
+            } else {
+              /* The following condition does not make sense.  Looks like it should have been OR'd instead of anded  */ 
+              /* if (!(i == 0xBC) && !(systemObject_.getVRM() < 0x00060100) && !(est == 0x00AF) && !(gen == 0x203E)) */
+                charFailures.append(hex(i) + ":{'" + hex(est) + "','" + hex(gen) + "'}\n");
             }
+          }
         }
         if (charFailures.length() > 0)
         {
-            failed("EBCDIC->Unicode table characters do not match OS/400's for ccsid " + ccsid + ":\n" + charFailures.toString());
+            failed("EBCDIC->Unicode table characters do not match OS/400's for ccsid " + ccsid + ": index:{toolbox,system}\n" + charFailures.toString());
             return;
         }
 

src/test/DDM/DDMConnect.java

@@ -14,14 +14,16 @@
 package test.DDM;
 
 import java.io.FileOutputStream;
-
+import java.util.Arrays;
+import java.util.Hashtable;
 import java.util.Vector;
 
 
 
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.security.auth.ProfileTokenCredential;
 
+import test.JDReflectionUtil;
 import test.PasswordVault;
 import test.Testcase;
 
@@ -43,14 +45,14 @@ public static void main(String args[]) throws Exception {
   /**
    * Constructor. This is called from the DDMTest constructor.
    **/
-  public DDMConnect(AS400 systemObject, Vector<String> variationsToRun, int runMode,
-      FileOutputStream fileOutputStream,  String testLib) {
-
-    super(systemObject, "DDMConnect", variationsToRun, runMode,
-        fileOutputStream);
-
+
+  public DDMConnect(AS400 systemObject, Hashtable<String,Vector<String>> namesAndVars, int runMode, FileOutputStream fileOutputStream,
+      String password, AS400 pwrSys, String pwrSysPwd) {
+    super(systemObject, "DDMConnect", namesAndVars, runMode, fileOutputStream, password, pwrSys, pwrSysPwd);
+    systemObject_ = systemObject;
   }
 
+
   /**
    * Verify simple connection
    **/
@@ -158,7 +160,39 @@ public void Var004() {
     }
   }
 
-
+  /**
+   * Connect with MFA  
+   */
+  public void Var005() {
+
+    String systemName = systemObject_.getSystemName();
+    if (checkAdditionalAuthenticationFactor(systemName)) {
 
+    boolean passed = true;
+    StringBuffer sb = new StringBuffer();
+    try {
+      initMfaUser();
+      sb.append("new AS400(" + systemObject_.getSystemName() + "," + mfaUserid_ + ",....,"
+          + new String(mfaFactor_) + "\n");
+      char[] mfaPassword = PasswordVault.decryptPassword(mfaEncryptedPassword_);
+      AS400 as400 = (AS400) JDReflectionUtil.createObject("com.ibm.as400.access.AS400", systemObject_.getSystemName(),
+          mfaUserid_, mfaPassword, mfaFactor_);
+      Arrays.fill(mfaPassword, ' ');
+      as400.connectService(AS400.RECORDACCESS);
+      as400.disconnectService(AS400.RECORDACCESS);
+      as400.close(); 
+
+      assertCondition(passed, sb);
+
+    } catch (Exception e) {
+      failed(e, sb);
+    }
+    }
+ }
+
+
+
+
+
 
 }

src/test/DDMTest.java

@@ -56,8 +56,11 @@
 import test.DDM.DDMUpdate;
 import test.DDM.DDMWrite;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
 Test driver for the ddm (record-level database access) component.
@@ -762,13 +765,12 @@ public void createTestcases()
     {
       DDMConnect tc =
         new DDMConnect(systemObject_,
-                      namesAndVars_.get("DDMConnect"), runMode_,
-                     fileOutputStream_, testLib_);
+                      namesAndVars_, runMode_,
+                     fileOutputStream_, password_, pwrSys_, pwrSysPassword_);
       tc.setTestcaseParameters(systemObject_, pwrSys_, systemName_, userId_, password_, proxy_, mustUseSockets_, isNative_, isLocal_, onAS400_, namesAndVars_, runMode_, fileOutputStream_);
       addTestcase(tc);
-      namesAndVars_.remove("DDMConnect");
     }
-
+    
     if (allTestcases || namesAndVars_.containsKey("DDMOpenClose"))
     {
       DDMOpenClose tc =

src/test/JD/CS/JDCSGetDate2.java

@@ -631,7 +631,7 @@ public void Var022()
    **/
   public void Var023() {
 
-      if(checkRelease710()) { 
+      if(true) { 
 	  String added = " -- added by native driver 5/29/2009 to test date format julian";
 	  try {