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/01/18 06:43:44 UTC
svn commit: r370059 [1/4] - in /db/derby/code/trunk/java:
testing/org/apache/derbyTesting/functionTests/harness/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/master/j9_foundation/
testing/org/apach...
Author: kmarsden
Date: Tue Jan 17 21:43:13 2006
New Revision: 370059
URL: http://svn.apache.org/viewcvs?rev=370059&view=rev
Log:
DERBY-398 add jdk14 suite to J2ME
Contributed by Deepa Remesh
Attaching a patch 'jdk14_tests.diff' which adds jdk14 suite and some more tests to run with J2ME/CDC/FP. Changes are:
M java\tools\org\apache\derby\impl\tools\ij\mtTestCase.java
If ij.dataSource property is specified, remove ij.database and ij.protocol property. Similar to what is done by test harness. This is needed for stress.multi.
M java\testing\org\apache\derbyTesting\functionTests\tests\i18n\iepnegativetests_ES_app.properties
M java\testing\org\apache\derbyTesting\functionTests\multi\stress\init.properties
M java\testing\org\apache\derbyTesting\functionTests\multi\stress\run.properties
Change 'database' property to 'ij.database' and add ij.dataSource properties.
M java\testing\org\apache\derbyTesting\functionTests\tests\lang\holdCursorJava.java
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\autoGeneratedJdbc30.java
Execute procedure tests only if DriverManager class is present.
A java\testing\org\apache\derbyTesting\functionTests\tests\lang\procedureJdbc30_app.properties
A java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\checkDataSource30_app.properties
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\copyfiles.ant
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\parameterMetaDataJdbc30_app.properties
These tests are part of jdk14 suite but cannot be run with JSR169.
M java\testing\org\apache\derbyTesting\functionTests\tests\lang\maxMemPerTab_app.properties
M java\testing\org\apache\derbyTesting\functionTests\tests\lang\triggerStream_app.properties
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\LOBTest_app.properties
M java\testing\org\apache\derbyTesting\functionTests\tests\store\bootLock_app.properties
Removed 'runwithfoundation=false' exclude from these tests
M java\testing\org\apache\derbyTesting\functionTests\tests\lang\copyfiles.ant
D java\testing\org\apache\derbyTesting\functionTests\tests\lang\maxMemPerTab.sql
A java\testing\org\apache\derbyTesting\functionTests\tests\lang\triggerStream.java
A java\testing\org\apache\derbyTesting\functionTests\tests\lang\maxMemPerTab.java
D java\testing\org\apache\derbyTesting\functionTests\tests\lang\triggerStream.sql
M java\testing\org\apache\derbyTesting\functionTests\suites\derbylang.runall
M java\testing\org\apache\derbyTesting\functionTests\master\maxMemPerTab.out
M java\testing\org\apache\derbyTesting\functionTests\master\triggerStream.out
M java\testing\org\apache\derbyTesting\functionTests\util\StreamUtil.java
M java\testing\org\apache\derbyTesting\functionTests\util\ProcedureTest.java
maxMemPerTab and triggerStream tests are converted from sql to java to avoid using procedures with nested connections.
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\dbMetaDataJdbc30.java
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\resultsetJdbc30.java
NoSuchMethodError for methods not present in JSR169.
M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\users_app.properties
User and password are specified in databaseName itself so that they don't get re-used for other connections in the test
M java\testing\org\apache\derbyTesting\functionTests\tests\store\bootLock1.java
M java\testing\org\apache\derbyTesting\functionTests\tests\store\bootLock.java
Use Datasource instead of DriverManager
M java\testing\org\apache\derbyTesting\functionTests\harness\RunList.java
M java\testing\org\apache\derbyTesting\functionTests\suites\jdk14.properties
Change 'jdk14test' property to 'jdbc30test' property. Add check for jdb30test so that it can run with foundation vm.
M java\testing\org\apache\derbyTesting\functionTests\master\resultsetJdbc30.out
Small correction in the test and master.
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\iepnegativetests_ES.out
Added new master because of difference in output of show connections.
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\dbMetaDataJdbc30.out
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\LOBTest.out
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\autoGeneratedJdbc30.out
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\resultsetJdbc30.out
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\holdCursorJava.out
A java\testing\org\apache\derbyTesting\functionTests\master\j9_foundation\users.out
New masters for difference in behaviour in J2ME
M java\testing\org\apache\derbyTesting\functionTests\suites\jdk14.runall
Remove store/bootlock.java which is also part of store suite.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/LOBTest.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/autoGeneratedJdbc30.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/dbMetaDataJdbc30.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/holdCursorJava.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/iepnegativetests_ES.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/resultsetJdbc30.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/users.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30_app.properties (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/maxMemPerTab.java (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedureJdbc30_app.properties (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerStream.java (with props)
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/maxMemPerTab.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerStream.sql
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxMemPerTab.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultsetJdbc30.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerStream.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/multi/stress/init.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/multi/stress/run.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/autoGeneratedJdbc30.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/maxMemPerTab_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerStream_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StreamUtil.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=370059&r1=370058&r2=370059&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java Tue Jan 17 21:43:13 2006
@@ -64,8 +64,7 @@
static boolean excludedFromJCC = false;
static String clientExclusionMessage;
static Boolean needIBMjvm = null;
- static boolean needJdk14 = false;
- static boolean needEncryption = false;
+ static boolean needEncryption = false;
static String jvmflags;
static String testJavaFlags;
static String classpath;
@@ -81,7 +80,6 @@
static String testEncryptionAlgorithm;
static String jdk12test;
static String jdk12exttest;
- static String jdk14test;
static String runwithibmjvm = null;
static String runwithj9;
static String runwithjvm;
@@ -275,8 +273,6 @@
pwOut.println("Cannot run the suite, requires jdk12 or higher with extensions");
else if(needJdk12)
pwOut.println("Cannot run the suite, requires jdk12 or higher, have jdk" + javaVersion);
- else if(needJdk14)
- pwOut.println("Cannot run the suite, requires jdk14 or higher, have jdk" + javaVersion);
else if(excludedFromJCC)
pwOut.println(clientExclusionMessage);
else if((needIBMjvm == null || needIBMjvm.booleanValue() == false))
@@ -396,8 +392,6 @@
jvmProps.addElement("jdk12test=" + jdk12test);
if (jdk12exttest != null)
jvmProps.addElement("jdk12exttest=" + jdk12exttest);
- if (jdk14test != null)
- jvmProps.addElement("jdk14test=" + jdk14test);
if (keepfiles != null)
jvmProps.addElement("keepfiles=" + keepfiles);
if ( (outputdir != null) && (outputdir.length()>0) )
@@ -630,11 +624,11 @@
// And do the same for jdk12test
jdk12test = parentProps.getProperty("jdk12test");
jdk12exttest = parentProps.getProperty("jdk12exttest");
- // and jdk14test
- jdk14test = parentProps.getProperty("jdk14test");
- runwithj9 = parentProps.getProperty("runwithj9");
+ runwithj9 = parentProps.getProperty("runwithj9");
runwithibmjvm = parentProps.getProperty("runwithibmjvm");
- String testJVM = (jvmName.startsWith("j9") ? "j9" : jvmName);
+ String testJVM = jvmName;
+ if (jvmName.startsWith("j9"))
+ testJVM = (jvmName.equals("j9_foundation") ? "foundation" : "j9");
runwithjvm = parentProps.getProperty("runwith" + testJVM);
excludeJCC = parentProps.getProperty("excludeJCC");
}
@@ -726,11 +720,12 @@
testEncryptionAlgorithm = suiteProperties.getProperty("testEncryptionAlgorithm");
jdk12test = suiteProperties.getProperty("jdk12test");
jdk12exttest = suiteProperties.getProperty("jdk12exttest");
- jdk14test = suiteProperties.getProperty("jdk14test");
runwithibmjvm = suiteProperties.getProperty("runwithibmjvm");
runwithj9 = suiteProperties.getProperty("runwithj9");
- String testJVM = (jvmName.startsWith("j9") ? "j9" : jvmName);
- runwithjvm = suiteProperties.getProperty("runwith" + testJVM);
+ String testJVM = jvmName;
+ if (jvmName.startsWith("j9"))
+ testJVM = (jvmName.equals("j9_foundation") ? "foundation" : "j9");
+ runwithjvm = suiteProperties.getProperty("runwith" + testJVM);
excludeJCC = suiteProperties.getProperty("excludeJCC");
keepfiles = suiteProperties.getProperty("keepfiles");
systemdiff = suiteProperties.getProperty("systemdiff");
@@ -861,12 +856,6 @@
else
jdk12exttest = p.getProperty("jdk12exttest");
- // jdk14test may be set at the top or just for a subsuite
- if ( parentProperties.getProperty("jdk14test") != null )
- p.put("jdk14test", jdk14test);
- else
- jdk14test = p.getProperty("jdk14test");
-
// runwithibmjvm may be set at the top or just for a subsuite
if ( parentProperties.getProperty("runwithibmjvm") != null )
p.put("runwithibmjvm", runwithibmjvm);
@@ -874,7 +863,9 @@
runwithibmjvm = p.getProperty("runwithibmjvm");
// runwithjvm may be set at the top or just for a subsuite
- String testJVM = (jvmName.startsWith("j9") ? "j9" : jvmName);
+ String testJVM = jvmName;
+ if (jvmName.startsWith("j9"))
+ testJVM = (jvmName.equals("j9_foundation") ? "foundation" : "j9");
if ( parentProperties.getProperty("runwith" + testJVM) != null )
p.put("runwith" + testJVM, runwithjvm);
else
@@ -991,14 +982,11 @@
// figure out if suite should be skipped ... adhoc rules
boolean isJdk12 = false; // really now 'isJdk12orHigher'
- boolean isJdk14 = false;
- boolean isJdk15 = false;
boolean isJdk118 = false;
boolean isJdk117 = false;
boolean isEncryption = false;
boolean isJdk12Test = false;
boolean isJdk12ExtTest = false;
- boolean isJdk14Test = false;
boolean isSyncTest = false;
boolean isSyncProduct = false;
boolean isExcludeJCC = false;
@@ -1010,18 +998,15 @@
needSync = false;
needJdk12 = false;
needJdk12ext = false;
- needJdk14 = false;
excludedFromJCC = false;
needIBMjvm = null;
// Determine if this is jdk12 or higher (with or without extensions)
- if (iminor >= 2) isJdk12 = true;
+ if (iminor >= 2) isJdk12 = true;
if ( System.getProperty("java.version").startsWith("1.1.8") ) isJdk118 = true;
- if ( System.getProperty("java.version").startsWith("1.1.7") ) isJdk117 = true;
- if ( System.getProperty("java.version").startsWith("1.4.") ) isJdk14 = true;
- if ( System.getProperty("java.version").startsWith("1.5.") ) isJdk15 = true;
-
+ if ( System.getProperty("java.version").startsWith("1.1.7") ) isJdk117 = true;
+
// if a test needs an ibm jvm, skip if runwithibmjvm is true.
// if a test needs to not run in an ibm jvm, skip if runwithibmjvm is false.
// if null, continue in all cases.
@@ -1081,9 +1066,7 @@
if ("true".equalsIgnoreCase(jdk12test)) isJdk12Test = true;
if ( (jdk12exttest != null) && (jdk12exttest.length()>0) )
if ("true".equalsIgnoreCase(jdk12exttest)) isJdk12ExtTest = true;
- if ( (jdk14test != null) && (jdk14test.length()>0) )
- if ("true".equalsIgnoreCase(jdk14test)) isJdk14Test = true;
-
+
// Skip any suite if jvm is not jdk12 or higher for encryption, jdk12test or jdk12exttest
if (!isJdk12)
{
@@ -1095,14 +1078,7 @@
if (result) return true; // stop looking once know should skip
}
- // Skip any suite if jvm is not jdk14 or higher for jdk14test
- if ((!isJdk14 && !isJdk15) && isJdk14Test)
- {
- needJdk14 = true;
- return true;
- }
-
- // Also require jdk12 extensions for encryption and jdk12exttest
+ // Also require jdk12 extensions for encryption and jdk12exttest
if ( (isEncryption) || (isJdk12ExtTest) )
{
needJdk12ext = true;