From 7c884ee79f6f5949619b65744a4840d9564b8782 Mon Sep 17 00:00:00 2001 From: John Eberhard Date: Fri, 24 Apr 2026 11:24:11 -0500 Subject: [PATCH] Update testcases for system version. --- src/jdbc/client/exp/Coverage13.rxp | 26 +- .../Conv/ConvTableSingleBytesTestcase.java | 21 +- src/test/DDM/DDMConnect.java | 50 +- src/test/DDMTest.java | 10 +- src/test/JD/CS/JDCSGetDate2.java | 2 +- src/test/JD/CS/JDCSGetObject41.java | 190 +++---- src/test/JD/CS/JDCSSetArrayN.java | 360 ++++++------ src/test/JD/CS/JDCSSetBigDecimal.java | 2 +- src/test/JD/CS/JDCSSetClob.java | 2 +- src/test/JD/CS/JDCSSetInt.java | 2 +- src/test/JD/CS/JDCSSetLong.java | 2 +- src/test/JD/CS/JDCSSetObject3SQLType.java | 4 - src/test/JD/CS/JDCSSetObject4.java | 8 - src/test/JD/CS/JDCSSetObject4SQLType.java | 8 - src/test/JD/Connection/JDConnectionCCSID.java | 38 +- .../JD/Connection/JDConnectionClientInfo.java | 6 +- .../JDConnectionCursorHoldability.java | 5 - .../JD/Connection/JDConnectionNaming.java | 6 +- src/test/JD/DMD/JDDMDGetColumns.java | 49 +- src/test/JD/DMD/JDDMDGetPseudoColumns.java | 64 +-- src/test/JD/DMD/JDDMDGetTables.java | 6 - src/test/JD/DMD/JDDMDGetXxx.java | 3 - src/test/JD/DMD/JDDMDMisc.java | 14 +- src/test/JD/DS/JDDSProperties.java | 36 +- src/test/JD/Driver/JDDriverConnect.java | 29 +- .../JD/Driver/JDDriverGetPropertyInfo.java | 6 +- src/test/JD/Driver/JDDriverMisc.java | 4 +- src/test/JD/Driver/JDDriverTimestamp.java | 4 - src/test/JD/Lob/JDLobClobLocator.java | 6 +- src/test/JD/PS/JDPSBatch.java | 17 - src/test/JD/PS/JDPSExecute.java | 8 +- src/test/JD/PS/JDPSResults.java | 2 +- src/test/JD/PS/JDPSSetSQLXML.java | 4 - src/test/JD/RS/JDRSGetBytes.java | 2 +- src/test/JD/RS/JDRSGetObject41.java | 192 +++---- src/test/JD/RS/JDRSGetString.java | 6 - src/test/JD/RS/JDRowSetRSTestcase.java | 511 +++++++++--------- src/test/JD/Statement/JDStatementExecute.java | 38 +- src/test/JD/Statement/JDStatementMisc.java | 2 +- .../JD/Statement/JDStatementQueryTimeout.java | 7 +- src/test/JD/Statement/JDStatementResults.java | 4 +- .../JD/Statement/JDStatementStressTest.java | 3 +- src/test/JD/XML/JDXMLXML.java | 2 +- src/test/JDCleanSplfJdbc.java | 22 +- src/test/JDCleanSplfJdbcResults.java | 6 +- src/test/JDCleanup.java | 11 +- src/test/JDJSTPTestcase.java | 8 +- src/test/JDRunit.java | 5 +- src/test/JDTestDriver.java | 10 +- src/test/JDTestcase.java | 29 +- src/test/JDVariationSkip.java | 1 - src/test/JTA/JTACleanupTx.java | 476 +++++++++++----- src/test/JTA/JTAStdConn.java | 3 + src/test/JTA/JTATestcase.java | 14 + src/test/JTAStdTest.java | 12 +- src/test/JTATest.java | 11 +- src/test/JTAUDBTest.java | 10 +- src/test/JTOpenEclipseExport.java | 3 + src/test/JVMRunJDBC.java | 13 +- src/test/Sec/AuthExit.java | 10 +- src/test/Sec/SecCtorTestcase.java | 7 +- src/test/Sec/SecPTMiscTestcase.java | 4 +- src/test/Testcase.java | 14 +- src/test/User/UserGetSetLtoMTestcase.java | 4 - 64 files changed, 1314 insertions(+), 1120 deletions(-) diff --git a/src/jdbc/client/exp/Coverage13.rxp b/src/jdbc/client/exp/Coverage13.rxp index acb2a654..bd915c6f 100644 --- a/src/jdbc/client/exp/Coverage13.rxp +++ b/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: > > > diff --git a/src/test/Conv/ConvTableSingleBytesTestcase.java b/src/test/Conv/ConvTableSingleBytesTestcase.java index 0eaaebe0..b1fedfce 100644 --- a/src/test/Conv/ConvTableSingleBytesTestcase.java +++ b/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; } diff --git a/src/test/DDM/DDMConnect.java b/src/test/DDM/DDMConnect.java index d07eee16..c46d0219 100644 --- a/src/test/DDM/DDMConnect.java +++ b/src/test/DDM/DDMConnect.java @@ -14,7 +14,8 @@ package test.DDM; import java.io.FileOutputStream; - +import java.util.Arrays; +import java.util.Hashtable; import java.util.Vector; @@ -22,6 +23,7 @@ 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 variationsToRun, int runMode, - FileOutputStream fileOutputStream, String testLib) { - - super(systemObject, "DDMConnect", variationsToRun, runMode, - fileOutputStream); - + + public DDMConnect(AS400 systemObject, Hashtable> 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); + } + } + } + + + + + } diff --git a/src/test/DDMTest.java b/src/test/DDMTest.java index d920b459..12f4449c 100644 --- a/src/test/DDMTest.java +++ b/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 = diff --git a/src/test/JD/CS/JDCSGetDate2.java b/src/test/JD/CS/JDCSGetDate2.java index 23fab778..8bcdac03 100644 --- a/src/test/JD/CS/JDCSGetDate2.java +++ b/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 { diff --git a/src/test/JD/CS/JDCSGetObject41.java b/src/test/JD/CS/JDCSGetObject41.java index 625dae7b..d44aaad5 100644 --- a/src/test/JD/CS/JDCSGetObject41.java +++ b/src/test/JD/CS/JDCSGetObject41.java @@ -1005,7 +1005,7 @@ public void Var033() { /* Test string 1X with XML X4 */ public void Var034() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.String", "call "+JDCSTest.COLLECTION+".csgoXML (?)", @@ -1022,7 +1022,7 @@ public void Var035() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1300,7 +1300,7 @@ public void Var061() { "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1336,7 +1336,7 @@ public void Var064() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1348,7 +1348,7 @@ public void Var065() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1616,7 +1616,7 @@ public void Var091() { "30000,Data type mismatch", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -1629,7 +1629,7 @@ public void Var092() { "30000,Data type mismatch", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -1642,7 +1642,7 @@ public void Var093() { "30000,Data type mismatch", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -1654,7 +1654,7 @@ public void Var094() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1665,7 +1665,7 @@ public void Var095() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1947,7 +1947,7 @@ public void Var122() { "1,11", "655,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -1970,7 +1970,7 @@ public void Var124() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -1982,7 +1982,7 @@ public void Var125() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2257,7 +2257,7 @@ public void Var152() { "3000000000000000000000030000000000000000000000,Data type mismatch", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -2280,7 +2280,7 @@ public void Var154() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2292,7 +2292,7 @@ public void Var155() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2579,7 +2579,7 @@ public void Var182() { } */ - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -2602,7 +2602,7 @@ public void Var184() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2614,7 +2614,7 @@ public void Var185() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2879,7 +2879,7 @@ public void Var212() { "1,11.0", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -2902,7 +2902,7 @@ public void Var214() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -2914,7 +2914,7 @@ public void Var215() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3169,7 +3169,7 @@ public void Var241() { "1,11", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3181,7 +3181,7 @@ public void Var242() { "1,11", "bogus,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3204,7 +3204,7 @@ public void Var244() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3215,7 +3215,7 @@ public void Var245() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3479,7 +3479,7 @@ public void Var271() { "bogus,true", ",false", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3493,7 +3493,7 @@ public void Var272() { "bogus,true", ",false", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3504,7 +3504,7 @@ public void Var273() { "call "+JDCSTest.COLLECTION+".csgoNCLOB (?)", "1,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3516,7 +3516,7 @@ public void Var274() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3527,7 +3527,7 @@ public void Var275() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3876,7 +3876,7 @@ public void Var301() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3902,7 +3902,7 @@ public void Var302() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3926,7 +3926,7 @@ public void Var303() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -3940,7 +3940,7 @@ public void Var304() { "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -3951,7 +3951,7 @@ public void Var305() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4230,7 +4230,7 @@ public void Var333() { "Bogus,Data type mismatch", "1990-03-02,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -4242,7 +4242,7 @@ public void Var334() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4253,7 +4253,7 @@ public void Var335() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4532,7 +4532,7 @@ public void Var363() { "Bogus,Data type mismatch", "11:22:33,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -4545,7 +4545,7 @@ public void Var364() { "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4557,7 +4557,7 @@ public void Var365() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4808,7 +4808,7 @@ public void Var391() { "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,2011-09-01 11:22:01.012345", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -4820,7 +4820,7 @@ public void Var392() { "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,2011-09-01 11:22:01.012345", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -4832,7 +4832,7 @@ public void Var393() { "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -4844,7 +4844,7 @@ public void Var394() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -4855,7 +4855,7 @@ public void Var395() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5168,7 +5168,7 @@ public void Var421() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -5190,7 +5190,7 @@ public void Var422() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -5212,7 +5212,7 @@ public void Var423() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -5236,7 +5236,7 @@ public void Var424() { } - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5247,7 +5247,7 @@ public void Var425() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5591,7 +5591,7 @@ public void Var454() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,READER=h", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5603,7 +5603,7 @@ public void Var455() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5942,7 +5942,7 @@ public void Var484() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,CLOB=h", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -5954,7 +5954,7 @@ public void Var485() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6272,7 +6272,7 @@ public void Var511() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -6294,7 +6294,7 @@ public void Var512() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -6316,7 +6316,7 @@ public void Var513() { testArray = testArrayNative; } - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -6339,7 +6339,7 @@ public void Var514() { testArray =testArrayToolbox; } - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6351,7 +6351,7 @@ public void Var515() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6692,7 +6692,7 @@ public void Var544() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,CLOB=h", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6703,7 +6703,7 @@ public void Var545() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6986,7 +6986,7 @@ public void Var574() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -6997,7 +6997,7 @@ public void Var575() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],SQLARRAY=java.lang.Integer[5]=[0,1,2,3,4]", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7278,7 +7278,7 @@ public void Var604() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,Data type mismatch"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7290,7 +7290,7 @@ public void Var605() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,Data type mismatch"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7575,7 +7575,7 @@ public void Var631() { "http://a.b,http://a.b", "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -7587,7 +7587,7 @@ public void Var632() { "http://a.b,http://a.b", "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -7599,7 +7599,7 @@ public void Var633() { "http://a.b,http://a.b", "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -7624,7 +7624,7 @@ public void Var634() { } - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7636,7 +7636,7 @@ public void Var635() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7923,7 +7923,7 @@ public void Var664() { "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -7934,7 +7934,7 @@ public void Var665() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],SQLARRAY=java.lang.Integer[5]=[0,1,2,3,4]", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -8227,7 +8227,7 @@ public void Var691() { "call "+JDCSTest.COLLECTION+".csgoNCHAR (?)", "ABCDE,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8238,7 +8238,7 @@ public void Var692() { "call "+JDCSTest.COLLECTION+".csgoNVARC (?)", "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8249,7 +8249,7 @@ public void Var693() { "call "+JDCSTest.COLLECTION+".csgoNCLOB (?)", "ABCD,Data type mismatch", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8261,7 +8261,7 @@ public void Var694() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -8273,7 +8273,7 @@ public void Var695() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -8562,7 +8562,7 @@ public void Var721() { "ABCD,Data type mismatch", "h,SQLXML=h", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8574,7 +8574,7 @@ public void Var722() { "ABCD,Data type mismatch", "h,SQLXML=h", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8586,7 +8586,7 @@ public void Var723() { /* "ABCD,Data type mismatch", */ "h,SQLXML=h", "null,null"}; - if (checkRelease710()) testGetObject(testArray,parameterName); + if (true) testGetObject(testArray,parameterName); } @@ -8598,7 +8598,7 @@ public void Var724() { "call "+JDCSTest.COLLECTION+".csgoXML (?)", "h,SQLXML=h", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -8610,7 +8610,7 @@ public void Var725() { "call "+JDCSTest.COLLECTION+".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null"}; - if (checkRelease710()) + if (true) testGetObject(testArray,parameterName); } @@ -8879,7 +8879,7 @@ public void Var753() { "call " + JDCSTest.COLLECTION + ".csgoNCLOBM (?)", "Bogus,Data type mismatch", "1990-03-02,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -8891,7 +8891,7 @@ public void Var754() { String[] testArray = { "java.time.LocalDate", "call " + JDCSTest.COLLECTION + ".csgoXML (?)", "h,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -8902,7 +8902,7 @@ public void Var755() { String[] testArray = { "java.time.LocalDate", "call " + JDCSTest.COLLECTION + ".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9173,7 +9173,7 @@ public void Var783() { "call " + JDCSTest.COLLECTION + ".csgoNCLOBM (?)", "Bogus,Data type mismatch", "11:22:33,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9186,7 +9186,7 @@ public void Var784() { "call " + JDCSTest.COLLECTION + ".csgoXML (?)", "h,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9197,7 +9197,7 @@ public void Var785() { String[] testArray = { "java.time.LocalTime", "call " + JDCSTest.COLLECTION + ".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9455,7 +9455,7 @@ public void Var811() { "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,2011-09-01T11:22:01.012345", "null,null" }; - if (checkRelease710()) { + if (true) { testGetObject(testArray, parameterName); } } @@ -9469,7 +9469,7 @@ public void Var812() { "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,2011-09-01T11:22:01.012345", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9481,7 +9481,7 @@ public void Var813() { "call " + JDCSTest.COLLECTION + ".csgoNCLOBM (?)", "Bogus,Data type mismatch", "2011-09-01 11:22:01.012345,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9493,7 +9493,7 @@ public void Var814() { String[] testArray = { "java.time.LocalDateTime", "call " + JDCSTest.COLLECTION + ".csgoXML (?)", "h,Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } @@ -9504,7 +9504,7 @@ public void Var815() { String[] testArray = { "java.time.LocalDateTime", "call " + JDCSTest.COLLECTION + ".csgoARINT (?)", "SQLARRAY=[Integer:1:2:3],Data type mismatch", "null,null" }; - if (checkRelease710()) + if (true) testGetObject(testArray, parameterName); } } diff --git a/src/test/JD/CS/JDCSSetArrayN.java b/src/test/JD/CS/JDCSSetArrayN.java index e535c872..7b833da6 100644 --- a/src/test/JD/CS/JDCSSetArrayN.java +++ b/src/test/JD/CS/JDCSSetArrayN.java @@ -7093,7 +7093,7 @@ public void Var161() { * Set an ARRAY of time and get array out reversed with all time format properties */ public void Var162() { testTimeCase1(";time format=hms"); } - public void Var163() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testTimeCase1(";time format=usa"); } + public void Var163() { testTimeCase1(";time format=usa"); } public void Var164() { testTimeCase1(";time format=iso"); } public void Var165() { testTimeCase1(";time format=eur"); } public void Var166() { testTimeCase1(";time format=jis"); } @@ -7108,7 +7108,7 @@ public void Var161() { */ public void Var171() { testTimeCase2(";time format=hms"); } - public void Var172() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testTimeCase2(";time format=usa"); } + public void Var172() { testTimeCase2(";time format=usa"); } public void Var173() { testTimeCase2(";time format=iso"); } public void Var174() { testTimeCase2(";time format=eur"); } public void Var175() { testTimeCase2(";time format=jis"); } @@ -7123,7 +7123,7 @@ public void Var161() { public void Var180() { testTimeCase3(";time format=hms"); } - public void Var181() { /* if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } */ testTimeCase3(";time format=usa"); } + public void Var181() { /* */ testTimeCase3(";time format=usa"); } public void Var182() { testTimeCase3(";time format=iso"); } public void Var183() { testTimeCase3(";time format=eur"); } public void Var184() { testTimeCase3(";time format=jis"); } @@ -7137,100 +7137,100 @@ public void Var161() { /** * Set an ARRAY of date and get array out reversed with all date format properties */ - public void Var189() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testDateCase1(";date format=mdy"); } - public void Var190() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy"); } - public void Var191() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd"); } - public void Var192() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=usa"); } + public void Var189() { testDateCase1(";date format=mdy"); } + public void Var190() {testDateCase1(";date format=dmy"); } + public void Var191() {testDateCase1(";date format=ymd"); } + public void Var192() {testDateCase1(";date format=usa"); } public void Var193() { testDateCase1(";date format=iso"); } - public void Var194() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=eur"); } + public void Var194() {testDateCase1(";date format=eur"); } public void Var195() { testDateCase1(";date format=jis"); } - public void Var196() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian"); } - public void Var197() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=mdy;date separator=/"); } - public void Var198() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=mdy;date separator=-"); } - public void Var199() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=mdy;date separator=."); } - public void Var200() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=mdy;date separator=,"); } - public void Var201() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=mdy;date separator=b"); } - public void Var202() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy;date separator=/"); } - public void Var203() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy;date separator=-"); } - public void Var204() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy;date separator=."); } - public void Var205() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy;date separator=,"); } - public void Var206() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=dmy;date separator=b"); } - public void Var207() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd;date separator=/"); } - public void Var208() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd;date separator=-"); } - public void Var209() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd;date separator=."); } - public void Var210() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd;date separator=,"); } - public void Var211() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=ymd;date separator=b"); } - public void Var212() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian;date separator=/"); } - public void Var213() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian;date separator=-"); } - public void Var214() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian;date separator=."); } - public void Var215() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian;date separator=,"); } - public void Var216() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1(";date format=julian;date separator=b"); } + public void Var196() {testDateCase1(";date format=julian"); } + public void Var197() {testDateCase1(";date format=mdy;date separator=/"); } + public void Var198() {testDateCase1(";date format=mdy;date separator=-"); } + public void Var199() {testDateCase1(";date format=mdy;date separator=."); } + public void Var200() {testDateCase1(";date format=mdy;date separator=,"); } + public void Var201() {testDateCase1(";date format=mdy;date separator=b"); } + public void Var202() {testDateCase1(";date format=dmy;date separator=/"); } + public void Var203() {testDateCase1(";date format=dmy;date separator=-"); } + public void Var204() {testDateCase1(";date format=dmy;date separator=."); } + public void Var205() {testDateCase1(";date format=dmy;date separator=,"); } + public void Var206() {testDateCase1(";date format=dmy;date separator=b"); } + public void Var207() {testDateCase1(";date format=ymd;date separator=/"); } + public void Var208() {testDateCase1(";date format=ymd;date separator=-"); } + public void Var209() {testDateCase1(";date format=ymd;date separator=."); } + public void Var210() {testDateCase1(";date format=ymd;date separator=,"); } + public void Var211() {testDateCase1(";date format=ymd;date separator=b"); } + public void Var212() {testDateCase1(";date format=julian;date separator=/"); } + public void Var213() {testDateCase1(";date format=julian;date separator=-"); } + public void Var214() {testDateCase1(";date format=julian;date separator=."); } + public void Var215() {testDateCase1(";date format=julian;date separator=,"); } + public void Var216() {testDateCase1(";date format=julian;date separator=b"); } /** * Set an ARRAY of JDCSSetArrayDate and get array out reversed with all date format properties */ - public void Var217() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy"); } - public void Var218() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy"); } - public void Var219() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd"); } - public void Var220() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=usa"); } + public void Var217() {testDateCase2(";date format=mdy"); } + public void Var218() {testDateCase2(";date format=dmy"); } + public void Var219() {testDateCase2(";date format=ymd"); } + public void Var220() {testDateCase2(";date format=usa"); } public void Var221() { testDateCase2(";date format=iso"); } - public void Var222() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=eur"); } + public void Var222() {testDateCase2(";date format=eur"); } public void Var223() { testDateCase2(";date format=jis"); } - public void Var224() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian"); } - public void Var225() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy;date separator=/"); } - public void Var226() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy;date separator=-"); } - public void Var227() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy;date separator=."); } - public void Var228() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy;date separator=,"); } - public void Var229() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=mdy;date separator=b"); } - public void Var230() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy;date separator=/"); } - public void Var231() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy;date separator=-"); } - public void Var232() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy;date separator=."); } - public void Var233() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy;date separator=,"); } - public void Var234() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=dmy;date separator=b"); } - public void Var235() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=/"); } - public void Var236() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=-"); } - public void Var237() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=."); } - public void Var238() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=,"); } - public void Var239() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=b"); } - public void Var240() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=/"); } - public void Var241() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=-"); } - public void Var242() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=."); } - public void Var243() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=,"); } - public void Var244() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=b"); } + public void Var224() {testDateCase2(";date format=julian"); } + public void Var225() {testDateCase2(";date format=mdy;date separator=/"); } + public void Var226() {testDateCase2(";date format=mdy;date separator=-"); } + public void Var227() {testDateCase2(";date format=mdy;date separator=."); } + public void Var228() {testDateCase2(";date format=mdy;date separator=,"); } + public void Var229() {testDateCase2(";date format=mdy;date separator=b"); } + public void Var230() {testDateCase2(";date format=dmy;date separator=/"); } + public void Var231() {testDateCase2(";date format=dmy;date separator=-"); } + public void Var232() {testDateCase2(";date format=dmy;date separator=."); } + public void Var233() {testDateCase2(";date format=dmy;date separator=,"); } + public void Var234() {testDateCase2(";date format=dmy;date separator=b"); } + public void Var235() {testDateCase2(";date format=ymd;date separator=/"); } + public void Var236() {testDateCase2(";date format=ymd;date separator=-"); } + public void Var237() {testDateCase2(";date format=ymd;date separator=."); } + public void Var238() {testDateCase2(";date format=ymd;date separator=,"); } + public void Var239() {testDateCase2(";date format=ymd;date separator=b"); } + public void Var240() {testDateCase2(";date format=julian;date separator=/"); } + public void Var241() {testDateCase2(";date format=julian;date separator=-"); } + public void Var242() {testDateCase2(";date format=julian;date separator=."); } + public void Var243() {testDateCase2(";date format=julian;date separator=,"); } + public void Var244() {testDateCase2(";date format=julian;date separator=b"); } /** * Set an ARRAY of JDCSSetArrayDate and get array out reversed with all date format properties */ - public void Var245() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy"); } - public void Var246() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy"); } - public void Var247() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=ymd"); } - public void Var248() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=usa"); } - public void Var249() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=iso"); } - public void Var250() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=eur"); } - public void Var251() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=jis"); } - public void Var252() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=julian"); } - public void Var253() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy;date separator=/"); } - public void Var254() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy;date separator=-"); } - public void Var255() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy;date separator=."); } - public void Var256() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy;date separator=,"); } - public void Var257() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=mdy;date separator=b"); } - public void Var258() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy;date separator=/"); } - public void Var259() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy;date separator=-"); } - public void Var260() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy;date separator=."); } - public void Var261() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy;date separator=,"); } - public void Var262() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=dmy;date separator=b"); } - public void Var263() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=ymd;date separator=/"); } - public void Var264() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=ymd;date separator=-"); } - public void Var265() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=ymd;date separator=."); } - public void Var266() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3(";date format=ymd;date separator=,"); } - public void Var267() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=ymd;date separator=b"); } - public void Var268() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=/"); } - public void Var269() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=-"); } - public void Var270() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=."); } - public void Var271() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=,"); } - public void Var272() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2(";date format=julian;date separator=b"); } + public void Var245() {testDateCase3(";date format=mdy"); } + public void Var246() {testDateCase3(";date format=dmy"); } + public void Var247() {testDateCase3(";date format=ymd"); } + public void Var248() {testDateCase3(";date format=usa"); } + public void Var249() {testDateCase3(";date format=iso"); } + public void Var250() {testDateCase3(";date format=eur"); } + public void Var251() {testDateCase3(";date format=jis"); } + public void Var252() {testDateCase3(";date format=julian"); } + public void Var253() {testDateCase3(";date format=mdy;date separator=/"); } + public void Var254() {testDateCase3(";date format=mdy;date separator=-"); } + public void Var255() {testDateCase3(";date format=mdy;date separator=."); } + public void Var256() {testDateCase3(";date format=mdy;date separator=,"); } + public void Var257() {testDateCase3(";date format=mdy;date separator=b"); } + public void Var258() {testDateCase3(";date format=dmy;date separator=/"); } + public void Var259() {testDateCase3(";date format=dmy;date separator=-"); } + public void Var260() {testDateCase3(";date format=dmy;date separator=."); } + public void Var261() {testDateCase3(";date format=dmy;date separator=,"); } + public void Var262() {testDateCase3(";date format=dmy;date separator=b"); } + public void Var263() {testDateCase3(";date format=ymd;date separator=/"); } + public void Var264() {testDateCase3(";date format=ymd;date separator=-"); } + public void Var265() {testDateCase3(";date format=ymd;date separator=."); } + public void Var266() {testDateCase3(";date format=ymd;date separator=,"); } + public void Var267() {testDateCase2(";date format=ymd;date separator=b"); } + public void Var268() {testDateCase2(";date format=julian;date separator=/"); } + public void Var269() {testDateCase2(";date format=julian;date separator=-"); } + public void Var270() {testDateCase2(";date format=julian;date separator=."); } + public void Var271() {testDateCase2(";date format=julian;date separator=,"); } + public void Var272() {testDateCase2(";date format=julian;date separator=b"); } /* Repeat tests, reusing callable statement */ @@ -8586,10 +8586,6 @@ public void Var302() notApplicable("No XML (locators) arrays supported in TB"); //host limitation on locators in arrays. XML is a locator return; } - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("XML arrays cannot be support in JDBC (too large)"); - return; - } assureProcedureExists(JDSetupProcedure.STP_CSARRXML ); reconnect(); ////////create array and set/get data @@ -10805,10 +10801,6 @@ public void Var343() notApplicable("No XML (locators) arrays supported in TB"); //host limitation on locators in arrays. XML is a locator return; } - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("XML arrays cannot be support in JDBC (too large)"); - return; - } assureProcedureExists(JDSetupProcedure.STP_CSARRXML ); reconnect(); @@ -12141,10 +12133,6 @@ public void Var366() if (checkArraySupport()) try{ assureProcedureExists(JDSetupProcedure.STP_CSARRXML ); - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("XML arrays cannot be support in JDBC (too large)"); - return; - } if(isToolboxDriver()){ notApplicable("No XML (locators) arrays supported in TB"); //host limitation on locators in arrays. XML is a locator @@ -13464,10 +13452,6 @@ public void Var390() StringBuffer sb = new StringBuffer(); if (checkArraySupport()) try{ - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("XML arrays cannot be support in JDBC (too large)"); - return; - } if(isToolboxDriver()){ notApplicable("No XML (locators) arrays supported in TB"); //host limitation on locators in arrays. XML is a locator @@ -13535,18 +13519,10 @@ public void Var390() public void Var402() { testNullArrayReuse( "JDCSNARGR", "GRAPHIC(50)"); } public void Var403() { testNullArrayReuse( "JDCSNARVGR", "VARGRAPHIC(50)"); } public void Var404() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("CLOB arrays cannot be support in JDBC (too large)"); - return; - } testNullArrayReuse( "JDCSNARCLO", "CLOB(1M)"); } public void Var405() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("BLOB arrays cannot be support in JDBC (too large)"); - return; - } testNullArrayReuse( "JDCSNARBLO", "BLOB(1M)"); } public void Var406() { testNullArrayReuse( "JDCSNARDAT", "DATE"); } @@ -13556,10 +13532,6 @@ public void Var405() { public void Var410() { testNullArrayReuse( "JDCSNARVBY", "VARBINARY(50)"); } public void Var411() { if (checkJdbc40()) { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("XML arrays cannot be support in JDBC (too large)"); - return; - } testNullArrayReuse( "JDCSNARXML", "XML"); } } @@ -13570,7 +13542,7 @@ public void Var411() { * Set an ARRAY of time and get array out reversed with all time format properties */ public void Var412() { testTimeCase1reuse(";time format=hms"); } - public void Var413() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testTimeCase1reuse(";time format=usa"); } + public void Var413() { testTimeCase1reuse(";time format=usa"); } public void Var414() { testTimeCase1reuse(";time format=iso"); } public void Var415() { testTimeCase1reuse(";time format=eur"); } public void Var416() { testTimeCase1reuse(";time format=jis"); } @@ -13585,7 +13557,7 @@ public void Var411() { */ public void Var421() { testTimeCase2repeat(";time format=hms"); } - public void Var422() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testTimeCase2repeat(";time format=usa"); } + public void Var422() { testTimeCase2repeat(";time format=usa"); } public void Var423() { testTimeCase2repeat(";time format=iso"); } public void Var424() { testTimeCase2repeat(";time format=eur"); } public void Var425() { testTimeCase2repeat(";time format=jis"); } @@ -13600,7 +13572,7 @@ public void Var411() { public void Var430() { testTimeCase3repeat(";time format=hms"); } - public void Var431() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testTimeCase3repeat(";time format=usa"); } + public void Var431() { testTimeCase3repeat(";time format=usa"); } public void Var432() { testTimeCase3repeat(";time format=iso"); } public void Var433() { testTimeCase3repeat(";time format=eur"); } public void Var434() { testTimeCase3repeat(";time format=jis"); } @@ -13614,100 +13586,100 @@ public void Var411() { /** * Set an ARRAY of date and get array out reversed with all date format properties */ - public void Var439() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; } testDateCase1reuse(";date format=mdy"); } - public void Var440() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy"); } - public void Var441() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd"); } - public void Var442() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=usa"); } + public void Var439() { testDateCase1reuse(";date format=mdy"); } + public void Var440() {testDateCase1reuse(";date format=dmy"); } + public void Var441() {testDateCase1reuse(";date format=ymd"); } + public void Var442() {testDateCase1reuse(";date format=usa"); } public void Var443() { testDateCase1reuse(";date format=iso"); } - public void Var444() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=eur"); } + public void Var444() {testDateCase1reuse(";date format=eur"); } public void Var445() { testDateCase1reuse(";date format=jis"); } - public void Var446() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian"); } - public void Var447() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=mdy;date separator=/"); } - public void Var448() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=mdy;date separator=-"); } - public void Var449() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=mdy;date separator=."); } - public void Var450() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=mdy;date separator=,"); } - public void Var451() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=mdy;date separator=b"); } - public void Var452() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy;date separator=/"); } - public void Var453() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy;date separator=-"); } - public void Var454() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy;date separator=."); } - public void Var455() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy;date separator=,"); } - public void Var456() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=dmy;date separator=b"); } - public void Var457() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd;date separator=/"); } - public void Var458() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd;date separator=-"); } - public void Var459() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd;date separator=."); } - public void Var460() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd;date separator=,"); } - public void Var461() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=ymd;date separator=b"); } - public void Var462() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian;date separator=/"); } - public void Var463() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian;date separator=-"); } - public void Var464() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian;date separator=."); } - public void Var465() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian;date separator=,"); } - public void Var466() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase1reuse(";date format=julian;date separator=b"); } + public void Var446() {testDateCase1reuse(";date format=julian"); } + public void Var447() {testDateCase1reuse(";date format=mdy;date separator=/"); } + public void Var448() {testDateCase1reuse(";date format=mdy;date separator=-"); } + public void Var449() {testDateCase1reuse(";date format=mdy;date separator=."); } + public void Var450() {testDateCase1reuse(";date format=mdy;date separator=,"); } + public void Var451() {testDateCase1reuse(";date format=mdy;date separator=b"); } + public void Var452() {testDateCase1reuse(";date format=dmy;date separator=/"); } + public void Var453() {testDateCase1reuse(";date format=dmy;date separator=-"); } + public void Var454() {testDateCase1reuse(";date format=dmy;date separator=."); } + public void Var455() {testDateCase1reuse(";date format=dmy;date separator=,"); } + public void Var456() {testDateCase1reuse(";date format=dmy;date separator=b"); } + public void Var457() {testDateCase1reuse(";date format=ymd;date separator=/"); } + public void Var458() {testDateCase1reuse(";date format=ymd;date separator=-"); } + public void Var459() {testDateCase1reuse(";date format=ymd;date separator=."); } + public void Var460() {testDateCase1reuse(";date format=ymd;date separator=,"); } + public void Var461() {testDateCase1reuse(";date format=ymd;date separator=b"); } + public void Var462() {testDateCase1reuse(";date format=julian;date separator=/"); } + public void Var463() {testDateCase1reuse(";date format=julian;date separator=-"); } + public void Var464() {testDateCase1reuse(";date format=julian;date separator=."); } + public void Var465() {testDateCase1reuse(";date format=julian;date separator=,"); } + public void Var466() {testDateCase1reuse(";date format=julian;date separator=b"); } /** * Set an ARRAY of JDCSSetArrayDate and get array out reversed with all date format properties */ - public void Var467() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy"); } - public void Var468() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy"); } - public void Var469() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd"); } - public void Var470() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=usa"); } + public void Var467() {testDateCase2repeat(";date format=mdy"); } + public void Var468() {testDateCase2repeat(";date format=dmy"); } + public void Var469() {testDateCase2repeat(";date format=ymd"); } + public void Var470() {testDateCase2repeat(";date format=usa"); } public void Var471() { testDateCase2repeat(";date format=iso"); } - public void Var472() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=eur"); } + public void Var472() {testDateCase2repeat(";date format=eur"); } public void Var473() { testDateCase2repeat(";date format=jis"); } - public void Var474() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian"); } - public void Var475() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy;date separator=/"); } - public void Var476() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy;date separator=-"); } - public void Var477() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy;date separator=."); } - public void Var478() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy;date separator=,"); } - public void Var479() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=mdy;date separator=b"); } - public void Var480() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy;date separator=/"); } - public void Var481() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy;date separator=-"); } - public void Var482() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy;date separator=."); } - public void Var483() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy;date separator=,"); } - public void Var484() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=dmy;date separator=b"); } - public void Var485() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=/"); } - public void Var486() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=-"); } - public void Var487() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=."); } - public void Var488() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=,"); } - public void Var489() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=b"); } - public void Var490() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=/"); } - public void Var491() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=-"); } - public void Var492() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=."); } - public void Var493() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=,"); } - public void Var494() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=b"); } + public void Var474() {testDateCase2repeat(";date format=julian"); } + public void Var475() {testDateCase2repeat(";date format=mdy;date separator=/"); } + public void Var476() {testDateCase2repeat(";date format=mdy;date separator=-"); } + public void Var477() {testDateCase2repeat(";date format=mdy;date separator=."); } + public void Var478() {testDateCase2repeat(";date format=mdy;date separator=,"); } + public void Var479() {testDateCase2repeat(";date format=mdy;date separator=b"); } + public void Var480() {testDateCase2repeat(";date format=dmy;date separator=/"); } + public void Var481() {testDateCase2repeat(";date format=dmy;date separator=-"); } + public void Var482() {testDateCase2repeat(";date format=dmy;date separator=."); } + public void Var483() {testDateCase2repeat(";date format=dmy;date separator=,"); } + public void Var484() {testDateCase2repeat(";date format=dmy;date separator=b"); } + public void Var485() {testDateCase2repeat(";date format=ymd;date separator=/"); } + public void Var486() {testDateCase2repeat(";date format=ymd;date separator=-"); } + public void Var487() {testDateCase2repeat(";date format=ymd;date separator=."); } + public void Var488() {testDateCase2repeat(";date format=ymd;date separator=,"); } + public void Var489() {testDateCase2repeat(";date format=ymd;date separator=b"); } + public void Var490() {testDateCase2repeat(";date format=julian;date separator=/"); } + public void Var491() {testDateCase2repeat(";date format=julian;date separator=-"); } + public void Var492() {testDateCase2repeat(";date format=julian;date separator=."); } + public void Var493() {testDateCase2repeat(";date format=julian;date separator=,"); } + public void Var494() {testDateCase2repeat(";date format=julian;date separator=b"); } /** * Set an ARRAY of JDCSSetArrayDate and get array out reversed with all date format properties */ - public void Var495() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy"); } - public void Var496() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy"); } - public void Var497() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=ymd"); } - public void Var498() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=usa"); } - public void Var499() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=iso"); } - public void Var500() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=eur"); } - public void Var501() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=jis"); } - public void Var502() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=julian"); } - public void Var503() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy;date separator=/"); } - public void Var504() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy;date separator=-"); } - public void Var505() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy;date separator=."); } - public void Var506() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy;date separator=,"); } - public void Var507() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=mdy;date separator=b"); } - public void Var508() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy;date separator=/"); } - public void Var509() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy;date separator=-"); } - public void Var510() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy;date separator=."); } - public void Var511() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy;date separator=,"); } - public void Var512() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=dmy;date separator=b"); } - public void Var513() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=ymd;date separator=/"); } - public void Var514() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=ymd;date separator=-"); } - public void Var515() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=ymd;date separator=."); } - public void Var516() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase3repeat(";date format=ymd;date separator=,"); } - public void Var517() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=ymd;date separator=b"); } - public void Var518() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=/"); } - public void Var519() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=-"); } - public void Var520() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=."); } - public void Var521() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=,"); } - public void Var522() { if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { notApplicable("Time format change not working in V7R1"); return; }testDateCase2repeat(";date format=julian;date separator=b"); } + public void Var495() {testDateCase3repeat(";date format=mdy"); } + public void Var496() {testDateCase3repeat(";date format=dmy"); } + public void Var497() {testDateCase3repeat(";date format=ymd"); } + public void Var498() {testDateCase3repeat(";date format=usa"); } + public void Var499() {testDateCase3repeat(";date format=iso"); } + public void Var500() {testDateCase3repeat(";date format=eur"); } + public void Var501() {testDateCase3repeat(";date format=jis"); } + public void Var502() {testDateCase3repeat(";date format=julian"); } + public void Var503() {testDateCase3repeat(";date format=mdy;date separator=/"); } + public void Var504() {testDateCase3repeat(";date format=mdy;date separator=-"); } + public void Var505() {testDateCase3repeat(";date format=mdy;date separator=."); } + public void Var506() {testDateCase3repeat(";date format=mdy;date separator=,"); } + public void Var507() {testDateCase3repeat(";date format=mdy;date separator=b"); } + public void Var508() {testDateCase3repeat(";date format=dmy;date separator=/"); } + public void Var509() {testDateCase3repeat(";date format=dmy;date separator=-"); } + public void Var510() {testDateCase3repeat(";date format=dmy;date separator=."); } + public void Var511() {testDateCase3repeat(";date format=dmy;date separator=,"); } + public void Var512() {testDateCase3repeat(";date format=dmy;date separator=b"); } + public void Var513() {testDateCase3repeat(";date format=ymd;date separator=/"); } + public void Var514() {testDateCase3repeat(";date format=ymd;date separator=-"); } + public void Var515() {testDateCase3repeat(";date format=ymd;date separator=."); } + public void Var516() {testDateCase3repeat(";date format=ymd;date separator=,"); } + public void Var517() {testDateCase2repeat(";date format=ymd;date separator=b"); } + public void Var518() {testDateCase2repeat(";date format=julian;date separator=/"); } + public void Var519() {testDateCase2repeat(";date format=julian;date separator=-"); } + public void Var520() {testDateCase2repeat(";date format=julian;date separator=."); } + public void Var521() {testDateCase2repeat(";date format=julian;date separator=,"); } + public void Var522() {testDateCase2repeat(";date format=julian;date separator=b"); } diff --git a/src/test/JD/CS/JDCSSetBigDecimal.java b/src/test/JD/CS/JDCSSetBigDecimal.java index 75c252a6..d550a5fb 100644 --- a/src/test/JD/CS/JDCSSetBigDecimal.java +++ b/src/test/JD/CS/JDCSSetBigDecimal.java @@ -2293,7 +2293,7 @@ public void testNamedParameters(String procedureName, BigDecimal parameterValue) { String added=" -- added by native driver 6/24/2015 to test named arguments"; - if (checkRelease710()) { + if (true) { try { Statement stmt = connection_.createStatement(); diff --git a/src/test/JD/CS/JDCSSetClob.java b/src/test/JD/CS/JDCSSetClob.java index da07ce9f..035bd667 100644 --- a/src/test/JD/CS/JDCSSetClob.java +++ b/src/test/JD/CS/JDCSSetClob.java @@ -984,7 +984,7 @@ public void testNamedParameters(String procedureName, String added=" -- added by native driver 6/24/2015 to test named arguments"; if (checkJdbc40()) { - if (checkRelease710()) { + if (true) { try { Statement stmt = connection_.createStatement(); diff --git a/src/test/JD/CS/JDCSSetInt.java b/src/test/JD/CS/JDCSSetInt.java index 31569ac5..b7fa2b0b 100644 --- a/src/test/JD/CS/JDCSSetInt.java +++ b/src/test/JD/CS/JDCSSetInt.java @@ -1320,7 +1320,7 @@ public void testNamedParameters(String procedureName, int parameterValue) { String added=" -- added by native driver 6/24/2015 to test named arguments"; - if (checkRelease710()) { + if (true) { try { Statement stmt = connection_.createStatement(); diff --git a/src/test/JD/CS/JDCSSetLong.java b/src/test/JD/CS/JDCSSetLong.java index 48d28329..ec6bf371 100644 --- a/src/test/JD/CS/JDCSSetLong.java +++ b/src/test/JD/CS/JDCSSetLong.java @@ -1372,7 +1372,7 @@ public void testNamedParameters(String procedureName, String procedureDefinition, String parameterName, long parameterValue) { String added = " -- added by native driver 6/24/2015 to test named arguments"; - if (checkRelease710()) { + if (true) { try { Statement stmt = connection_.createStatement(); diff --git a/src/test/JD/CS/JDCSSetObject3SQLType.java b/src/test/JD/CS/JDCSSetObject3SQLType.java index 1cfbfa60..3382d7e9 100644 --- a/src/test/JD/CS/JDCSSetObject3SQLType.java +++ b/src/test/JD/CS/JDCSSetObject3SQLType.java @@ -1551,10 +1551,6 @@ public void Var072() { * setObject() - Set a DATALINK parameter. **/ public void Var073() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("datalink not working before v7R2"); - return; - } if (checkLobSupport()) { if (checkJdbc42()) { try { diff --git a/src/test/JD/CS/JDCSSetObject4.java b/src/test/JD/CS/JDCSSetObject4.java index cd7fe93a..5b9d180f 100644 --- a/src/test/JD/CS/JDCSSetObject4.java +++ b/src/test/JD/CS/JDCSSetObject4.java @@ -1328,10 +1328,6 @@ public void Var072() { * setObject() - Set a DATALINK parameter. **/ public void Var073() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0 && getDriver() == JDTestDriver.DRIVER_NATIVE) { - notApplicable("datalink not working in native V7R2 and earlier"); - return; - } if (checkLobSupport()) { try { @@ -2429,10 +2425,6 @@ public void Var121() { * setObject() - Set a DATALINK parameter with a nonzero scale. **/ public void Var122() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0 && getDriver() == JDTestDriver.DRIVER_NATIVE) { - notApplicable("datalink not working in V7R2 and earlier"); - return; - } if (checkLobSupport()) { try { CallableStatement cs = prepareCall(Types.DATALINK); diff --git a/src/test/JD/CS/JDCSSetObject4SQLType.java b/src/test/JD/CS/JDCSSetObject4SQLType.java index 9bc30560..bb5ac85c 100644 --- a/src/test/JD/CS/JDCSSetObject4SQLType.java +++ b/src/test/JD/CS/JDCSSetObject4SQLType.java @@ -1554,10 +1554,6 @@ public void Var072() { * setObject() - Set a DATALINK parameter. **/ public void Var073() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0 ) { - notApplicable("Data links not working before V7R3"); - return; - } if (checkLobSupport()) { if (checkJdbc42()) { try { @@ -2742,10 +2738,6 @@ public void Var121() { * setObject() - Set a DATALINK parameter with a nonzero scale. **/ public void Var122() { - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0 ) { - notApplicable("Data links not working before V7R3"); - return; - } if (checkLobSupport()) { if (checkJdbc42()) { diff --git a/src/test/JD/Connection/JDConnectionCCSID.java b/src/test/JD/Connection/JDConnectionCCSID.java index bbcb8964..b0386604 100644 --- a/src/test/JD/Connection/JDConnectionCCSID.java +++ b/src/test/JD/Connection/JDConnectionCCSID.java @@ -24,7 +24,6 @@ import com.ibm.as400.access.AS400; import test.JDConnectionTest; -import test.JDReflectionUtil; import test.JDTestDriver; import test.JDTestcase; import test.PasswordVault; @@ -219,6 +218,7 @@ protected void setup () e.printStackTrace(); } stmt.close(); + cmd.close(); } catch (Exception e) { e.printStackTrace(); } @@ -310,23 +310,40 @@ public int getConnectionWcbCCSID(Connection inputConnection, StringBuffer sb) th String jobname = rs.getString(1); rs.close(); + sql = " VALUES CURRENT USER "; + sb.append(" Running SQL: "+sql+"\n"); + rs = stmt.executeQuery(sql); + rs.next(); + String currentUser = rs.getString(1); + sb.append("Current user is "+currentUser); + rs.close(); + + Statement pwrStmt = pwrConnection_.createStatement(); + pwrStmt.execute("call QSYS2.QCMDEXC('GRTOBJAUT OBJ(QSYS/QP0ZMAINT) OBJTYPE(*PGM) USER(" +currentUser+") AUT(*USE) ')"); + pwrStmt.close(); + int slashIndex = jobname.indexOf('/'); String jobNumber = jobname.substring(0, slashIndex); - + sb.append("Running getConnectionWcbCCSID\n"); sql = "call qsys2.qcmdexc('QSH CMD(''rm -f /tmp/output.ccsid" + jobNumber + "'')')"; + sb.append(" Running SQL: "+sql+"\n"); stmt.executeUpdate(sql); sql = "call qsys2.qcmdexc('QSH CMD(''/QSYS.LIB/QP0ZMAINT.PGM 30 " + jobNumber + " 0 1 > /tmp/output.ccsid" + jobNumber + "'')')"; + sb.append(" Running SQL: "+sql+"\n"); stmt.executeUpdate(sql); + sql = " select * from TABLE(IFS_READ('/tmp/output.ccsid" + jobNumber + "'))"; + sb.append(" Running SQL: "+sql+"\n"); rs = stmt.executeQuery(sql); int ccsid = -1; while (rs.next() && ccsid == -1) { String line = rs.getString(2); + sb.append("Line is "+line+"\n"); int colonIndex = line.indexOf(":001250"); if (colonIndex > 0) { String hexData = line.substring(colonIndex + 26, colonIndex + 30); @@ -336,6 +353,7 @@ public int getConnectionWcbCCSID(Connection inputConnection, StringBuffer sb) th } if (ccsid != -1) { sql = "call qsys2.qcmdexc('QSH CMD(''rm -f /tmp/output.ccsid" + jobNumber + "'')')"; + sb.append(" Running SQL: "+sql+"\n"); stmt.executeUpdate(sql); } rs.close(); @@ -368,7 +386,9 @@ public void changeCcsidAndGetFromQusrjobi(int ccsid) { + ".SRVJBCCSID() from sysibm.sysdummy1"); rs.next(); int outCcsid = rs.getInt(1); - + rs.close(); + s.close(); + cmd.close(); assertCondition(outCcsid == ccsid, "changeCcsidAndGetFromQusrjobi(): input ccsid=" + ccsid + " output ccsid=" + outCcsid); } catch (Exception e) { @@ -394,7 +414,9 @@ public void changeCcsidAndGetFromWcb(int ccsid) { while(rs.next()) { } + rs.close(); s.close(); + cmd.close(); StringBuffer sb = new StringBuffer(); sb.append("changeCcsidAndGetFromWcb(): input ccsid=" + ccsid); int outCcsid = getConnectionWcbCCSID(connection_, sb); @@ -438,6 +460,8 @@ public void changeCcsidAndGetFromColumn(int ccsid) { int outCcsid = rs.getInt(1); s.executeUpdate("DROP TABLE "+tablename); + cmd.close(); + rs.close(); s.close(); int expectedCcsid = ccsid; @@ -472,7 +496,8 @@ public void loginCcsidAndGetFromQusrjobi(int ccsid) { if (expectedCcsid == 65535 && getDriver() == JDTestDriver.DRIVER_TOOLBOX) { expectedCcsid=37; } - + rs.close(); + s.close(); assertCondition(outCcsid == expectedCcsid, "loginCcsidAndGetFromQusrjobi(): input ccsid=" + ccsid + " output ccsid=" + outCcsid+" expected ccsid="+expectedCcsid); } catch (Exception e) { @@ -485,10 +510,6 @@ public void loginCcsidAndGetFromWcb(int ccsid) { if (checkNative()) { - if (getRelease() < JDTestDriver.RELEASE_V7R2M0) { - notApplicable("Server WCB CCSID test fixed in V7R2"); - return; - } String profile = setupProfile(ccsid); Connection profileConnection = testDriver_.getConnection (baseURL_, profile, encryptedPassword_); @@ -557,6 +578,7 @@ public void loginCcsidAndGetFromColumn(int ccsid) { int outCcsid = rs.getInt(1); s.executeUpdate("DROP TABLE "+tablename); + rs.close(); s.close(); diff --git a/src/test/JD/Connection/JDConnectionClientInfo.java b/src/test/JD/Connection/JDConnectionClientInfo.java index 617b4f0d..db2d1055 100644 --- a/src/test/JD/Connection/JDConnectionClientInfo.java +++ b/src/test/JD/Connection/JDConnectionClientInfo.java @@ -560,12 +560,8 @@ public void Var006() expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07050"; } else if (getRelease() == JDTestDriver.RELEASE_V7R4M0) { expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07040"; - } else if (getRelease() == JDTestDriver.RELEASE_V7R3M0) { - expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07030"; - } else if (getRelease() == JDTestDriver.RELEASE_V7R2M0) { - expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07020"; } else { - expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07010"; + expected = "IBM Developer Kit for Java JDBC Driver:JDBC:07030"; } } else if (isToolboxDriver()) { diff --git a/src/test/JD/Connection/JDConnectionCursorHoldability.java b/src/test/JD/Connection/JDConnectionCursorHoldability.java index c679b4b1..6c5c0373 100644 --- a/src/test/JD/Connection/JDConnectionCursorHoldability.java +++ b/src/test/JD/Connection/JDConnectionCursorHoldability.java @@ -1134,11 +1134,6 @@ public void Var034 () **/ public void Var035 () { - if ((getRelease() <= JDTestDriver.RELEASE_V7R2M0) && - (isToolboxDriver())) { - notApplicable("Not working in V7R1/V7R2 for toolbox driver"); - return; - } if ( checkCursorHoldabilitySupport() ) { diff --git a/src/test/JD/Connection/JDConnectionNaming.java b/src/test/JD/Connection/JDConnectionNaming.java index 1b211121..1a26f52f 100644 --- a/src/test/JD/Connection/JDConnectionNaming.java +++ b/src/test/JD/Connection/JDConnectionNaming.java @@ -183,11 +183,7 @@ public void Var005() assertCondition(true); } catch (Exception e) { - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { - failed(e, "unexpected exception. In 7.2 the system accepts the period as the delimiter when using *SYS naming. It was part of the default parameter I0."); - } else { - assertExceptionIsInstanceOf (e, "java.sql.SQLException"); - } + failed(e, "unexpected exception. In 7.2 the system accepts the period as the delimiter when using *SYS naming. It was part of the default parameter I0."); } } diff --git a/src/test/JD/DMD/JDDMDGetColumns.java b/src/test/JD/DMD/JDDMDGetColumns.java index 8fd5f9fb..85d99f63 100644 --- a/src/test/JD/DMD/JDDMDGetColumns.java +++ b/src/test/JD/DMD/JDDMDGetColumns.java @@ -2754,22 +2754,16 @@ public void Var034() { } } - } else if ((getJdbcLevel() >= 4 && getDriver() != JDTestDriver.DRIVER_TOOLBOX) - || // @N1C + } else if ((getJdbcLevel() >= 4 && getDriver() != JDTestDriver.DRIVER_TOOLBOX) || // @N1C ((getDriver() == JDTestDriver.DRIVER_NATIVE) && (true)) || ((getDriver() == JDTestDriver.DRIVER_TOOLBOX) && isSysibmMetadata())) { - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { - if (getJdbcMajorMinorLevel() >= 41) { - message.append("Expected = jdbc41Expected34r72\n"); - expected34 = jdbc41Expected34r72; - } else { - message.append("Expected = jdbc40Expected34r72\n"); - expected34 = jdbc40Expected34r72; - } - } else { - message.append("Expected = jdbc40Expected34\n"); - expected34 = jdbc40Expected34; - } + if (getJdbcMajorMinorLevel() >= 41) { + message.append("Expected = jdbc41Expected34r72\n"); + expected34 = jdbc41Expected34r72; + } else { + message.append("Expected = jdbc40Expected34r72\n"); + expected34 = jdbc40Expected34r72; + } } try { @@ -3412,25 +3406,14 @@ public void Var039() (true)) || ( (getDriver() == JDTestDriver.DRIVER_TOOLBOX) && isSysibmMetadata())) { - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { - if (getJdbcMajorMinorLevel() >= 41 ) { - message.append("Expected = jdbc41Expected39r72\n"); - expected39=jdbc41Expected39r72; - - } else { - message.append("Expected = jdbc40Expected39r72\n"); - expected39=jdbc40Expected39r72; - } - } else { - if (getJdbcMajorMinorLevel() >= 41) { - message.append("Expected = jdbc41Expected39\n"); - expected39=jdbc41Expected39; - - } else { - message.append("Expected = jdbc40Expected39\n"); - expected39=jdbc40Expected39; - } - } + if (getJdbcMajorMinorLevel() >= 41) { + message.append("Expected = jdbc41Expected39r72\n"); + expected39 = jdbc41Expected39r72; + + } else { + message.append("Expected = jdbc40Expected39r72\n"); + expected39 = jdbc40Expected39r72; + } } else { if ( getDriver() == JDTestDriver.DRIVER_TOOLBOX) { if((getJdbcLevel() >= 4)){ //@pda diff --git a/src/test/JD/DMD/JDDMDGetPseudoColumns.java b/src/test/JD/DMD/JDDMDGetPseudoColumns.java index 2e07246d..8d4e9995 100644 --- a/src/test/JD/DMD/JDDMDGetPseudoColumns.java +++ b/src/test/JD/DMD/JDDMDGetPseudoColumns.java @@ -299,7 +299,7 @@ public void Var001() { // Result set format checked below. Removing cases that are not working. // Just pass this test to avoid dual maintenance - if (checkRelease610()) { + if (true) { assertCondition(true); return; } @@ -309,7 +309,7 @@ public void Var001() * getPseudoColumns() - Get a list of those created in this testcase. **/ public void Var002() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -427,7 +427,7 @@ boolean checkRows(String column, String[] searchStrings, boolean[] searchFound, **/ public void Var003() { - if (checkRelease610()) { + if (true) { message = new StringBuffer(); @@ -469,7 +469,7 @@ public void Var003() { * tables should be returned. **/ public void Var004() { - if (checkRelease610()) { + if (true) { try { message = new StringBuffer(); @@ -520,7 +520,7 @@ public void Var004() { * matching columns should be returned. **/ public void Var005() { - if (checkRelease610()) { + if (true) { try { ResultSet rs = (ResultSet) JDReflectionUtil.callMethod_OSSSS(dmd_, "getPseudoColumns", "", @@ -549,7 +549,7 @@ public void Var005() { * exactly. All matching columns should be returned. **/ public void Var006() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -602,7 +602,7 @@ public void Var006() { * matching columns should be returned, since we do not support catalog pattern. **/ public void Var007() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -636,7 +636,7 @@ public void Var007() { * No matching columns should be returned. **/ public void Var008() { - if (checkRelease610()) { + if (true) { try { ResultSet rs = (ResultSet) JDReflectionUtil.callMethod_OSSSS(dmd_, "getPseudoColumns", "BOGUS%", @@ -659,7 +659,7 @@ public void Var008() { * columns should be returned. **/ public void Var009() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -717,7 +717,7 @@ public void Var009() { * columns should be returned. **/ public void Var010() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); ; @@ -743,7 +743,7 @@ public void Var010() { * All matching columns should be returned. **/ public void Var011() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); ; @@ -798,7 +798,7 @@ public void Var011() { * is a match. All matching columns should be returned. **/ public void Var012() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); ; @@ -854,7 +854,7 @@ public void Var012() { * there is a match. All matching columns should be returned. **/ public void Var013() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); ; @@ -908,7 +908,7 @@ public void Var013() { * matching columns should be returned. **/ public void Var014() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -932,7 +932,7 @@ public void Var014() { * should be returned. **/ public void Var015() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -986,7 +986,7 @@ public void Var015() { * columns should be returned. **/ public void Var016() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1011,7 +1011,7 @@ public void Var016() { * All matching columns should be returned. **/ public void Var017() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1063,7 +1063,7 @@ public void Var017() { * is a match. All matching columns should be returned. **/ public void Var018() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1116,7 +1116,7 @@ public void Var018() { * there is a match. All matching columns should be returned. **/ public void Var019() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1166,7 +1166,7 @@ public void Var019() { * matching columns should be returned. **/ public void Var020() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1191,7 +1191,7 @@ public void Var020() { * columns should be returned. **/ public void Var021() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1246,7 +1246,7 @@ public void Var021() { * columns should be returned. **/ public void Var022() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1271,7 +1271,7 @@ public void Var022() { * All matching columns should be returned. **/ public void Var023() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1323,7 +1323,7 @@ public void Var023() { * is a match. All matching columns should be returned. **/ public void Var024() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1376,7 +1376,7 @@ public void Var024() { * there is a match. All matching columns should be returned. **/ public void Var025() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1428,7 +1428,7 @@ public void Var025() { * matching columns should be returned. **/ public void Var026() { - if (checkRelease610()) { + if (true) { try { String catalog = getExpectedTableCat(); @@ -1452,7 +1452,7 @@ public void Var026() { * getPseudoColumns() - Should throw an exception when the connection is closed. **/ public void Var027() { - if (checkRelease610()) { + if (true) { try { ResultSet resultSet = (ResultSet) JDReflectionUtil.callMethod_OSSSS(dmd2_, "getPseudoColumns", null, null, null, null); @@ -1504,7 +1504,7 @@ boolean checkExpected(String row[], String[][] expected) { * and the result is as expected. **/ public void Var028() { - if (checkRelease610()) { + if (true) { /** @K2 **/ // String systemName = // ((AS400JDBCConnection)connection_).getSystem().getSystemName(); //@K1A @@ -1966,7 +1966,7 @@ public void checkRSMD(boolean extendedMetadata) { * check the result set metadata with extended metadata off */ public void Var029() { - if (checkRelease610()) { + if (true) { checkRSMD(false); } } @@ -1975,7 +1975,7 @@ public void Var029() { * check the result set metadata with extended metadata on */ public void Var030() { - if (checkRelease610()) { + if (true) { checkRSMD(true); } } @@ -2092,7 +2092,7 @@ public void Var032() { * read call connection **/ public void Var033() { - if (checkRelease610()) { + if (true) { try { message = new StringBuffer(); messageColumnName = ""; @@ -2142,7 +2142,7 @@ public void Var033() { * **/ public void Var034() { - if (checkRelease610()) { + if (true) { String added = " -- added by 1/31/2011 to test for native statement leak in metadata"; if (checkNative()) { try { diff --git a/src/test/JD/DMD/JDDMDGetTables.java b/src/test/JD/DMD/JDDMDGetTables.java index 37c3b901..b99d8254 100644 --- a/src/test/JD/DMD/JDDMDGetTables.java +++ b/src/test/JD/DMD/JDDMDGetTables.java @@ -3466,15 +3466,9 @@ public String setupExpected() { if (!setupExpectedDone) { expectedSysibmRows = expectedSysibmRows54; setupSysibmVersion = "expectedSysibmRows54"; - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { expectedSysibmRows = expectedSysibmRows72; setupSysibmVersion = "expectedSysibmRows72"; - } else { - expectedSysibmRows = expectedSysibmRows71; - setupSysibmVersion = "expectedSysibmRows71"; - - } if( getDriver() == JDTestDriver.DRIVER_TOOLBOX && !isSysibmMetadata()){ for (int i = 0; i < expectedSysibmRows.length; i++) { diff --git a/src/test/JD/DMD/JDDMDGetXxx.java b/src/test/JD/DMD/JDDMDGetXxx.java index 821bbd9c..974085f8 100644 --- a/src/test/JD/DMD/JDDMDGetXxx.java +++ b/src/test/JD/DMD/JDDMDGetXxx.java @@ -358,9 +358,6 @@ private boolean compare(String[] array, String cds) { private String getReleaseAsString() { String release; switch (getRelease()) { - case JDTestDriver.RELEASE_V7R2M0: - release = "07.02.0000 V7R2m0"; - break; case JDTestDriver.RELEASE_V7R3M0: release = "07.03.0000 V7R3m0"; break; diff --git a/src/test/JD/DMD/JDDMDMisc.java b/src/test/JD/DMD/JDDMDMisc.java index 7a5a9221..b8ad72af 100644 --- a/src/test/JD/DMD/JDDMDMisc.java +++ b/src/test/JD/DMD/JDDMDMisc.java @@ -409,7 +409,7 @@ public void Var007() public void Var008() { String added = "-- added 07/14/2015 to getColumns with different CCSIDS Fixed by SE62366 (SYSIBM) -- updated 02/16/2022 to check column 23 "; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -491,7 +491,7 @@ public void Var009() { String added = "-- added 07/14/2015 to getFunctionColumns with different CCSIDS Fixed by SE62366 (SYSIBM)"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -565,7 +565,7 @@ public void Var010() { String added = "-- added 07/14/2015 to getFunctions with different CCSIDS Fixed by SE62366 (SYSIBM)"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -767,7 +767,7 @@ public void Var012() public void Var013() { String added = "-- added 07/14/2015 to getTables with different CCSIDS Fixed by SE62366 (SYSIBM) -- updated 2/16/2022 to check column 4"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -842,7 +842,7 @@ public void Var013() public void Var014() { String added = "-- added 07/14/2015 to getColumnPrivileges with different CCSIDS Fixed by SE62366 (SYSIBM)"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -911,7 +911,7 @@ public void Var014() public void Var015() { String added = "-- added 07/14/2015 to getTablePrivileges with different CCSIDS Fixed by SE62366 (SYSIBM)"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try @@ -980,7 +980,7 @@ public void Var016() { String added = "-- added 07/14/2015 to getPseudoColumns with different CCSIDS Fixed by SE62366 (SYSIBM)"; - if (checkRelease720(added)) { + if (true) { StringBuffer sb = new StringBuffer(); String sql; try diff --git a/src/test/JD/DS/JDDSProperties.java b/src/test/JD/DS/JDDSProperties.java index fb8752a4..027da2a5 100644 --- a/src/test/JD/DS/JDDSProperties.java +++ b/src/test/JD/DS/JDDSProperties.java @@ -156,7 +156,7 @@ protected void setup() throws Exception { dataSourceTB_ = new AS400JDBCDataSource(); dataSourceTB_.setDataSourceName(DATA_SOURCE_TOOLBOX_NAME); dataSourceTB_.setDescription(DATA_SOURCE_TOOLBOX_DESCRIPTION); - + dataSourceTB_.setServerName(systemObject_.getSystemName()); dataSource_ = dataSourceTB_; dataSourceName_ = DATA_SOURCE_TOOLBOX_NAME; dataSourceDescription_ = DATA_SOURCE_TOOLBOX_DESCRIPTION; @@ -3184,7 +3184,7 @@ public void Var124() { String addedInfo = " -- new V7R5+ property added by native driver"; StringBuffer sb = new StringBuffer(addedInfo); String systemName = systemObject_.getSystemName(); - if (checkNative() && checkRelease760(addedInfo) && checkAdditionalAuthenticationFactor(systemName) + if (checkRelease760(addedInfo) && checkAdditionalAuthenticationFactor(systemName) && checkPasswordLeak()) { try { boolean successful = true; @@ -3213,13 +3213,16 @@ && checkPasswordLeak()) { JDReflectionUtil.callMethod_V(dataSource_, "setUser", mfaUserid_); String mfaPassword = PasswordVault.decryptPasswordLeak(mfaEncryptedPassword_); JDReflectionUtil.callMethod_V(dataSource_, "setPassword", mfaPassword); - JDReflectionUtil.callMethod_V(ds, "setAuthenticationRemotePort", 12345); - JDReflectionUtil.callMethod_V(ds, "setAdditionalAuthenticationFactor", mfaFactorString); JDReflectionUtil.callMethod_V(ds, "setAuthenticationVerificationId", "MYAPP_SUPER_SERVER"); - JDReflectionUtil.callMethod_V(ds, "setAuthenticationLocalIP", "1.2.3.4"); - JDReflectionUtil.callMethod_V(ds, "setAuthenticationLocalPort", 80); - JDReflectionUtil.callMethod_V(ds, "setAuthenticationRemoteIP", "5.6.7.8"); - JDReflectionUtil.callMethod_V(ds, "setAuthenticationRemotePort", 2134); + if (getDriver() == JDTestDriver.DRIVER_NATIVE) { + JDReflectionUtil.callMethod_V(ds, "setAdditionalAuthenticationFactor", mfaFactorString); + JDReflectionUtil.callMethod_V(ds, "setAuthenticationLocalIP", "1.2.3.4"); + JDReflectionUtil.callMethod_V(ds, "setAuthenticationLocalPort", 80); + JDReflectionUtil.callMethod_V(ds, "setAuthenticationRemoteIP", "5.6.7.8"); + JDReflectionUtil.callMethod_V(ds, "setAuthenticationRemotePort", 2134); + } else { + JDReflectionUtil.callMethod_V(ds, "setAdditionalAuthenticationFactor", mfaFactorString.toCharArray()); + } sb.append("\nconnecting using " + mfaUserid_ + " AAF=" + mfaFactorString); Connection c = ((DataSource) ds).getConnection(); Statement s = c.createStatement(); @@ -3227,13 +3230,19 @@ && checkPasswordLeak()) { rs.next(); String currentUser = rs.getString(1); sb.append("\ncurrent MFA user is " + currentUser); - String jobName = JDJobName.getJobName().replace('/', '.'); + String jobName; + if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { + jobName = rs.getString(2).replace('/', '.'); + } else { + jobName = JDJobName.getJobName().replace('/', '.'); + } sb.append("\nJob with exit information is " + jobName); rs.close(); if (!mfaUserid_.equalsIgnoreCase(currentUser)) { successful = false; sb.append("currentUser=" + currentUser + " MFAUserID=" + mfaUserid_ + "\n"); } + s.close(); c.close(); String expectedVerificationId = "Verification_ID=MYAPP_SUPER_SERVER"; @@ -3241,6 +3250,15 @@ && checkPasswordLeak()) { String expectedLocalPort = "Local_Port=80"; String expectedRemoteIp = "Remote_IPAddress=5.6.7.8"; String expectedLocalIp = "Local_IPAddress=1.2.3.4"; + + if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { + expectedRemotePort = "Remote_Port=IGNORE"; + expectedLocalPort = "Local_Port=IGNORE"; + expectedRemoteIp = "Remote_IPAddress=IGNORE"; + expectedLocalIp = "Local_IPAddress=IGNORE"; + + } + if (!AuthExit.checkResult(pwrConnection_, jobName, mfaUserid_, sb, expectedVerificationId, expectedRemotePort, expectedLocalPort, expectedRemoteIp, expectedLocalIp)) { diff --git a/src/test/JD/Driver/JDDriverConnect.java b/src/test/JD/Driver/JDDriverConnect.java index 7cafc2a1..19722a36 100644 --- a/src/test/JD/Driver/JDDriverConnect.java +++ b/src/test/JD/Driver/JDDriverConnect.java @@ -3204,15 +3204,22 @@ public void Var073() { StringBuffer sb = new StringBuffer(); boolean successful = true; - if (checkNative() && checkExitProgram() && checkPasswordLeak()) { + if ( checkExitProgram() && checkPasswordLeak()) { String jobName; // Create a simple MFA connection and check the exit information. initMfaUser(); String mfaFactorString = new String(mfaFactor_); - String url; - url = "jdbc:db2:localhost;additionalAuthenticationFactor=" + mfaFactorString + String url; + if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { + url = "jdbc:as400:"+systemObject_.getSystemName() +";additionalAuthenticationFactor=" + mfaFactorString + ";authenticationVerificationId=MYAPP_SUPER_SERVER" + ";authenticationLocalIP=1.2.3.4" + ";authenticationLocalPort=80" + ";authenticationRemoteIP=5.6.7.8" + ";authenticationRemotePort=2134"; + } else { + url = "jdbc:db2:localhost;additionalAuthenticationFactor=" + mfaFactorString + + ";authenticationVerificationId=MYAPP_SUPER_SERVER" + ";authenticationLocalIP=1.2.3.4" + + ";authenticationLocalPort=80" + ";authenticationRemoteIP=5.6.7.8" + ";authenticationRemotePort=2134"; + + } sb.append("Connecting using URL " + url + "\n"); String mfaPassword = new String(PasswordVault.decryptPassword(mfaEncryptedPassword_)); @@ -3222,7 +3229,12 @@ public void Var073() { rs.next(); String currentUser = rs.getString(1); output_.println("current MFA user is " + currentUser); - jobName = JDJobName.getJobName().replace('/', '.'); + if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { + jobName = rs.getString(2).replace('/', '.'); + } else { + jobName = JDJobName.getJobName().replace('/', '.'); + } + output_.println("Job with exit information is " + jobName); rs.close(); if (!mfaUserid_.equalsIgnoreCase(currentUser)) { @@ -3242,6 +3254,13 @@ public void Var073() { String expectedLocalPort = "Local_Port=80"; String expectedRemoteIp = "Remote_IPAddress=5.6.7.8"; String expectedLocalIp = "Local_IPAddress=1.2.3.4"; + if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { + expectedRemotePort = "Remote_Port=IGNORE"; + expectedLocalPort = "Local_Port=IGNORE"; + expectedRemoteIp = "Remote_IPAddress=IGNORE"; + expectedLocalIp = "Local_IPAddress=IGNORE"; + + } c.close(); successful = successful && AuthExit.checkResult( @@ -3654,7 +3673,7 @@ public void Var101() { expectedBadConnectException = "Communication link failure"; } - if (getDriver() == JDTestDriver.DRIVER_NATIVE && getRelease() >= JDTestDriver.RELEASE_V7R2M0) { + if (getDriver() == JDTestDriver.DRIVER_NATIVE ) { expectedBadConnectException = "Processing of the SQL statement ended"; } String powerPassword = PasswordVault.decryptPasswordLeak(pwrSysEncryptedPassword_); diff --git a/src/test/JD/Driver/JDDriverGetPropertyInfo.java b/src/test/JD/Driver/JDDriverGetPropertyInfo.java index 02890146..279f71b6 100644 --- a/src/test/JD/Driver/JDDriverGetPropertyInfo.java +++ b/src/test/JD/Driver/JDDriverGetPropertyInfo.java @@ -87,7 +87,7 @@ protected void setup() throws Exception { driver_ = DriverManager.getDriver(baseURL_); if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { - NUMBER_OF_PROPERTIES = 108; // trim char fields + NUMBER_OF_PROPERTIES = 109; // verification ID } else if (getDriver() == JDTestDriver.DRIVER_NATIVE) { int vrm_ = testDriver_.getRelease(); @@ -159,8 +159,8 @@ public void testProperty(String prop, String value, String inExpectedValue) { // Check the expected values String expectedValue = properties.getProperty(propertyInfo[i].name); - if (propertyInfo[i].name.equals("password") && (getDriver() == JDTestDriver.DRIVER_TOOLBOX)) { - expectedValue = ""; /* Toolbox does not return password */ + if (propertyInfo[i].name.equals("password")) { + expectedValue = ""; /* Drivers do not return password */ } if (expectedValue != null) { if (! expectedValue.equals(propertyInfo[i].value)) { diff --git a/src/test/JD/Driver/JDDriverMisc.java b/src/test/JD/Driver/JDDriverMisc.java index 4d77d3ee..9074ca49 100644 --- a/src/test/JD/Driver/JDDriverMisc.java +++ b/src/test/JD/Driver/JDDriverMisc.java @@ -962,9 +962,11 @@ public void Var016() { StringBuffer sb = new StringBuffer(); JVMRunUtility runUtility = new JVMRunUtility("test.JVMRunJDBC", baseURL_ + " " + userId_ + " " + PasswordVault.decryptPasswordLeak(encryptedPassword_, "JDDriverMisc.16") + " 200", 30); - + System.out.println("Var016: Starting JVM"); System.out.flush(); runUtility.startJVM(); + System.out.println("Var016: WaitForExit"); System.out.flush(); runUtility.waitForExit(); + System.out.println("Var016: after WaitForExit"); System.out.flush(); String[] topList = runUtility.getTopList(); output_.println("topList is "); if (topList == null) { diff --git a/src/test/JD/Driver/JDDriverTimestamp.java b/src/test/JD/Driver/JDDriverTimestamp.java index 9795df41..509f2794 100644 --- a/src/test/JD/Driver/JDDriverTimestamp.java +++ b/src/test/JD/Driver/JDDriverTimestamp.java @@ -82,11 +82,7 @@ public JDDriverTimestamp (AS400 systemObject, **/ protected void setup() throws Exception { if (getDriver() == JDTestDriver.DRIVER_NATIVE) { - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { timestampClassName = "com.ibm.db2.jdbc.app.DB2JDBCTimestamp"; - } else { - timestampClassName = null; - } } else if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { timestampClassName = "com.ibm.as400.access.AS400JDBCTimestamp"; } else { diff --git a/src/test/JD/Lob/JDLobClobLocator.java b/src/test/JD/Lob/JDLobClobLocator.java index 64a62d62..3921219e 100644 --- a/src/test/JD/Lob/JDLobClobLocator.java +++ b/src/test/JD/Lob/JDLobClobLocator.java @@ -8234,10 +8234,6 @@ public void Var256() { notApplicable("JDBC 4.0 testcase"); return; } - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("v7r3 or later variation -- make sure locator not accessible after rs.close() "); - return; - } if (Integer.parseInt(lobThreshold) > 10000) { notApplicable("Lob locator test\n"); @@ -8549,7 +8545,7 @@ public void Var300() { // If not running on AS/400 this takes too long. if (rows <= 25000 || checkClientOn400()) { - if (checkRelease710()) { + if (true) { if (checkJdbc40()) { try { StringBuffer sb1 = new StringBuffer(); diff --git a/src/test/JD/PS/JDPSBatch.java b/src/test/JD/PS/JDPSBatch.java index fb7099a1..b88c4f24 100644 --- a/src/test/JD/PS/JDPSBatch.java +++ b/src/test/JD/PS/JDPSBatch.java @@ -7046,13 +7046,6 @@ public void Var085 () // toolbox returns SUCCESS_NO_INFO in update array */ testString[9][2] = "-2,-2"; } - if ((getDriver() == JDTestDriver.DRIVER_NATIVE) && - (getRelease() <= JDTestDriver.RELEASE_V7R2M0) && - useBlockInsert) { - // Block insert does not correctly update counts in V5R4 and V6R1 and V7R1 and V7R2 - // and currently V7R2 (9/25/2013) - testString[9][2] = ""; - } testBatchError(testString, " -- native V7R2 needs to be enhanced/fixed"); @@ -7100,16 +7093,6 @@ public void Var086 () } - if ((getDriver() == JDTestDriver.DRIVER_NATIVE) && - (getRelease() <= JDTestDriver.RELEASE_V7R2M0) && - useBlockInsert) { - // Block insert does not correctly update counts in V5R4 and V6R1 and V7R1 - // and currently V7R2 (9/23/2013) - // Block insert also does not do any of the updateds - testString[10][2] = ""; - testString[13][0] = "EXTRA"; - testString[14][0] = "EXTRA"; - } testBatchError(testString, " -- native V7R2 needs to be enhanced/fixed"); diff --git a/src/test/JD/PS/JDPSExecute.java b/src/test/JD/PS/JDPSExecute.java index 200db0dc..113eb342 100644 --- a/src/test/JD/PS/JDPSExecute.java +++ b/src/test/JD/PS/JDPSExecute.java @@ -1171,7 +1171,7 @@ public void Var034() { **/ public void Var035() { String description = "New Array insert syntax test"; - if (checkRelease710()) { + if (true) { StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; @@ -1284,7 +1284,7 @@ public void Var036() { **/ public void Var037() { String description = "Values('abc') execution test -- added 10/23/2012 to detect bug in native JDBC driver"; - if (checkRelease610()) { /* values only in v6r1 and later */ + if (true) { /* values only in v6r1 and later */ StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; @@ -1321,7 +1321,7 @@ public void Var037() { public void Var038() { String description = "Values('abc' || ? ) execution test -- added 10/23/2012 to detect bug in native JDBC driver"; - if (checkRelease710()) { + if (true) { StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; @@ -1639,7 +1639,7 @@ public void Var048() { public void Var049() { if (checkJdbc42()) { String description = "New Array insert syntax test"; - if (checkRelease710()) { + if (true) { StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; diff --git a/src/test/JD/PS/JDPSResults.java b/src/test/JD/PS/JDPSResults.java index afe5c3b8..4669feb5 100644 --- a/src/test/JD/PS/JDPSResults.java +++ b/src/test/JD/PS/JDPSResults.java @@ -1396,7 +1396,7 @@ public void Var059() { * SI44489 SI44490 6.1 SI44487 SI44488 **/ public void Var060() { - if (checkRelease610()) { + if (true) { String added = " -- getUpdateCount from create table from select added 11/7/2011\nSee issue 46717. Depends on the following SQ PTFs.\n" + "7.1 SI44489 SI44490\n" + "6.1 SI44487 SI44488\n"; try { diff --git a/src/test/JD/PS/JDPSSetSQLXML.java b/src/test/JD/PS/JDPSSetSQLXML.java index d1c4456f..1d2b5b85 100644 --- a/src/test/JD/PS/JDPSSetSQLXML.java +++ b/src/test/JD/PS/JDPSSetSQLXML.java @@ -1721,10 +1721,6 @@ public void testSetSQLXMLSAXSource(int table, String var) { return; } - if (getRelease() <= JDTestDriver.RELEASE_V7R2M0) { - notApplicable("Sax source not implemented in V7R2"); - return; - } String added = " -- Testing SQLXMLSAXSource -- added by native driver 08/21/2009"; if (checkJdbc40()) { if (checkXmlSupport()) { diff --git a/src/test/JD/RS/JDRSGetBytes.java b/src/test/JD/RS/JDRSGetBytes.java index dfcba28a..537fd135 100644 --- a/src/test/JD/RS/JDRSGetBytes.java +++ b/src/test/JD/RS/JDRSGetBytes.java @@ -1661,7 +1661,7 @@ public void Var046() { public void Var047() { String added = " -- Added 5/15/2008 by native driver -- Fix made in V7R1 to retrieveLobFromLocator with getRawBytesForUTF8 flag. Not PTF'd back to previous releases because of fix complexity."; if (checkLobSupport()) { - if (checkRelease710()) { + if (true) { try { Statement stmt = connection_.createStatement(); ResultSet rs = stmt.executeQuery( diff --git a/src/test/JD/RS/JDRSGetObject41.java b/src/test/JD/RS/JDRSGetObject41.java index 10ac0c20..4748cd64 100644 --- a/src/test/JD/RS/JDRSGetObject41.java +++ b/src/test/JD/RS/JDRSGetObject41.java @@ -504,7 +504,7 @@ public void testGetObject(String[] testSpec) { public void Var010() { if (checkJdbc41()) { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.String", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -669,7 +669,7 @@ public void Var018() /* Test LocalDate with rowid, nchar, nvarchar, nclob X9 */ public void Var019() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.String", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -689,7 +689,7 @@ public void Var019() /* Test java.lang.Byte 2X with SQLXML X0 */ public void Var020() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Byte", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -814,7 +814,7 @@ public void Var028() /* Test java.lang.Byte 2X with rowid, nchar, nvarchar, nclob X9 */ public void Var029() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Byte", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -834,7 +834,7 @@ public void Var029() /* Test java.lang.Integer 3X with SQLXML X0 */ public void Var030() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Integer", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -959,7 +959,7 @@ public void Var038() /* Test java.lang.Integer 3X with rowid, nchar, nvarchar, nclob X9 */ public void Var039() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Integer", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -978,7 +978,7 @@ public void Var039() /* Test java.lang.Short 4X with SQLXML X0 */ public void Var040() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Short", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1103,7 +1103,7 @@ public void Var048() /* Test java.lang.Short 4X with rowid, nchar, nvarchar, nclob X9 */ public void Var049() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Short", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1123,7 +1123,7 @@ public void Var049() /* Test java.lang.Long 5X with SQLXML X0 */ public void Var050() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Long", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1248,7 +1248,7 @@ public void Var058() /* Test java.lang.Long 5X with rowid, nchar, nvarchar, nclob X9 */ public void Var059() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Long", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1269,7 +1269,7 @@ public void Var059() /* Test java.lang.Float 6X with SQLXML X0 */ public void Var060() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Float", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1394,7 +1394,7 @@ public void Var068() /* Test java.lang.Float 6X with rowid, nchar, nvarchar, nclob X9 */ public void Var069() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Float", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1415,7 +1415,7 @@ public void Var069() /* Test java.lang.Double 7X with SQLXML X0 */ public void Var070() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Double", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1540,7 +1540,7 @@ public void Var078() /* Test java.lang.Double 7X with rowid, nchar, nvarchar, nclob X9 */ public void Var079() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Double", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1561,7 +1561,7 @@ public void Var079() /* Test java.math.BigDecimal 8X with SQLXML X0 */ public void Var080() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.math.BigDecimal", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1686,7 +1686,7 @@ public void Var088() /* Test java.math.BigDecimal 8X with rowid, nchar, nvarchar, nclob X9 */ public void Var089() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.math.BigDecimal", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1708,7 +1708,7 @@ public void Var089() /* Test java.lang.Boolean 9X with SQLXML X0 */ public void Var090() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Boolean", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -1846,7 +1846,7 @@ public void Var098() /* Test java.lang.Boolean 9X with rowid, nchar, nvarchar, nclob X9 */ public void Var099() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Boolean", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('0' as NCHAR(10)), CAST('0' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -1870,7 +1870,7 @@ public void Var099() /* Test [B 10X with SQLXML X0 */ public void Var100() { - if (checkRelease710()) { + if (true) { String[] testArray = { "[B", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -2011,7 +2011,7 @@ public void Var108() /* Test [B 10X with rowid, nchar, nvarchar, nclob X9 */ public void Var109() { - if (checkRelease710()) { + if (true) { String[] testArray = { "[B", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -2035,7 +2035,7 @@ public void Var109() /* Test java.sql.Date 11X with SQLXML X0 */ public void Var110() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Date", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -2160,7 +2160,7 @@ public void Var118() /* Test java.sql.Date 11X with rowid, nchar, nvarchar, nclob X9 */ public void Var119() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Date", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('2011-09-11' as NCHAR(10)), CAST('2011-09-12' AS NVARCHAR(100)), CAST('2001-09-12' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -2183,7 +2183,7 @@ public void Var119() /* Test java.sql.Time 12X with SQLXML X0 */ public void Var120() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Time", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -2308,7 +2308,7 @@ public void Var128() /* Test java.sql.Time 12X with rowid, nchar, nvarchar, nclob X9 */ public void Var129() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Time", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('11:22:11' as NCHAR(10)), CAST('11:22:12' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -2330,7 +2330,7 @@ public void Var129() /* Test java.sql.Timestamp 13X with SQLXML X0 */ public void Var130() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Timestamp", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -2455,7 +2455,7 @@ public void Var138() /* Test java.sql.Timestamp 13X with rowid, nchar, nvarchar, nclob X9 */ public void Var139() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Timestamp", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('2011-09-01 11:22:11.111111' as NCHAR(26)), CAST('2011-09-01 11:22:12.222222' AS NVARCHAR(100)), CAST('1' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(26)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -2475,7 +2475,7 @@ public void Var139() /* Test java.io.InputStream 14X with SQLXML X0 */ public void Var140() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.InputStream", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -2661,7 +2661,7 @@ public void Var148() /* Test java.io.InputStream 14X with rowid, nchar, nvarchar, nclob X9 */ public void Var149() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.InputStream", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), " + @@ -2703,7 +2703,7 @@ public void Var149() /* Test java.io.Reader 15X with SQLXML X0 */ public void Var150() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.Reader", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -2883,7 +2883,7 @@ public void Var158() /* Test java.io.Reader 15X with rowid, nchar, nvarchar, nclob X9 */ public void Var159() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.Reader", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -2903,7 +2903,7 @@ public void Var159() /* Test java.sql.Clob 16X with SQLXML X0 */ public void Var160() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Clob", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -3080,7 +3080,7 @@ public void Var168() /* Test java.sql.Clob 16X with rowid, nchar, nvarchar, nclob X9 */ public void Var169() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Clob", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -3099,7 +3099,7 @@ public void Var169() /* Test java.sql.Blob 17X with SQLXML X0 */ public void Var170() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Blob", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -3268,7 +3268,7 @@ public void Var178() /* Test java.sql.Blob 17X with rowid, nchar, nvarchar, nclob X9 */ public void Var179() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Blob", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100))," + @@ -3310,7 +3310,7 @@ public void Var179() public void Var180() { if (checkJdbc40()) { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.NClob", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -3502,7 +3502,7 @@ public void Var188() /* Test java.sql.NClob 18X with rowid, nchar, nvarchar, NClob X9 */ public void Var189() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.NClob", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NClob(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NClob(100K)) from sysibm.sysdummy1", @@ -3540,7 +3540,7 @@ public void Var189() /* Test java.sql.Array 19X with SQLXML X0 */ public void Var190() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Array", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -3682,7 +3682,7 @@ public void Var198() /* Test java.sql.Array 19X with rowid, nchar, nvarchar, nArray X9 */ public void Var199() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Array", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), " + @@ -3706,7 +3706,7 @@ public void Var199() /* Test java.sql.Ref 20X with SQLXML X0 */ public void Var200() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Ref", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -3848,7 +3848,7 @@ public void Var208() /* Test java.sql.Ref 20X with rowid, nchar, nvarchar, nArray X9 */ public void Var209() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Ref", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), " + @@ -3873,7 +3873,7 @@ public void Var209() public void Var210() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.net.URL", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -4008,7 +4008,7 @@ public void Var218() /* Test java.net.URL 21X with rowid, nchar, nvarchar, nclob X9 */ public void Var219() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.net.URL", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -4028,7 +4028,7 @@ public void Var219() /* Test object 22X with SQLXML X0 */ public void Var220() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Object", "select XMLPARSE( DOCUMENT 'hello' ), CAST(null as XML) from sysibm.sysdummy1", @@ -4166,7 +4166,7 @@ public void Var228() /* Test object 22X with rowid, nchar, nvarchar, nclob X9 */ public void Var229() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Object", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('ABC' as NCHAR(10)), CAST('ABC' AS NVARCHAR(100)), CAST('ABC' AS NCLOB(100K)), CAST(null AS ROWID), CAST(null as NCHAR(10)), CAST(null AS NVARCHAR(100)), CAST(null AS NCLOB(100K)) from sysibm.sysdummy1", @@ -4189,7 +4189,7 @@ public void Var229() /* Test java.sql.RowId 23X with SQLXML X0 */ public void Var230() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.RowId", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -4353,7 +4353,7 @@ public void Var238() /* Test java.sql.RowId 23X with rowid, nchar, nvarchar, nclob X9 */ public void Var239() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.RowId", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), CAST('1' as NCHAR(10)), CAST('1' AS NVARCHAR(100))," + @@ -4376,7 +4376,7 @@ public void Var239() /* Test java.sql.SQLXML 24X with SQLXML X0 */ public void Var240() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.SQLXML", "select XMLPARSE( DOCUMENT 'hello' ), CAST(NULL AS XML) from sysibm.sysdummy1", @@ -4568,7 +4568,7 @@ public void Var248() public void Var249() { // Update 2/21/2014 Toolbox SQLXML expects valid SQL - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.SQLXML", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID), "+ @@ -5007,7 +5007,7 @@ public void testGetObjectNamed(String[] testSpec) { /* Test LocalDate with SQLXML X0 */ public void Var310() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.String", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5170,7 +5170,7 @@ public void Var318() /* Test LocalDate with rowid, nchar, nvarchar, nclob X9 */ public void Var319() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.String", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5190,7 +5190,7 @@ public void Var319() /* Test java.lang.Byte 2X with SQLXML X0 */ public void Var320() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Byte", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5315,7 +5315,7 @@ public void Var328() /* Test java.lang.Byte 2X with rowid, nchar, nvarchar, nclob X9 */ public void Var329() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Byte", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5335,7 +5335,7 @@ public void Var329() /* Test java.lang.Integer 3X with SQLXML X0 */ public void Var330() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Integer", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5460,7 +5460,7 @@ public void Var338() /* Test java.lang.Integer 3X with rowid, nchar, nvarchar, nclob X9 */ public void Var339() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Integer", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5479,7 +5479,7 @@ public void Var339() /* Test java.lang.Short 4X with SQLXML X0 */ public void Var340() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Short", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5604,7 +5604,7 @@ public void Var348() /* Test java.lang.Short 4X with rowid, nchar, nvarchar, nclob X9 */ public void Var349() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Short", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5624,7 +5624,7 @@ public void Var349() /* Test java.lang.Long 5X with SQLXML X0 */ public void Var350() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Long", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5749,7 +5749,7 @@ public void Var358() /* Test java.lang.Long 5X with rowid, nchar, nvarchar, nclob X9 */ public void Var359() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Long", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5770,7 +5770,7 @@ public void Var359() /* Test java.lang.Float 6X with SQLXML X0 */ public void Var360() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Float", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -5895,7 +5895,7 @@ public void Var368() /* Test java.lang.Float 6X with rowid, nchar, nvarchar, nclob X9 */ public void Var369() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Float", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -5916,7 +5916,7 @@ public void Var369() /* Test java.lang.Double 7X with SQLXML X0 */ public void Var370() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Double", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6041,7 +6041,7 @@ public void Var378() /* Test java.lang.Double 7X with rowid, nchar, nvarchar, nclob X9 */ public void Var379() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Double", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -6062,7 +6062,7 @@ public void Var379() /* Test java.math.BigDecimal 8X with SQLXML X0 */ public void Var380() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.math.BigDecimal", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6187,7 +6187,7 @@ public void Var388() /* Test java.math.BigDecimal 8X with rowid, nchar, nvarchar, nclob X9 */ public void Var389() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.math.BigDecimal", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -6209,7 +6209,7 @@ public void Var389() /* Test java.lang.Boolean 9X with SQLXML X0 */ public void Var390() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Boolean", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6347,7 +6347,7 @@ public void Var398() /* Test java.lang.Boolean 9X with rowid, nchar, nvarchar, nclob X9 */ public void Var399() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Boolean", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('0' as NCHAR(10)) AS C4, CAST('0' AS NVARCHAR(100)) AS C5, CAST('1' AS NCLOB(100K)) AS C6, CAST(null AS ROWID) AS C7, CAST(null as NCHAR(10)) AS C8, CAST(null AS NVARCHAR(100)) AS C9, CAST(null AS NCLOB(100K)) AS C10 from sysibm.sysdummy1", @@ -6371,7 +6371,7 @@ public void Var399() /* Test [B 10X with SQLXML X0 */ public void Var400() { - if (checkRelease710()) { + if (true) { String[] testArray = { "[B", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6515,7 +6515,7 @@ public void Var408() /* Test [B 10X with rowid, nchar, nvarchar, nclob X9 */ public void Var409() { - if (checkRelease710()) { + if (true) { String[] testArray = { "[B", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -6561,7 +6561,7 @@ public void Var409() /* Test java.sql.Date 11X with SQLXML X0 */ public void Var410() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Date", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6686,7 +6686,7 @@ public void Var418() /* Test java.sql.Date 11X with rowid, nchar, nvarchar, nclob X9 */ public void Var419() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Date", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('2011-09-11' as NCHAR(10)) AS C2, CAST('2011-09-12' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -6709,7 +6709,7 @@ public void Var419() /* Test java.sql.Time 12X with SQLXML X0 */ public void Var420() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Time", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6834,7 +6834,7 @@ public void Var428() /* Test java.sql.Time 12X with rowid, nchar, nvarchar, nclob X9 */ public void Var429() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Time", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('11:22:11' as NCHAR(10)) AS C2, CAST('11:22:12' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -6856,7 +6856,7 @@ public void Var429() /* Test java.sql.Timestamp 13X with SQLXML X0 */ public void Var430() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Timestamp", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -6981,7 +6981,7 @@ public void Var438() /* Test java.sql.Timestamp 13X with rowid, nchar, nvarchar, nclob X9 */ public void Var439() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Timestamp", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('2011-09-01 11:22:11.111111' as NCHAR(26)) AS C2, CAST('2011-09-01 11:22:12.222222' AS NVARCHAR(100)) AS C3, CAST('1' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(26)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -7001,7 +7001,7 @@ public void Var439() /* Test java.io.InputStream 14X with SQLXML X0 */ public void Var440() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.InputStream", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -7182,7 +7182,7 @@ public void Var448() /* Test java.io.InputStream 14X with rowid, nchar, nvarchar, nclob X9 */ public void Var449() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.InputStream", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, " + @@ -7224,7 +7224,7 @@ public void Var449() /* Test java.io.Reader 15X with SQLXML X0 */ public void Var450() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.Reader", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -7402,7 +7402,7 @@ public void Var458() /* Test java.io.Reader 15X with rowid, nchar, nvarchar, nclob X9 */ public void Var459() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.io.Reader", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -7422,7 +7422,7 @@ public void Var459() /* Test java.sql.Clob 16X with SQLXML X0 */ public void Var460() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Clob", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -7600,7 +7600,7 @@ public void Var468() /* Test java.sql.Clob 16X with rowid, nchar, nvarchar, nclob X9 */ public void Var469() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Clob", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -7619,7 +7619,7 @@ public void Var469() /* Test java.sql.Blob 17X with SQLXML X0 */ public void Var470() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Blob", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -7780,7 +7780,7 @@ public void Var478() /* Test java.sql.Blob 17X with rowid, nchar, nvarchar, nclob X9 */ public void Var479() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Blob", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3," + @@ -7825,7 +7825,7 @@ public void Var479() public void Var480() { if (checkJdbc40()) { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.NClob", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8016,7 +8016,7 @@ public void Var488() /* Test java.sql.NClob 18X with rowid, nchar, nvarchar, NClob X9 */ public void Var489() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.NClob", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -8055,7 +8055,7 @@ public void Var489() /* Test java.sql.Array 19X with SQLXML X0 */ public void Var490() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Array", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8197,7 +8197,7 @@ public void Var498() /* Test java.sql.Array 19X with rowid, nchar, nvarchar, nArray X9 */ public void Var499() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Array", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, " + @@ -8221,7 +8221,7 @@ public void Var499() /* Test java.sql.Ref 20X with SQLXML X0 */ public void Var500() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Ref", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8363,7 +8363,7 @@ public void Var508() /* Test java.sql.Ref 20X with rowid, nchar, nvarchar, nArray X9 */ public void Var509() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.Ref", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, " + @@ -8388,7 +8388,7 @@ public void Var509() public void Var510() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.net.URL", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8523,7 +8523,7 @@ public void Var518() /* Test java.net.URL 21X with rowid, nchar, nvarchar, nclob X9 */ public void Var519() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.net.URL", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -8543,7 +8543,7 @@ public void Var519() /* Test object 22X with SQLXML X0 */ public void Var520() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Object", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8679,7 +8679,7 @@ public void Var528() /* Test object 22X with rowid, nchar, nvarchar, nclob X9 */ public void Var529() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.lang.Object", "select CAST(CAST(X'1122' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('ABC' as NCHAR(10)) AS C2, CAST('ABC' AS NVARCHAR(100)) AS C3, CAST('ABC' AS NCLOB(100K)) AS C4, CAST(null AS ROWID) AS C5, CAST(null as NCHAR(10)) AS C6, CAST(null AS NVARCHAR(100)) AS C7, CAST(null AS NCLOB(100K)) AS C8 from sysibm.sysdummy1", @@ -8702,7 +8702,7 @@ public void Var529() /* Test java.sql.RowId 23X with SQLXML X0 */ public void Var530() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.RowId", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -8864,7 +8864,7 @@ public void Var538() /* Test java.sql.RowId 23X with rowid, nchar, nvarchar, nclob X9 */ public void Var539() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.RowId", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, CAST('1' as NCHAR(10)) AS C2, CAST('1' AS NVARCHAR(100)) AS C3," + @@ -8887,7 +8887,7 @@ public void Var539() /* Test java.sql.SQLXML 24X with SQLXML X0 */ public void Var540() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.SQLXML", "select XMLPARSE( DOCUMENT 'hello' ) as C1, CAST(null as XML) as C2 from sysibm.sysdummy1", @@ -9078,7 +9078,7 @@ public void Var548() /* Test java.sql.SQLXML 24X with rowid, nchar, nvarchar, nclob X9 */ public void Var549() { - if (checkRelease710()) { + if (true) { String[] testArray = { "java.sql.SQLXML", "select CAST(CAST(X'01' AS CHAR(2) FOR BIT DATA) AS ROWID) AS C1, "+ diff --git a/src/test/JD/RS/JDRSGetString.java b/src/test/JD/RS/JDRSGetString.java index cda4721b..f8bd36c8 100644 --- a/src/test/JD/RS/JDRSGetString.java +++ b/src/test/JD/RS/JDRSGetString.java @@ -2328,12 +2328,6 @@ public void appendHex(StringBuffer sb, String s) { public void Var083 () { - // Don't check for toolbox until V7R2 - if (isToolboxDriver() && - getRelease() < JDTestDriver.RELEASE_V7R2M0) { - notApplicable("substitution test not application for toolbox < v7r2"); - return; - } StringBuffer sb = new StringBuffer(); /* Classic output is at [][1] */ /* J9 is at [][2] */ diff --git a/src/test/JD/RS/JDRowSetRSTestcase.java b/src/test/JD/RS/JDRowSetRSTestcase.java index ebfa9fea..f48e7b2b 100644 --- a/src/test/JD/RS/JDRowSetRSTestcase.java +++ b/src/test/JD/RS/JDRowSetRSTestcase.java @@ -78,6 +78,8 @@ public static void main(String args[]) throws Exception { private Connection conn2_; // @pda for creatign Nclobs StringBuffer sb = new StringBuffer(); + boolean useStringPassword = false; + /** * Constructor. **/ @@ -153,6 +155,9 @@ protected void setup() throws Exception { } } else { + if (getRelease() <= JDTestDriver.RELEASE_V7R6M0) { + useStringPassword = true; + } System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.fscontext.RefFSContextFactory"); jndiName_ = "jdbc"; ds = (DataSource) JDReflectionUtil.createObject("com.ibm.db2.jdbc.app.UDBDataSource"); @@ -476,6 +481,16 @@ public boolean compareColumns(int i, Object[] before, Object[] after, boolean[] return success; } + private void setPassword(RowSet rowset) throws Exception { + if (useStringPassword) { + JDReflectionUtil.callMethod_V(rowset, "setPassword", PasswordVault.decryptPasswordLeak(encryptedPassword_)); + } else { + char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); + JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); + PasswordVault.clearPassword(charPassword); + } + } + /** * updateRow() - Should update exactly 1 column when updates are pending. **/ @@ -677,9 +692,7 @@ public void Var004() { rowset = getRowSet(name); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setConcurrency(ResultSet.CONCUR_UPDATABLE); if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) @@ -760,9 +773,7 @@ public void Var005() { RowSet rowset = getRowSet(name); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setConcurrency(ResultSet.CONCUR_UPDATABLE); if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) // @C1A @@ -799,9 +810,7 @@ public void Var006() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.execute(); @@ -924,9 +933,7 @@ public void Var008() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setCommand("SELECT CUSNUM,LSTNAM,INIT FROM QIWS.QCUSTCDT"); rowset.execute(); @@ -945,9 +952,7 @@ public void Var009() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS); rowset.execute(); @@ -971,9 +976,7 @@ public void Var010() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1002,9 +1005,7 @@ public void Var011() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1031,9 +1032,7 @@ public void Var012() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1061,9 +1060,9 @@ public void Var013() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1090,9 +1089,9 @@ public void Var014() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1118,9 +1117,9 @@ public void Var015() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1144,9 +1143,9 @@ public void Var016() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1171,9 +1170,9 @@ public void Var017() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1194,9 +1193,9 @@ public void Var018() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1217,9 +1216,9 @@ public void Var019() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1240,9 +1239,9 @@ public void Var020() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1263,9 +1262,9 @@ public void Var021() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1286,9 +1285,9 @@ public void Var022() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1315,9 +1314,9 @@ public void Var023() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1339,9 +1338,9 @@ public void Var024() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1365,9 +1364,9 @@ public void Var025() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1391,9 +1390,9 @@ public void Var026() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1418,9 +1417,9 @@ public void Var027() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1445,9 +1444,9 @@ public void Var028() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1471,9 +1470,9 @@ public void Var029() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1496,9 +1495,9 @@ public void Var030() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1520,9 +1519,9 @@ public void Var031() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1544,9 +1543,9 @@ public void Var032() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1568,9 +1567,9 @@ public void Var033() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1592,9 +1591,9 @@ public void Var034() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1616,9 +1615,9 @@ public void Var035() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1640,9 +1639,9 @@ public void Var036() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1664,9 +1663,9 @@ public void Var037() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1688,9 +1687,9 @@ public void Var038() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1712,9 +1711,9 @@ public void Var039() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1736,9 +1735,10 @@ public void Var040() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + setPassword(rowset); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1753,6 +1753,7 @@ public void Var040() { } } + /** * getObject() - Should work when the column name is valid. **/ @@ -1760,9 +1761,9 @@ public void Var041() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1786,9 +1787,9 @@ public void Var042() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1818,9 +1819,9 @@ public void Var043() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1846,9 +1847,9 @@ public void Var044() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1870,9 +1871,9 @@ public void Var045() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS + " WHERE ID = 1"); rowset.execute(); @@ -1894,9 +1895,9 @@ public void Var046() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1918,9 +1919,9 @@ public void Var047() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -1943,9 +1944,9 @@ public void Var048() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS + " WHERE ID = -1"); rowset.execute(); @@ -1967,9 +1968,9 @@ public void Var049() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS); rowset.execute(); @@ -1995,9 +1996,9 @@ public void Var050() { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setConcurrency(ResultSet.CONCUR_UPDATABLE); rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_UPDATE + " FOR UPDATE"); @@ -2028,9 +2029,9 @@ public void Var051() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2057,9 +2058,9 @@ public void Var052() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2086,9 +2087,9 @@ public void Var053() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2110,9 +2111,9 @@ public void Var054() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2134,9 +2135,9 @@ public void Var055() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2158,9 +2159,9 @@ public void Var056() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2182,9 +2183,9 @@ public void Var057() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2206,9 +2207,9 @@ public void Var058() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2231,9 +2232,9 @@ public void Var059() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand(command); String command2 = rowset.getCommand(); rowset.close(); @@ -2253,9 +2254,9 @@ public void Var060() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setConcurrency(concurrency); int resultConcurrency = rowset.getConcurrency(); rowset.close(); @@ -2273,9 +2274,9 @@ public void Var061() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setConcurrency(concurrency); int resultCurrency = rowset.getConcurrency(); rowset.close(); @@ -2292,9 +2293,9 @@ public void Var062() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.execute(); @@ -2332,9 +2333,9 @@ public void Var064() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.setEscapeProcessing(false); boolean resultEscapeProcessing = rowset.getEscapeProcessing(); @@ -2352,9 +2353,9 @@ public void Var065() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.execute(); @@ -2410,9 +2411,9 @@ public void Var068() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.execute(); @@ -2451,9 +2452,9 @@ public void Var070() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + // @A1 if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { rowset.setCommand("CREATE TABLE QGPL.TESTTBLE (I INTEGER)"); @@ -2507,9 +2508,9 @@ public void Var072() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); int size = 25; @@ -2552,9 +2553,9 @@ public void Var074() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); int size = 25; @@ -2581,9 +2582,9 @@ public void Var075() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -2623,9 +2624,9 @@ public void Var077() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.setQueryTimeout(expected); @@ -2651,9 +2652,9 @@ public void Var078() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.execute(); Statement statement = rowset.getStatement(); @@ -2700,9 +2701,9 @@ public void Var080() { rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + // @A1 if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { rowset.setCommand("INSERT INTO " + JDRSTest.RSTEST_UPDATE + " (C_KEY) VALUES ('test')"); @@ -2728,9 +2729,9 @@ public void Var081() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); int type = ResultSet.TYPE_SCROLL_INSENSITIVE; @@ -2769,9 +2770,9 @@ public void Var083() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setCommand("SELECT * FROM QIWS.QCUSTCDT"); rowset.setMaxRows(25); @@ -2923,9 +2924,9 @@ public void Var089() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setConcurrency(ResultSet.CONCUR_UPDATABLE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS + " WHERE ID = 1"); @@ -2964,9 +2965,9 @@ public void Var090() { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setConcurrency(ResultSet.CONCUR_UPDATABLE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_POS + " FOR UPDATE"); @@ -4180,9 +4181,9 @@ public void Var127() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + // @A1 if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { rowset.setCommand("CREATE TABLE QGPL.TESTTBLE (G INTEGER)"); @@ -4201,9 +4202,9 @@ public void Var127() { // @A1 if (getDriver() == JDTestDriver.DRIVER_TOOLBOX) { rowset.setUsername(systemObject_.getUserId()); // @K1A - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); // @K1A //@K1A - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); // @K1A //@K1A + rowset.setCommand("DROP TABLE QGPL.TESTTBLE"); // @K1A rowset.execute(); } else { @@ -5308,9 +5309,9 @@ public void Var166() { try { rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5344,9 +5345,9 @@ public void Var167() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5371,9 +5372,9 @@ public void Var168() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5397,9 +5398,9 @@ public void Var169() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5424,9 +5425,9 @@ public void Var170() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5451,9 +5452,9 @@ public void Var171() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5478,9 +5479,9 @@ public void Var172() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5510,9 +5511,9 @@ public void Var173() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); @@ -5541,9 +5542,9 @@ public void Var174() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GETX); rowset.execute(); @@ -5569,9 +5570,9 @@ public void Var175() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GETX); rowset.execute(); @@ -5598,9 +5599,9 @@ public void Var176() { try { RowSet rowset = getRowSet(jndiName_); rowset.setUsername(systemObject_.getUserId()); - char[] charPassword = PasswordVault.decryptPassword(encryptedPassword_); - JDReflectionUtil.callMethod_V(rowset, "setPassword", charPassword); - PasswordVault.clearPassword(charPassword); + + setPassword(rowset); + rowset.setType(ResultSet.TYPE_SCROLL_SENSITIVE); rowset.setCommand("SELECT * FROM " + JDRSTest.RSTEST_GET); rowset.execute(); diff --git a/src/test/JD/Statement/JDStatementExecute.java b/src/test/JD/Statement/JDStatementExecute.java index 800792b3..ed6ee578 100644 --- a/src/test/JD/Statement/JDStatementExecute.java +++ b/src/test/JD/Statement/JDStatementExecute.java @@ -184,6 +184,7 @@ public void Var001() try { Statement s = connection_.createStatement (); s.executeUpdate (null); + s.close(); failed ("Didn't throw SQLException"); } catch (Exception e) { @@ -201,6 +202,7 @@ public void Var002() try { Statement s = connection_.createStatement (); s.executeUpdate (""); + s.close(); failed ("Didn't throw SQLException"); } catch (Exception e) { @@ -314,20 +316,6 @@ public void Var007() String expectedSqlstate="07001"; String expectedSqlmessage="Number of host variables not valid."; - // - // For the native driver, the CLI is not properly returning an error for some cases. - // This should be fixed in V7R2. - // - if (getDriver() == JDTestDriver.DRIVER_NATIVE && getRelease() < JDTestDriver.RELEASE_V7R2M0) { - - if (e instanceof SQLException) { - if (((SQLException)e). getErrorCode() == -99999) { - expectedSqlcode=-99999; - expectedSqlstate="JDBC\u0000"; - expectedSqlmessage="Internal Error: CLI signalled an error condition and had no error data available."; - } - } - } assertSqlException(e, expectedSqlcode, expectedSqlstate, expectedSqlmessage, "Expected syntax error for parameter marker -- updated 8/5/2010"); } } @@ -1810,7 +1798,7 @@ public void Var051() **/ public void Var052() { String description = "New Array insert syntax test"; - if (checkRelease710()) { + if (true) { StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; @@ -1855,7 +1843,7 @@ public void Var052() { **/ public void Var053() { String description = "New Array insert syntax test"; - if (checkRelease710()) { + if (true) { StringBuffer testInfo = new StringBuffer(); boolean passed = true; String sql = ""; @@ -2111,7 +2099,7 @@ public void Var058() public void Var059() { - if (checkRelease610()) { + if (true) { StringBuffer sb = new StringBuffer(); boolean passed = true; String[][] queries = { @@ -2161,7 +2149,7 @@ public void Var059() public void Var060() { - if (checkRelease710()) { + if (true) { StringBuffer sb = new StringBuffer(); boolean passed = true; String[][] queries = { @@ -2430,20 +2418,6 @@ public void Var067() String expectedSqlstate="07001"; String expectedSqlmessage="Number of host variables not valid."; - // - // For the native driver, the CLI is not properly returning an error for some cases. - // This should be fixed in V7R2. - // - if (getDriver() == JDTestDriver.DRIVER_NATIVE && getRelease() < JDTestDriver.RELEASE_V7R2M0) { - - if (e instanceof SQLException) { - if (((SQLException)e). getErrorCode() == -99999) { - expectedSqlcode=-99999; - expectedSqlstate="JDBC\u0000"; - expectedSqlmessage="Internal Error: CLI signalled an error condition and had no error data available."; - } - } - } assertSqlException(e, expectedSqlcode, expectedSqlstate, expectedSqlmessage, "Expected syntax error for parameter marker -- updated 8/5/2010"); } } diff --git a/src/test/JD/Statement/JDStatementMisc.java b/src/test/JD/Statement/JDStatementMisc.java index 6ad39499..ce1f9c4e 100644 --- a/src/test/JD/Statement/JDStatementMisc.java +++ b/src/test/JD/Statement/JDStatementMisc.java @@ -3745,7 +3745,7 @@ public void Var080() **/ public void Var081() { - if (checkRelease720()) { + if (true) { StringBuffer sb = new StringBuffer(); sb.append(" -- Test fetch error after combined open fetch -- toolbox issue 46618 -- need both toolbox fix and fix from john broich \n"); ; boolean passed = true; diff --git a/src/test/JD/Statement/JDStatementQueryTimeout.java b/src/test/JD/Statement/JDStatementQueryTimeout.java index bc9744b5..872e5687 100644 --- a/src/test/JD/Statement/JDStatementQueryTimeout.java +++ b/src/test/JD/Statement/JDStatementQueryTimeout.java @@ -102,7 +102,7 @@ protected void setup () connection_ = testDriver_.getConnection (baseURL_, userId_, encryptedPassword_); connection2_ = testDriver_.getConnection (baseURL_, userId_, encryptedPassword_); connection3_ = testDriver_.getConnection (baseURL_, userId_, encryptedPassword_); - connectionPwrSys_ = testDriver_.getConnection (baseURL_, pwrSysUserID_, pwrSysEncryptedPassword_);//@I3A + connectionPwrSys_ = testDriver_.getConnection (baseURL_+";prefetch=false", pwrSysUserID_, pwrSysEncryptedPassword_);//@I3A } @@ -334,7 +334,8 @@ public void Var006() long queryEnd = 0; char letter = 'e'; - String query = "SELECT a.table_name FROM QSYS2.SYSTABLES a, QSYS2.SYSVIEWS, QSYS2.SYSCOLUMNS, QSYS2.SYSINDEXES, QSYS2.SYSCOLUMNS b, QSYS2.SYSCOLUMNS c, QSYS2.SYSCOLUMNS d "; /* @F1C */ + String query = "SELECT a.table_name FROM QSYS2.SYSTABLES a, QSYS2.SYSVIEWS b, QSYS2.SYSCOLUMNS c, QSYS2.SYSINDEXES d "; + String orderBy=" order by a.table_name, c.column_name"; initializeSlow (); // Need to use the connectionPwrSys_ connection because @I3A @@ -354,7 +355,7 @@ public void Var006() try { queryStart = System.currentTimeMillis(); - s.executeQuery (query + " optimize for all rows"); + s.executeQuery (query + orderBy + " optimize for all rows"); queryEnd = System.currentTimeMillis(); // If query took less than a second and a half, make it bigger and retry diff --git a/src/test/JD/Statement/JDStatementResults.java b/src/test/JD/Statement/JDStatementResults.java index 8f5a67b0..a7e3ac52 100644 --- a/src/test/JD/Statement/JDStatementResults.java +++ b/src/test/JD/Statement/JDStatementResults.java @@ -4208,7 +4208,7 @@ public void Var103() **/ public void Var104() { - if (checkRelease610()) { + if (true) { String added = " -- getUpdateCount from create table from select added 11/7/2011\nSee issue 46717. Depends on the following SQ PTFs.\n"+ "7.1 SI44489 SI44490\n"+ "6.1 SI44487 SI44488\n"; @@ -4580,7 +4580,7 @@ public void Var120() { **/ public void Var121() { if (checkJdbc42()) { - if (checkRelease610()) { + if (true) { String added = " -- getLargeUpdateCount from create table from select added 11/7/2011\nSee issue 46717. Depends on the following SQ PTFs.\n" + "7.1 SI44489 SI44490\n" + "6.1 SI44487 SI44488\n"; try { diff --git a/src/test/JD/Statement/JDStatementStressTest.java b/src/test/JD/Statement/JDStatementStressTest.java index a694c9b1..616fd51b 100644 --- a/src/test/JD/Statement/JDStatementStressTest.java +++ b/src/test/JD/Statement/JDStatementStressTest.java @@ -3523,8 +3523,7 @@ public void appendHeader(StringBuffer sb, int beginIndex, int chars) { protected boolean skipCcsid(int ccsid) { if (getDriver() == JDTestDriver.DRIVER_NATIVE) { - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0 - && getRelease() < JDTestDriver.RELEASE_V7R4M0) { + if ( getRelease() < JDTestDriver.RELEASE_V7R4M0) { // The following CCSIDs are not supported by PASE switch (ccsid) { case 1047: diff --git a/src/test/JD/XML/JDXMLXML.java b/src/test/JD/XML/JDXMLXML.java index a7099580..34e92ff2 100644 --- a/src/test/JD/XML/JDXMLXML.java +++ b/src/test/JD/XML/JDXMLXML.java @@ -5331,7 +5331,7 @@ public void Var492() { * Make sure that 250000 rows can be processed. */ public void Var493() { - if (checkRelease710()) { + if (true) { if (checkJdbc40()) { Object o = null; try { diff --git a/src/test/JDCleanSplfJdbc.java b/src/test/JDCleanSplfJdbc.java index d64c8589..bdb860c5 100644 --- a/src/test/JDCleanSplfJdbc.java +++ b/src/test/JDCleanSplfJdbc.java @@ -193,7 +193,7 @@ public static JDCleanSplfJdbcResults deleteSpoolFiles(PrintStream out, Connectio out.println(nestLevel + "Attempting deleteSpoolFiles " + startTimestamp + " - " + endTimestamp); if (startFilterTime >= endFilterTime) { out.println(nestLevel + "**** Warning -- aborting since time filters are the same"); - return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0); + return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0,0); } try { @@ -220,7 +220,7 @@ public static JDCleanSplfJdbcResults deleteSpoolFiles(PrintStream out, Connectio long quarterTime = (endFilterTime - startFilterTime) / 4; if (quarterTime < 1000) { out.println(" **** Warning *** quarter time too small . aborting"); - return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0); + return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0,0); } JDCleanSplfJdbcResults firstResults = deleteSpoolFiles(out, conn, nestLevel + "a ", startFilterTime, @@ -286,7 +286,7 @@ public static JDCleanSplfJdbcResults deleteUselessSpoolFiles(PrintStream out, Co long quarterTime = (endFilterTime - startFilterTime) / 4; if (quarterTime < 1000) { out.println(" **** Warning *** quarter time too small . aborting"); - return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0); + return new JDCleanSplfJdbcResults(0, 0, 0, 0, 0, 0,0); } else { JDCleanSplfJdbcResults resultsA = deleteUselessSpoolFiles(out, conn, nestLevel + "a ", startFilterTime, @@ -387,10 +387,11 @@ public static JDCleanSplfJdbcResults deleteSpoolFilesAttempt(PrintStream out, Co long deleteBytes = clean.deleteBytes_; long keepCount = clean.keepCount_; long keepBytes = clean.keepBytes_; + long errorCount = clean.errorCount_; long processCount = 0; int processSeconds = (int) (finishMillis + 500 - startMillis) / 1000; - return new JDCleanSplfJdbcResults(deleteCount, deleteBytes, keepCount, keepBytes, processCount, processSeconds); + return new JDCleanSplfJdbcResults(deleteCount, deleteBytes, keepCount, keepBytes, processCount, processSeconds, errorCount); } public static JDCleanSplfJdbcResults deleteUselessSpoolFilesAttempt(PrintStream out, Connection c, String nestLevel, @@ -413,7 +414,8 @@ public static JDCleanSplfJdbcResults deleteUselessSpoolFilesAttempt(PrintStream long deleteBytes = clean.deleteBytes_; long keepCount = clean.keepCount_; long keepBytes = clean.keepBytes_; - + long errorCount = clean.errorCount_; + long processCount = 0; int processSeconds = (int) (System.currentTimeMillis() - startMillis) / 1000; @@ -424,7 +426,7 @@ public static JDCleanSplfJdbcResults deleteUselessSpoolFilesAttempt(PrintStream out.println(nestLevel + "DONE for " + startTimestamp + " - " + endTimestamp + " deleteCount=" + deleteCount + " keepCount=" + keepCount + " processCount=" + processCount + " time=" + hours + ":" + minutes + ":" + seconds); - return new JDCleanSplfJdbcResults(deleteCount, deleteBytes, keepCount, keepBytes, processCount, processSeconds); + return new JDCleanSplfJdbcResults(deleteCount, deleteBytes, keepCount, keepBytes, processCount, processSeconds, errorCount); } String nestLevel_ = ""; @@ -436,6 +438,7 @@ public static JDCleanSplfJdbcResults deleteUselessSpoolFilesAttempt(PrintStream long keepCount_ = 0; long keepBytes_ = 0; long processCount_ = 0; + long errorCount_ = 0; CharConverter charConverter_ = null; Connection conn_; Statement stmt_; @@ -453,6 +456,7 @@ public JDCleanSplfJdbc(PrintStream out, Connection conn, String nestLevel, boole keepCount_ = 0; keepBytes_ = 0; processCount_ = 0; + errorCount_ = 0; this.out = out; try { charConverter_ = new CharConverter(37); @@ -474,6 +478,7 @@ public JDCleanSplfJdbc(PrintStream out, Connection conn, String nestLevel) throw keepCount_ = 0; keepBytes_ = 0; processCount_ = 0; + errorCount_ = 0; this.out = out; try { charConverter_ = new CharConverter(37); @@ -514,7 +519,7 @@ public void processSplf(String jobUser, String fileName, int fileNumber, String processCount_++; if (processCount_ % 1000 == 0) { out.println( - nestLevel_ + " processCount=" + processCount_ + " deleteCount=" + deleteCount_ + " keepCount=" + keepCount_); + nestLevel_ + " processCount=" + processCount_ + " deleteCount=" + deleteCount_ + " keepCount=" + keepCount_+" errorCount="+errorCount_); out.println(nestLevel_ + " fileInfo = " + createTimestamp + " " + jobUser + " " + fileName + " " + fileNumber + " " + fileJobName + " " + fileJobUser + " " + fileJobNumber); /* Check the number of jobs and delete extra if needed */ @@ -589,10 +594,10 @@ public void processSplf(String jobUser, String fileName, int fileNumber, String } try { - deleteBytes_ += dataLength; String sql = "CALL QSYS2.QCMDEXC(" + "'DLTSPLF FILE(" + fileName + ") " + "JOB(" + fileJobNumber + "/" + fileJobUser + "/" + fileJobName + ") " + "SPLNBR(" + fileNumber + ") ')"; stmt_.executeUpdate(sql); + deleteBytes_ += dataLength; deleteCount_++; } catch (Exception e1) { Timestamp ts = new Timestamp(System.currentTimeMillis()); @@ -608,6 +613,7 @@ public void processSplf(String jobUser, String fileName, int fileNumber, String e1.printStackTrace(out); } } + errorCount_ ++ ; } } else { try { diff --git a/src/test/JDCleanSplfJdbcResults.java b/src/test/JDCleanSplfJdbcResults.java index 888eab49..bf4ddf8f 100644 --- a/src/test/JDCleanSplfJdbcResults.java +++ b/src/test/JDCleanSplfJdbcResults.java @@ -19,18 +19,20 @@ public class JDCleanSplfJdbcResults { public long deleteBytes; public long keepCount; public long keepBytes; + public long errorCount; public long processedCount; public long processSeconds; public JDCleanSplfJdbcResults(long deleteCount, long deleteBytes, long keepCount, long keepBytes, long processedCount, - long processSeconds) { + long processSeconds, long errorCount) { this.deleteCount = deleteCount; this.deleteBytes = deleteBytes; this.keepCount = keepCount; this.keepBytes = keepBytes; this.processedCount = processedCount; this.processSeconds = processSeconds; + this.errorCount = errorCount; } public JDCleanSplfJdbcResults(JDCleanSplfJdbcResults a, JDCleanSplfJdbcResults b) { @@ -40,6 +42,7 @@ public JDCleanSplfJdbcResults(JDCleanSplfJdbcResults a, JDCleanSplfJdbcResults b this.keepBytes = a.keepBytes + b.keepBytes; this.processedCount = a.processedCount + b.processedCount; this.processSeconds = a.processSeconds + b.processSeconds; + this.errorCount = a.errorCount + b.errorCount; } public JDCleanSplfJdbcResults(JDCleanSplfJdbcResults a, JDCleanSplfJdbcResults b, JDCleanSplfJdbcResults c, @@ -50,5 +53,6 @@ public JDCleanSplfJdbcResults(JDCleanSplfJdbcResults a, JDCleanSplfJdbcResults b this.keepBytes = a.keepBytes + b.keepBytes + c.keepBytes + d.keepBytes; this.processedCount = a.processedCount + b.processedCount + c.processedCount + d.processedCount; this.processSeconds = a.processSeconds + b.processSeconds + c.processSeconds + d.processSeconds; + this.errorCount = a.errorCount + b.errorCount + c.errorCount + d.errorCount; } } \ No newline at end of file diff --git a/src/test/JDCleanup.java b/src/test/JDCleanup.java index 97ebc08e..190272a9 100644 --- a/src/test/JDCleanup.java +++ b/src/test/JDCleanup.java @@ -174,7 +174,16 @@ protected void setup () JDTestDriver.dropCollection(c, collection_XX); // Delete the JDX tests as well if (JDCleanupTest.COLLECTION.indexOf("JDT")== 0) { - String xaCollection = "JDX"+JDCleanupTest.COLLECTION.substring(3); + String xaInitials = System.getenv("JTOPEN_TEST_XAINITIAL"); + if (xaInitials == null || xaInitials.length() == 0) { + xaInitials="X"; + } else { + if (xaInitials.length() > 1) { + xaInitials = xaInitials.substring(0,1); + } + } + String xaCollection = "JD"+xaInitials+testLib_.substring(3); + JDTestDriver.dropCollection(c, xaCollection); } } diff --git a/src/test/JDJSTPTestcase.java b/src/test/JDJSTPTestcase.java index 0427123f..47a436b2 100644 --- a/src/test/JDJSTPTestcase.java +++ b/src/test/JDJSTPTestcase.java @@ -5204,6 +5204,12 @@ public static void assureSTPJOBLOGXisAvailable(Connection connection) throws Exc public static String getJdkString(int jdk, int vrm1) throws Exception { switch (jdk) { + case 21: + return ".java21"; + case 17: + return ".java17"; + case 11: + return ".java11"; case 190: return ".jdk9"; case 180: @@ -5248,7 +5254,7 @@ public static String getExpectedOutputFile( int vrms[] = { 770, 760, 750, 740, 730, 720, 710, 0 }; - int jdks[] = { 180,170,160,150,142,140,0}; + int jdks[] = { 21, 17, 11, 180,170,160,150,142,140,0}; int currentJdk = JVMInfo.getJDK(); diff --git a/src/test/JDRunit.java b/src/test/JDRunit.java index 4aa81cce..586e9f37 100644 --- a/src/test/JDRunit.java +++ b/src/test/JDRunit.java @@ -3752,7 +3752,7 @@ public JDRunitGoOutput go() throws Exception { if (!tmpDir.exists()) { tmpDir.mkdir(); } - System.out.println("Storing files in "+tmpDir.getCanonicalPath()); + System.out.println("Storing file ("+localFile+") in "+tmpDir.getCanonicalPath()); char[] encryptedPassword = PasswordVault.getEncryptedPassword(TEXT_PASSWORD); char[] clearPassword = PasswordVault.decryptPassword(encryptedPassword); // @@ -3782,7 +3782,8 @@ public JDRunitGoOutput go() throws Exception { readLine = bufferedReader.readLine(); } bufferedReader.close(); - bufferedWriter.close(); + bufferedWriter.close(); + System.out.println("Done writing to "+destinationDir+"/"+localFile); } else { System.out.println("Warning IFSfile "+ifsFile+" does not exist"); } diff --git a/src/test/JDTestDriver.java b/src/test/JDTestDriver.java index a7350830..822e9fc3 100644 --- a/src/test/JDTestDriver.java +++ b/src/test/JDTestDriver.java @@ -90,7 +90,7 @@ public abstract class JDTestDriver extends TestDriver { // is being tested. public static final int RELEASE_NONE = 0; // public static final int RELEASE_V7R1M0 = 710; - public static final int RELEASE_V7R2M0 = 720; + // public static final int RELEASE_V7R2M0 = 720; public static final int RELEASE_V7R3M0 = 730; public static final int RELEASE_V7R4M0 = 740; public static final int RELEASE_V7R5M0 = 750; @@ -691,8 +691,6 @@ else if (token.equalsIgnoreCase("nativeRMI")) registerDriver(DRIVER_CLASS_NATIVE_RMI, DRIVER_NATIVE_RMI); // Was a release specified? - else if (token.equalsIgnoreCase("V7R2M0")) - release_ = RELEASE_V7R2M0; else if (token.equalsIgnoreCase("V7R3M0")) release_ = RELEASE_V7R3M0; else if (token.equalsIgnoreCase("V7R4M0")) @@ -777,9 +775,7 @@ public void setup() } catch (Exception e) { e.printStackTrace(); } - if (vrm == AS400.generateVRM(7, 2, 0)) - release_ = RELEASE_V7R2M0; - else if (vrm == AS400.generateVRM(7, 3, 0)) + if (vrm == AS400.generateVRM(7, 3, 0)) release_ = RELEASE_V7R3M0; else if (vrm == AS400.generateVRM(7, 4, 0)) release_ = RELEASE_V7R4M0; @@ -802,7 +798,7 @@ else if (vrm == AS400.generateVRM(7, 6, 0)) decfloatSupport_ = true; xmlSupport_ = true; arraySupport_ = true; - timestamp12Support_ = (release_ >= JDTestDriver.RELEASE_V7R2M0); + timestamp12Support_ = true; returnValueSupport_ = true; booleanSupport_ = (release_ >= JDTestDriver.RELEASE_V7R5M0); diff --git a/src/test/JDTestcase.java b/src/test/JDTestcase.java index 4ae1a2cd..3e41f2f6 100644 --- a/src/test/JDTestcase.java +++ b/src/test/JDTestcase.java @@ -1442,6 +1442,10 @@ public int getRelease() { return release_; } + public boolean checkAfterRelease760(String comment) { + return checkRelease(JDTestDriver.RELEASE_V7R6M0_PLUS, comment); + } + public boolean checkRelease760(String comment) { return checkRelease(JDTestDriver.RELEASE_V7R6M0, comment); } @@ -1462,27 +1466,9 @@ public boolean checkRelease730(String comment) { return checkRelease(JDTestDriver.RELEASE_V7R3M0, comment); } - public boolean checkRelease720() { - return checkRelease720(null); - } - - public boolean checkRelease720(String comment) { - return checkRelease(JDTestDriver.RELEASE_V7R2M0, comment); - } - public boolean checkRelease710() { - return checkRelease720(null); - } - public boolean checkRelease610() { - return checkRelease720(null); - } - - public boolean checkRelease610(String comment) { - return checkRelease720(comment); - } - public boolean checkRelease(int release, String comment) { if (release_ >= release) { return true; @@ -1591,9 +1577,7 @@ public void run() { if ((release_ == JDTestDriver.RELEASE_NONE) && (isToolboxDriver())) { try { int vrm = systemObject_.getVRM(); - if (vrm == AS400.generateVRM(7, 2, 0)) - release_ = JDTestDriver.RELEASE_V7R2M0; - else if (vrm == AS400.generateVRM(7, 3, 0)) + if (vrm == AS400.generateVRM(7, 3, 0)) release_ = JDTestDriver.RELEASE_V7R3M0; else if (vrm == AS400.generateVRM(7, 4, 0)) release_ = JDTestDriver.RELEASE_V7R4M0; @@ -2090,9 +2074,6 @@ public String[][] getFixup(Object[][] fixupArray, String releaseJvmDriver, Strin String getReleaseJvmDriver() { String value = ""; switch (getRelease()) { - case JDTestDriver.RELEASE_V7R2M0: - value = "72"; - break; case JDTestDriver.RELEASE_V7R3M0: value = "73"; break; diff --git a/src/test/JDVariationSkip.java b/src/test/JDVariationSkip.java index 023615d0..45db8296 100644 --- a/src/test/JDVariationSkip.java +++ b/src/test/JDVariationSkip.java @@ -479,7 +479,6 @@ public static int getReleaseIndex(String releaseString) throws Exception { } public static int getReleaseIndex(int release) throws Exception { switch (release) { - case JDTestDriver.RELEASE_V7R2M0: return 3; case JDTestDriver.RELEASE_V7R3M0: return 4; case JDTestDriver.RELEASE_V7R4M0: return 5; case JDTestDriver.RELEASE_V7R5M0: return 6; diff --git a/src/test/JTA/JTACleanupTx.java b/src/test/JTA/JTACleanupTx.java index d1095244..ea63c532 100644 --- a/src/test/JTA/JTACleanupTx.java +++ b/src/test/JTA/JTACleanupTx.java @@ -12,12 +12,18 @@ import java.util.*; +import javax.sql.XAConnection; import javax.sql.XADataSource; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; import java.io.*; import java.net.InetAddress; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; - +import com.ibm.as400.access.AS400JDBCDriver; import com.ibm.as400.access.AS400JDBCXADataSource; import test.JDReflectionUtil; @@ -29,7 +35,7 @@ class JTACleanupTxTransInfo { static boolean debug = false; - private static PrintStream output_; + private static PrintStream output_ = System.out; // set default to null protected String state = null; @@ -239,8 +245,54 @@ public static JTACleanupTxTransInfo[] getTransInfo() throws Exception { v.copyInto(tiArr); return tiArr; } + + + + public static JTACleanupTxTransInfo[] getTransInfo(String system, String userid, char[] password) throws Exception { + + if (System.getProperty("debug") != null) { + debug = true; + } + + Vector v = new Vector(); + + String sql = "select XA_TRANSACTION_MANAGER, XA_TRANSACTION_BRANCH_STATE,XA_XID_FORMAT_ID,XA_XID_GLOBAL_TRANSACTION_ID,XA_XID_BRANCH_QUALIFIER from QSYS2.DB_TRANSACTION_INFO WHERE COMMITMENT_DEFINITION='*TNSOBJ'"; + + AS400JDBCDriver driver = new AS400JDBCDriver(); + Connection c = driver.connect("jdbc:as400:" + system, userid, password); + Statement s = c.createStatement(); + ResultSet rs = s.executeQuery(sql); + while (rs.next()) { + String transactionManager = rs.getString(1); + if (((transactionManager.indexOf("Q_UDB_JTA") != -1) || (transactionManager.indexOf("QZDATM") != -1))) { + + JTACleanupTxTransInfo match = new JTACleanupTxTransInfo(); + String state = rs.getString(2); + String gtid = rs.getString(4); + String branchQualifier = rs.getString(5); + match.setState(state); + match.setGlobalTransactionId(gtid); + match.setBranchQualifier(branchQualifier); + match.setCollection(""); + // Add this TransInfo object to the vector + v.addElement(match); + } + } + rs.close(); + s.close(); + c.close(); + if (v.size() == 0) { + return null; + } + // convert the vector into a TransInfo array and return it + JTACleanupTxTransInfo[] tiArr = new JTACleanupTxTransInfo[v.size()]; + v.copyInto(tiArr); + return tiArr; + + } } + /** * NOTE NOTE NOTE: This Xid implementation should be compatible with the * test.TestXid class in such a way that the methods here provide behavior that @@ -283,6 +335,7 @@ public boolean isATarget(Object xid) throws Exception { } + public class JTACleanupTx { private static PrintStream output_ = System.out; @@ -290,6 +343,8 @@ public class JTACleanupTx { public static void usage() { output_ .println("Usage: java JTACleanupTx 'ThisIsDangerous' [all]"); + output_ + .println(" or: java JTACleanupTx system:SYSTEMNAME USERID PASSWORD 'ThisIsDangerous' [all]"); output_ .println(" The parameter 'ThisIsDangerous' is required because this is\n" + " a dangerous thing to do on a system that might have 'other than\n" @@ -307,196 +362,323 @@ public static void usage() { System.exit(1); } + public static void main(String[] args) { try { - output_ = System.out; + output_ = System.out; - output_ - .println("Recover in-doubt or heuristically completed transactions"); - if (args.length < 2 || args.length > 3 - || !args[1].equals("ThisIsDangerous")) { + output_.println("Recover in-doubt or heuristically completed transactions"); + if (args.length < 2 || (args[0].indexOf("system:") < 0 && !args[1].equals("ThisIsDangerous"))) { usage(); } - if (args[0].equalsIgnoreCase("localhost")) { - String localHost = InetAddress.getLocalHost().getHostName() - .toLowerCase(); - int dotIndex = localHost.indexOf("."); - if (dotIndex >= 0) { - localHost = localHost.substring(0, dotIndex); + if (args[0].indexOf("system:") == 0) { + if (args.length < 4 || !args[3].equals("ThisIsDangerous")) { + usage(); } + String serverName = args[0].substring(7); + String userid = args[1]; + String password = args[2]; + String option = null; + if (args.length > 4) { + option = args[4]; + } + jdbcUrlCleanup(serverName, userid, password.toCharArray(), option); + } else { + if (args[0].equalsIgnoreCase("localhost")) { + String localHost = InetAddress.getLocalHost().getHostName().toLowerCase(); + int dotIndex = localHost.indexOf("."); + if (dotIndex >= 0) { + localHost = localHost.substring(0, dotIndex); + } - args[0] = localHost.toUpperCase(); - } - boolean rollbackAll = false; - if (args.length == 3) { - if (!args[2].equals("all")) { - usage(); - } else { - rollbackAll = true; + args[0] = localHost.toUpperCase(); + } + boolean rollbackAll = false; + if (args.length == 3) { + if (!args[2].equals("all")) { + usage(); + } else { + rollbackAll = true; + } } - } - boolean masterDone = false; - int resourceIndex = 0; - do { + boolean masterDone = false; + int resourceIndex = 0; + do { - Object xaConn = null; - Object xaRes = null; - // Connection conn; - if (resourceIndex / 2 == 0) { - output_ - .println("Now, using NATIVE XAResource.recover() to find all " - + "transactions in-doubt transactions"); + Object xaConn = null; + Object xaRes = null; + // Connection conn; + if (resourceIndex / 2 == 0) { + output_ + .println("Now, using NATIVE XAResource.recover() to find all " + "transactions in-doubt transactions"); - output_.println("resourceIndex="+resourceIndex+" using UDBXADataSource"); - XADataSource xaDs; - xaDs = (XADataSource) JDReflectionUtil.createObject("com.ibm.db2.jdbc.app.UDBXADataSource"); - JDReflectionUtil.callMethod_V(xaDs,"setDatabaseName",args[0]); + output_.println("resourceIndex=" + resourceIndex + " using UDBXADataSource"); + XADataSource xaDs; + xaDs = (XADataSource) JDReflectionUtil.createObject("com.ibm.db2.jdbc.app.UDBXADataSource"); + JDReflectionUtil.callMethod_V(xaDs, "setDatabaseName", args[0]); - // Get the XAConnection. - xaConn = xaDs.getXAConnection(); - xaDs = (XADataSource) JDReflectionUtil.createObject("com.ibm.db2.jdbc.app.UDBXADataSource"); + // Get the XAConnection. + xaConn = xaDs.getXAConnection(); + xaDs = (XADataSource) JDReflectionUtil.createObject("com.ibm.db2.jdbc.app.UDBXADataSource"); - } else if ((resourceIndex / 2) == 1) { + } else if ((resourceIndex / 2) == 1) { - output_ - .println("Now, using toolbox XAResource.recover() to find all " - + "transactions in-doubt transactions"); + output_ + .println("Now, using toolbox XAResource.recover() to find all " + "transactions in-doubt transactions"); - output_.println("resourceIndex="+resourceIndex+" using AS400JDBCXADataSource"); + output_.println("resourceIndex=" + resourceIndex + " using AS400JDBCXADataSource"); - AS400JDBCXADataSource xaDs = new AS400JDBCXADataSource(); - xaDs.setServerName(args[0]); + AS400JDBCXADataSource xaDs = new AS400JDBCXADataSource(); + xaDs.setServerName(args[0]); - // Get the XAConnection. - xaConn = xaDs.getXAConnection(); + // Get the XAConnection. + xaConn = xaDs.getXAConnection(); - } else { - output_.println("resourceIndex="+resourceIndex+" DONE"); - masterDone = true; - } - resourceIndex ++; - - if (!masterDone) { - xaRes = JDReflectionUtil.callMethod_O(xaConn, "getXAResource"); + } else { + output_.println("resourceIndex=" + resourceIndex + " DONE"); + masterDone = true; + } + resourceIndex++; - // conn = - // (Connection)JDReflectionUtil.callMethod_O(xaConn,"getConnection"); + if (!masterDone) { + xaRes = JDReflectionUtil.callMethod_O(xaConn, "getXAResource"); - Object[] xids; + // conn = + // (Connection)JDReflectionUtil.callMethod_O(xaConn,"getConnection"); - xids = (Object[]) JDReflectionUtil.callMethod_O(xaRes, "recover", - javax.transaction.xa.XAResource.TMSTARTRSCAN); - if (xids == null || xids.length == 0) { - output_ - .println("There are currently no In-Doubt transactions detected"); - } else { + Object[] xids; - boolean done = false; - // int count = 0; - // It may be that the XIDs were heuristically rolled back or - // committed - // (If this testcase is being called with a 'doOnlyRecovery' value - // of - // true in order - // to forget about existing transactions. - boolean heuRollback = false; - boolean heuCommit = false; - boolean heuMix = false; - // Construct a targeter to choose Xids that will be cleaned up - JTACleanupTxRecoveryTargeter targeter = new JTACleanupTxRecoveryTargeter(); - if (rollbackAll) { - targeter.setTargetId(-1); - } + xids = (Object[]) JDReflectionUtil.callMethod_O(xaRes, "recover", + javax.transaction.xa.XAResource.TMSTARTRSCAN); + if (xids == null || xids.length == 0) { + output_.println("There are currently no In-Doubt transactions detected"); + } else { - while (!done) { - output_.println("Scan found " + xids.length - + " in-doubt transactions"); - // count += xids.length; - for (int i = 0; i < xids.length; ++i) { - // Skip any XIDs that are not targetted by this tool. - if (!targeter.isATarget(xids[i])) { - output_.println("Skipping non targeted Xid " - + xidToString(xids[i])); - continue; - } - // Attempt to roll back the thransaction. - output_.println("Rollback: " + xidToString(xids[i])); - heuRollback = false; - heuCommit = false; - heuMix = false; - try { - JDReflectionUtil.callMethod_V(xaRes, "rollback", xids[i]); - output_.println("Rollback completed"); - } catch (Exception e) { - // Expect a couple of possible exceptions that aren't - // necessarily - // a bad thing. - output_.println("Rollback rc=" - + JDReflectionUtil.getField_I(e, "errorCode")); - if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURCOM) { - output_ - .println("The transaction was already committed XA_HEURCOM"); - heuCommit = true; - } else if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURRB) { - output_ - .println("The transaction was already rolled back XA_HEURRB"); - heuRollback = true; - } else if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURMIX) { - output_ - .println("The transaction was already committed and rolled back XA_HEURMIX"); - heuMix = true; + boolean done = false; + // int count = 0; + // It may be that the XIDs were heuristically rolled back or + // committed + // (If this testcase is being called with a 'doOnlyRecovery' value + // of + // true in order + // to forget about existing transactions. + boolean heuRollback = false; + boolean heuCommit = false; + boolean heuMix = false; + // Construct a targeter to choose Xids that will be cleaned up + JTACleanupTxRecoveryTargeter targeter = new JTACleanupTxRecoveryTargeter(); + if (rollbackAll) { + targeter.setTargetId(-1); + } + + while (!done) { + output_.println("Scan found " + xids.length + " in-doubt transactions"); + // count += xids.length; + for (int i = 0; i < xids.length; ++i) { + // Skip any XIDs that are not targetted by this tool. + if (!targeter.isATarget(xids[i])) { + output_.println("Skipping non targeted Xid " + xidToString(xids[i])); + continue; + } + // Attempt to roll back the thransaction. + output_.println("Rollback: " + xidToString(xids[i])); + heuRollback = false; + heuCommit = false; + heuMix = false; + try { + JDReflectionUtil.callMethod_V(xaRes, "rollback", xids[i]); + output_.println("Rollback completed"); + } catch (Exception e) { + // Expect a couple of possible exceptions that aren't + // necessarily + // a bad thing. + output_.println("Rollback rc=" + JDReflectionUtil.getField_I(e, "errorCode")); + if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURCOM) { + output_.println("The transaction was already committed XA_HEURCOM"); + heuCommit = true; + } else if (JDReflectionUtil.getField_I(e, + "errorCode") == javax.transaction.xa.XAException.XA_HEURRB) { + output_.println("The transaction was already rolled back XA_HEURRB"); + heuRollback = true; + } else if (JDReflectionUtil.getField_I(e, + "errorCode") == javax.transaction.xa.XAException.XA_HEURMIX) { + output_.println("The transaction was already committed and rolled back XA_HEURMIX"); + heuMix = true; + } else { + // This is a problem. + throw e; + } + } + if (heuRollback || heuCommit || heuMix) { + output_.println("Forget about heurisically completed transaction:" + xidToString(xids[i])); + JDReflectionUtil.callMethod_V(xaRes, "forget", xids[i]); } else { - // This is a problem. - throw e; + output_.println("Skipped Forget"); } } - if (heuRollback || heuCommit || heuMix) { - output_ - .println("Forget about heurisically completed transaction:" - + xidToString(xids[i])); - JDReflectionUtil.callMethod_V(xaRes, "forget", xids[i]); - } else { - output_.println("Skipped Forget"); - } - } - output_.println("Finding more transactions"); - xids = (Object[]) JDReflectionUtil.callMethod_O(xaRes, "recover", - javax.transaction.xa.XAResource.TMNOFLAGS); - if (xids == null || xids.length == 0) { - output_.println("End of in-doubt transactions"); - done = true; + output_.println("Finding more transactions"); + xids = (Object[]) JDReflectionUtil.callMethod_O(xaRes, "recover", + javax.transaction.xa.XAResource.TMNOFLAGS); + if (xids == null || xids.length == 0) { + output_.println("End of in-doubt transactions"); + done = true; + } } } } + } while (!masterDone); + + output_.println("Looking for more transactions"); + wrkcmtdfnBlock: try { + JTACleanupTxTransInfo list[] = JTACleanupTxTransInfo.getTransInfo(); + if (list == null || list.length == 0) { + output_.println("No more transactions."); + break wrkcmtdfnBlock; + } + output_.println("Transactions still in flight:"); + for (int i = 0; i < list.length; ++i) { + output_.println(list[i]); + } + } catch (Exception e) { + output_.println("Exception: " + e); + e.printStackTrace(); } - } while (!masterDone); + + output_.println("Done"); + /* System.exit(0); */ + } + } catch (Exception e) { output_.println("Exception: " + e); e.printStackTrace(); } - output_.println("Looking for more transactions"); - wrkcmtdfnBlock: try { - JTACleanupTxTransInfo list[] = JTACleanupTxTransInfo.getTransInfo(); - if (list == null || list.length == 0) { - output_.println("No more transactions."); - break wrkcmtdfnBlock; + } + + public static void jdbcUrlCleanup(String serverName, String userid, char[] password, String option) { + boolean rollbackAll = false; + try { + if (option != null && option.equals("all")) { + rollbackAll = true; } - output_.println("Transactions still in flight:"); - for (int i = 0; i < list.length; ++i) { - output_.println(list[i]); + + boolean masterDone = false; + do { + + XAConnection xaConn = null; + XAResource xaRes = null; + // Connection conn; + output_.println("Using toolbox XAResource.recover() to find all " + "transactions in-doubt transactions"); + + AS400JDBCXADataSource xaDs = new AS400JDBCXADataSource(serverName, userid, password); + // Get the XAConnection. + xaConn = xaDs.getXAConnection(); + xaRes = xaConn.getXAResource(); + + Xid[] xids = xaRes.recover(javax.transaction.xa.XAResource.TMSTARTRSCAN); + + if (xids == null || xids.length == 0) { + output_.println("There are currently no In-Doubt transactions detected"); + masterDone = true; + } else { + + boolean done = false; + // int count = 0; + // It may be that the XIDs were heuristically rolled back or + // committed + // (If this testcase is being called with a 'doOnlyRecovery' value + // of + // true in order + // to forget about existing transactions. + boolean heuRollback = false; + boolean heuCommit = false; + boolean heuMix = false; + // Construct a targeter to choose Xids that will be cleaned up + JTACleanupTxRecoveryTargeter targeter = new JTACleanupTxRecoveryTargeter(); + if (rollbackAll) { + targeter.setTargetId(-1); + } + + while (!done) { + output_.println("Scan found " + xids.length + " in-doubt transactions"); + // count += xids.length; + for (int i = 0; i < xids.length; ++i) { + // Skip any XIDs that are not targetted by this tool. + if (!targeter.isATarget(xids[i])) { + output_.println("Skipping non targeted Xid " + xidToString(xids[i])); + continue; + } + // Attempt to roll back the thransaction. + output_.println("Rollback: " + xidToString(xids[i])); + heuRollback = false; + heuCommit = false; + heuMix = false; + try { + xaRes.rollback(xids[i]); + output_.println("Rollback completed"); + } catch (Exception e) { + // Expect a couple of possible exceptions that aren't + // necessarily + // a bad thing. + output_.println("Rollback rc=" + JDReflectionUtil.getField_I(e, "errorCode")); + if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURCOM) { + output_.println("The transaction was already committed XA_HEURCOM"); + heuCommit = true; + } else if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURRB) { + output_.println("The transaction was already rolled back XA_HEURRB"); + heuRollback = true; + } else if (JDReflectionUtil.getField_I(e, "errorCode") == javax.transaction.xa.XAException.XA_HEURMIX) { + output_.println("The transaction was already committed and rolled back XA_HEURMIX"); + heuMix = true; + } else { + // This is a problem. + throw e; + } + } + if (heuRollback || heuCommit || heuMix) { + output_.println("Forget about heurisically completed transaction:" + xidToString(xids[i])); + JDReflectionUtil.callMethod_V(xaRes, "forget", xids[i]); + } else { + output_.println("Skipped Forget"); + } + } + + output_.println("Finding more transactions"); + xids = xaRes.recover(javax.transaction.xa.XAResource.TMNOFLAGS); + if (xids == null || xids.length == 0) { + output_.println("End of in-doubt transactions"); + done = true; + } + } + } + + } while (!masterDone); + + output_.println("Looking for more transactions"); + wrkcmtdfnBlock: try { + JTACleanupTxTransInfo list[] = JTACleanupTxTransInfo.getTransInfo(serverName, userid, password); + if (list == null || list.length == 0) { + output_.println("No more transactions."); + break wrkcmtdfnBlock; + } + output_.println("Transactions still in flight:"); + for (int i = 0; i < list.length; ++i) { + output_.println(list[i]); + } + } catch (Exception e) { + output_.println("Exception: " + e); + e.printStackTrace(); } + } catch (Exception e) { output_.println("Exception: " + e); e.printStackTrace(); } output_.println("Done"); - /* System.exit(0); */ - } diff --git a/src/test/JTA/JTAStdConn.java b/src/test/JTA/JTAStdConn.java index 48d5bc37..81eb8c51 100644 --- a/src/test/JTA/JTAStdConn.java +++ b/src/test/JTA/JTAStdConn.java @@ -94,6 +94,8 @@ protected void setup() throws Exception { pwrSysEncryptedPassword_); if (isJdbc20StdExt()) { + + Connection conn = null; try { JTATest.verboseOut(baseURL_); @@ -127,6 +129,7 @@ protected void setup() throws Exception { } } } + super.setup(); } /** diff --git a/src/test/JTA/JTATestcase.java b/src/test/JTA/JTATestcase.java index 63aa7d02..fa78d013 100644 --- a/src/test/JTA/JTATestcase.java +++ b/src/test/JTA/JTATestcase.java @@ -237,6 +237,20 @@ protected XADataSource newXADataSource(String systemName, String userId, String } + + /** + * Performs setup needed before running variations. + * + * @exception Exception + * If an exception occurs. + **/ + protected void setup() throws Exception { + /* Make sure all XA tests are clean before running tests */ + char[] localPassword = PasswordVault.decryptPassword(encryptedPassword_); + JTACleanupTx.jdbcUrlCleanup(systemObject_.getSystemName(), userId_ , localPassword, null); + PasswordVault.clearPassword(localPassword); + } + } diff --git a/src/test/JTAStdTest.java b/src/test/JTAStdTest.java index c2aafb6d..46631bd2 100644 --- a/src/test/JTAStdTest.java +++ b/src/test/JTAStdTest.java @@ -131,8 +131,16 @@ public void setup () systemObject_.getUserId (), encryptedPassword_); if (testLib_ != null) { - COLLECTION = "JDX"+testLib_.substring(3); - JTATest.COLLECTION = COLLECTION; + String xaInitials = System.getenv("JTOPEN_TEST_XAINITIAL"); + if (xaInitials == null || xaInitials.length() == 0) { + xaInitials="X"; + } else { + if (xaInitials.length() > 1) { + xaInitials = xaInitials.substring(0,1); + } + } + COLLECTION = "JD"+xaInitials+testLib_.substring(3); + JTATest.COLLECTION = COLLECTION; } JDSetupCollection.create (systemObject_, c, COLLECTION, out_); diff --git a/src/test/JTATest.java b/src/test/JTATest.java index 4ba80703..712c2f5a 100644 --- a/src/test/JTATest.java +++ b/src/test/JTATest.java @@ -143,8 +143,17 @@ public void setup () Connection c = getConnection (getBaseURL (), systemObject_.getUserId (), encryptedPassword_); if (testLib_ != null) { - COLLECTION = "JDX"+testLib_.substring(3); + String xaInitials = System.getenv("JTOPEN_TEST_XAINITIAL"); + if (xaInitials == null || xaInitials.length() == 0) { + xaInitials="X"; + } else { + if (xaInitials.length() > 1) { + xaInitials = xaInitials.substring(0,1); + } + } + COLLECTION = "JD"+xaInitials+testLib_.substring(3); } + System.out.println("JTATest collection is "+COLLECTION); JDSetupCollection.create (systemObject_, c, COLLECTION, diff --git a/src/test/JTAUDBTest.java b/src/test/JTAUDBTest.java index bc24d664..53b06b3b 100644 --- a/src/test/JTAUDBTest.java +++ b/src/test/JTAUDBTest.java @@ -136,7 +136,15 @@ public void setup () Connection c = getConnection (getBaseURL (), systemObject_.getUserId (), encryptedPassword_); if (testLib_ != null) { - COLLECTION = "JDX"+testLib_.substring(3); + String xaInitials = System.getenv("JTOPEN_TEST_XAINITIAL"); + if (xaInitials == null || xaInitials.length() == 0) { + xaInitials="X"; + } else { + if (xaInitials.length() > 1) { + xaInitials = xaInitials.substring(0,1); + } + } + COLLECTION = "JD"+xaInitials+testLib_.substring(3); JTATest.COLLECTION = COLLECTION; } System.out.println("JTAUDBTest collection is "+COLLECTION); diff --git a/src/test/JTOpenEclipseExport.java b/src/test/JTOpenEclipseExport.java index f085cdfd..ada8f1b8 100644 --- a/src/test/JTOpenEclipseExport.java +++ b/src/test/JTOpenEclipseExport.java @@ -62,6 +62,7 @@ public static String export(String as400Name, String userid, String password) th String homeDirectory = System.getProperty("user.home"); String testDirectory = currentDirectory + File.separatorChar + "src"; File iniDirectoryFile = new File(testDirectory + File.separatorChar + "ini"); + File jdbcDirectoryFile = new File(testDirectory + File.separatorChar + "jdbc"); File testDirectoryFile = new File(testDirectory + File.separatorChar + "test"); if (!testDirectoryFile.exists()) { System.out.println(prefix + "Error. directory " + testDirectory + File.separatorChar + "test" @@ -83,6 +84,8 @@ public static String export(String as400Name, String userid, String password) th Vector fileList = buildFileList(testDirectoryFile, "test", lastModifiedTime); Vector iniList = buildFileList(iniDirectoryFile, "ini", lastModifiedTime); fileList.addAll(iniList); + Vector jdbcList = buildFileList(jdbcDirectoryFile, "jdbc", lastModifiedTime); + fileList.addAll(jdbcList); AS400 as400 = new AS400(as400Name, userid, password.toCharArray()); as400.setGuiAvailable(false); diff --git a/src/test/JVMRunJDBC.java b/src/test/JVMRunJDBC.java index f2e8682f..9e9f34ac 100644 --- a/src/test/JVMRunJDBC.java +++ b/src/test/JVMRunJDBC.java @@ -55,13 +55,18 @@ public static void main(String[] args) { } ps[i] = connection.prepareStatement("select * from sysibm.sysdummy1"); } + + System.gc(); + for (int i = 0; i < ps.length; i++) { + System.out.println("ps["+i+"] = "+ps[i]); + } + + connection.close(); + } catch (Exception e) { e.printStackTrace(); } - System.gc(); - for (int i = 0; i < ps.length; i++) { - System.out.println("ps["+i+"] = "+ps[i]); - } + System.out.println("Calling System.exit(0)"); System.exit(0); } diff --git a/src/test/Sec/AuthExit.java b/src/test/Sec/AuthExit.java index 98b80e75..2c97385d 100644 --- a/src/test/Sec/AuthExit.java +++ b/src/test/Sec/AuthExit.java @@ -283,11 +283,11 @@ public static boolean checkResult( } } - if (expectedVerificationId.indexOf("IGNORE")>=0) foundVerificationId = true; - if (expectedLocalIp.indexOf("IGNORE")>=0) foundLocalIp = true; - if (expectedLocalPort.indexOf("IGNORE")>=0) foundLocalPort = true; - if (expectedRemoteIp.indexOf("IGNORE")>=0) foundRemoteIp = true; - if (expectedRemotePort.indexOf("IGNORE")>=0) foundRemotePort = true; + if (expectedVerificationId != null && expectedVerificationId.indexOf("IGNORE")>=0) foundVerificationId = true; + if (expectedLocalIp != null && expectedLocalIp.indexOf("IGNORE")>=0) foundLocalIp = true; + if (expectedLocalPort != null && expectedLocalPort.indexOf("IGNORE")>=0) foundLocalPort = true; + if (expectedRemoteIp != null && expectedRemoteIp.indexOf("IGNORE")>=0) foundRemoteIp = true; + if (expectedRemotePort != null && expectedRemotePort.indexOf("IGNORE")>=0) foundRemotePort = true; String sql = "select LINE from TABLE(QSYS2.IFS_READ_UTF8('"+filename+"'))"; ResultSet rs = pwrStmt.executeQuery(sql); diff --git a/src/test/Sec/SecCtorTestcase.java b/src/test/Sec/SecCtorTestcase.java index 73f8afaa..ede53dea 100644 --- a/src/test/Sec/SecCtorTestcase.java +++ b/src/test/Sec/SecCtorTestcase.java @@ -1386,6 +1386,7 @@ public void Var041() { try { system.connectService(AS400.COMMAND); AS400 system2 = new AS400(systemName_, profileToken); + system2.setGuiAvailable(false); system2.connectService(AS400.COMMAND); assertCondition(system.getUserId().equals(userId_.toUpperCase()) && system2.getUserId().equals(mfaUserid_), "User ID mismatch system.getUserId()=" + system.getUserId() + " userId_=" + userId_ @@ -1427,10 +1428,12 @@ public void Var042() { JDReflectionUtil.callMethod_V(provider,"setAdditionalAuthenticationFactor",mfaFactor_); system = new AS400(systemName_, provider); - Arrays.fill(mfaPassword,' '); system.setGuiAvailable(false); system.connectService(AS400.COMMAND); + Arrays.fill(mfaPassword,' '); + + // Verify that JDBC also works AS400JDBCDriver driver = new AS400JDBCDriver(); Connection c = driver.connect(system); @@ -1520,7 +1523,7 @@ public void Var043() { testas4002.setGuiAvailable(false); - if (debug) output_.println("Creating new connection to RC/DPC server "+systemName_+" using the token..."); + if (debug) output_.println("Creating new connection to COMMAND server "+systemName_+" using the token..."); testas4002.connectService(AS400.COMMAND); if (debug) output_.println("Successfully connected."); testas4002.close(); diff --git a/src/test/Sec/SecPTMiscTestcase.java b/src/test/Sec/SecPTMiscTestcase.java index 20755621..bd07efbf 100644 --- a/src/test/Sec/SecPTMiscTestcase.java +++ b/src/test/Sec/SecPTMiscTestcase.java @@ -1259,9 +1259,9 @@ public void Var041() } String expectedVerificationId="Verification_ID=QIBM_OS400_JT400"; - String expectedRemotePort=null; /* don't check remote port */ + String expectedRemotePort="IGNORE"; /* don't check remote port */ String expectedRemoteIp = "Remote_IPAddress="+JDReflectionUtil.callMethod_S(sys,"getLocalIPAddress"); - String expectedLocalIp = null; /* don't check local ip */ + String expectedLocalIp = "IGNORE"; /* don't check local ip */ if (!AuthExit.checkResult(pwrConnection_, jobName, mfaUserid_, sb, expectedVerificationId, diff --git a/src/test/Testcase.java b/src/test/Testcase.java index cc326030..4f18ac72 100644 --- a/src/test/Testcase.java +++ b/src/test/Testcase.java @@ -2260,15 +2260,7 @@ public void run() { try { int vrm = systemObject_.getVRM(); - if (vrm == AS400.generateVRM(5, 4, 0)) { - release_ = JDTestDriver.RELEASE_V7R2M0; - } else if (vrm == AS400.generateVRM(6, 1, 0)) { - release_ = JDTestDriver.RELEASE_V7R2M0; - } else if (vrm == AS400.generateVRM(7, 1, 0)) { - release_ = JDTestDriver.RELEASE_V7R2M0; - } else if (vrm == AS400.generateVRM(7, 2, 0)) { - release_ = JDTestDriver.RELEASE_V7R2M0; - } else if (vrm == AS400.generateVRM(7, 3, 0)) { + if (vrm == AS400.generateVRM(7, 3, 0)) { release_ = JDTestDriver.RELEASE_V7R3M0; } else if (vrm == AS400.generateVRM(7, 4, 0)) { release_ = JDTestDriver.RELEASE_V7R4M0; @@ -2940,7 +2932,7 @@ public static String generateClientUser(String base) throws Exception { if (base.length() > 5) { throw new Exception("base='" + base + "' must be less than 6 characters"); } - int intKey1 = InetAddress.getLocalHost().hashCode() % 60466175; + int intKey1 = (InetAddress.getLocalHost().hashCode() & 0x7FFFFFFF) % 60466175; String stringKey1 = Integer.toString(intKey1, 36); return base + stringKey1; } @@ -3333,6 +3325,7 @@ public void initMfaUser(String interval ) throws Exception { } char[] pwrPassword = PasswordVault.decryptPassword(pwrSysEncryptedPassword_); AS400 authAs400 = new AS400(systemName_,pwrSysUserID_, pwrPassword); + authAs400.setGuiAvailable(false); CommandCall cc = new CommandCall(authAs400); String command = "QSYS/CHGUSRPRF "+mfaUserid_+" TOTPOPTITV(*NONE) "; cc.run(command); @@ -3349,6 +3342,7 @@ public void initMfaUser(String interval ) throws Exception { mfaFactorString = "0"+mfaFactorString; } mfaFactor_ = mfaFactorString.toCharArray(); + authAs400.close(); } } diff --git a/src/test/User/UserGetSetLtoMTestcase.java b/src/test/User/UserGetSetLtoMTestcase.java index 9fae3d66..ccef0ce8 100644 --- a/src/test/User/UserGetSetLtoMTestcase.java +++ b/src/test/User/UserGetSetLtoMTestcase.java @@ -2387,9 +2387,7 @@ public void Var093() User u = new User(pwrSys_, sandbox_.createUser()); int testValue = 2147483645; int expectedValue = -1; - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { expectedValue = -2; - } u.setMaximumStorageAllowed(testValue); int returnValue = u.getMaximumStorageAllowed(); assertCondition(returnValue == expectedValue,"maximumStorageAllowed="+returnValue+" sb "+expectedValue); @@ -2413,9 +2411,7 @@ public void Var094() User u = new User(pwrSys_, sandbox_.createUser()); String testValue = "2147483645"; int expectedValue = -1; - if (getRelease() >= JDTestDriver.RELEASE_V7R2M0) { expectedValue = -2; - } u.setMaximumStorageAllowed(testValue); int returnValue = u.getMaximumStorageAllowed(); assertCondition(returnValue == expectedValue, "maximumStorageAllowed="+returnValue+" sb "+expectedValue);