You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2006/06/01 21:05:13 UTC

svn commit: r410913 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/ master/j9_foundation/ suites/ tests/demo/

Author: kmarsden
Date: Thu Jun  1 12:05:12 2006
New Revision: 410913

URL: http://svn.apache.org/viewvc?rev=410913&view=rev
Log:
DERBY-1366  minor patching up of some test issues - state May 31 2006

Contributed by Myrna van Lunteren

Attached is patch tests_20060531.diff (and stat) for the trunk, which removes some failures in derbyall runs with less commonly tested jvms by making a number of minor changes:

- after the fix for DERBY-577 all .java tests that use ext*
directories failed with the 'j9' jvms (wsdd5.6, wctme5.7,
wctme5.7_foundation - i.e. all jvms which have executable 'j9' instead of java). When I first started working with those jvms it seemed that those jvms decided another directory was user.dir, and the only solution I could see at the time was to add a section changing the directory. Removing the setting of user.dir made all jvms work the same way, so this if block had to come out, but I had forgotten...(change to RunTest.java that can only possibly affect j9 runs)

- because the j9 jvms do not run with security manager, the output of the test RunClassPathTester.java cannot be made stable. Adding RunClassPathTester_app.properties to skip the test with those jvms.

- wctme5.7_foundation required updated master(canon) for
grantRevokeDDL and outparams, and the canon for grantRevoke is no longer needed.

- upgrade test cannot be run with jdk131, ibm131, wsdd5.6, wctme5.7 or wctme5.7_foundation because it uses classes not present in those jvms. Added suites/upgrade.properties to skip.

I tested derbyall with wctme5.7_foundation and wctme5.7, ran affected tests with wsdd5.6, and upgrade suite with wcmte*, wsdd5.6, ibm131,jdk131, jdk142.



Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties   (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties   (with props)
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevoke.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/outparams.out

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=410913&r1=410912&r2=410913&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Thu Jun  1 12:05:12 2006
@@ -1705,12 +1705,7 @@
                     copyOutDir = outDir;
                 else if ( (runDir != null) && (runDir.exists()) )
                 {
-                    if (jvmName.startsWith("j9")&&  testType.equals("java"))
-                    {
-                        // for some reason, not picking up from rundir
-                        copyOutDir = outDir;
-                    }else
-					    copyOutDir = runDir;
+                    copyOutDir = runDir;
                 }
                 else
                     copyOutDir = outDir;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out?rev=410913&r1=410912&r2=410913&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out Thu Jun  1 12:05:12 2006
@@ -81,11 +81,11 @@
 create view v1 as select * from tsat;
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> grant select on v1 to bar;
-0 rows inserted/updated/deleted
+ERROR 2850F: Grant or Revoke operation is not allowed on object 'V1'.
 ij(SATCONNECTION)> grant insert on v1 to foo;
-0 rows inserted/updated/deleted
+ERROR 2850F: Grant or Revoke operation is not allowed on object 'V1'.
 ij(SATCONNECTION)> grant update on v1 to public;
-0 rows inserted/updated/deleted
+ERROR 2850F: Grant or Revoke operation is not allowed on object 'V1'.
 ij(SATCONNECTION)> -- Tests for synonym. Not supported currently.
 create synonym mySym for satheesh.tsat;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/outparams.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/outparams.out?rev=410913&r1=410912&r2=410913&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/outparams.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/outparams.out Thu Jun  1 12:05:12 2006
@@ -1432,8 +1432,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -1456,8 +1456,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -1480,8 +1480,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -1937,8 +1937,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -1963,8 +1963,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -2028,8 +2028,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -2054,8 +2054,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -2121,8 +2121,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -2145,8 +2145,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -3577,8 +3577,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -3601,8 +3601,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -3625,8 +3625,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -4082,8 +4082,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -4108,8 +4108,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -4173,8 +4173,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -4199,8 +4199,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -4266,8 +4266,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -4290,8 +4290,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -6300,8 +6300,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -6323,8 +6323,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -6346,8 +6346,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'VARCHAR () FOR BIT DATA'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'VARCHAR () FOR BIT DATA'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
 			getString(1) = ff000000000000000000000000000000
@@ -6776,8 +6776,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -6799,8 +6799,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -6822,8 +6822,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -6845,8 +6845,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -6870,8 +6870,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'DATE'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'DATE'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
 			getString(1) = 1966-06-06
@@ -6925,8 +6925,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -6948,8 +6948,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -6971,8 +6971,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -6994,8 +6994,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -7019,8 +7019,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIMESTAMP'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIMESTAMP'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
 			getString(1) = xxxxxxFILTERED-TIMESTAMPxxxxx
@@ -7074,8 +7074,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -7097,8 +7097,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -7120,8 +7120,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -7145,8 +7145,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -7168,8 +7168,8 @@
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getFloat(1) = SQL Exception: An attempt was made to get a data value of type 'float' from a data value of type 'TIME'.
 			getDouble(1) = SQL Exception: An attempt was made to get a data value of type 'double' from a data value of type 'TIME'.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
-			getBigDecimal(1) = java.sql.SQLException: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
+			getBigDecimal(1) = SQL Exception: Invalid data conversion. Method not called.
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
 			getString(1) = 06:06:06
@@ -7760,4 +7760,4 @@
   8 = cloudscape was null false
   9 = jbms was null false
   10 = IBM CS was null false
-end testManyOut
\ No newline at end of file
+end testManyOut

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties?rev=410913&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties Thu Jun  1 12:05:12 2006
@@ -0,0 +1,10 @@
+# the upgrade test Upgrade_10_1_10_2.java cannot be run with the following jvms:
+# jdk131, ibm131: missing support for obtaining version numbers
+# wctme5.7_foundation: missing support for java.sql.Driver
+# wsdd5.6, wctme5.7: missing support for javax.naming.InitialContext
+# However, the test generates its _app.properties file on build, and rather than interfere
+# with that mechanism, adding the runwith...=false into the suite.properties
+runwithibm13=false
+runwithjdk13=false
+runwithfoundation=false
+runwithj9=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties?rev=410913&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties Thu Jun  1 12:05:12 2006
@@ -0,0 +1,5 @@
+# test will give diffs when run with j9 because j9 tests do not run with security manager
+# the diffs only show the source directory, and as this will be different for everyone,
+# as well as different for classes vs. jars, it is impractical to mask those.
+runwithfoundation=false
+runwithj9=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native