db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r332116 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/ suites/ tests/derbynet/ tests/jdbcapi/ tests/lang/ tests/store/
Date Wed, 09 Nov 2005 19:28:08 GMT
Author: fuzzylogic
Date: Wed Nov  9 11:27:55 2005
New Revision: 332116

URL: http://svn.apache.org/viewcvs?rev=332116&view=rev
Log:
DERBY-632: Don't skip dataSourcePermissions_net if db2jcc is not in the
classpath.

Committed for Myrna Van Lunteren <m.v.lunteren@gmail.com>

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties
    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/lang/holdCursorIJ_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=332116&r1=332115&r2=332116&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
Wed Nov  9 11:27:55 2005
@@ -939,7 +939,7 @@
 		        upgradetest = true;
 		}
 	
-        if ( framework.startsWith("Derby") && (! jvmName.equals("j9_foundation")))
+        if ( framework.equals("DerbyNet") && (! jvmName.equals("j9_foundation")))
 		{	
 
 			Class c = null;
@@ -1462,7 +1462,7 @@
                 jvmnet = true;
 
             String excludeJcc = ap.getProperty("excludeJCC");
-            if ( framework.startsWith("Derby") )
+            if ( framework.equals("DerbyNet") )
             {	
                 try {
                     RunList.checkClientExclusion(excludeJcc, "JCC", jccMajor, jccMinor, javaVersion);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
Wed Nov  9 11:27:55 2005
@@ -3,4 +3,4 @@
 jdk12test=true
 runwithj9=false
 timeout=60
-excludeJCC=at-or-after:3.0,when-at-or-before:jdk1.3.1
+excludeJCC=at-or-before:2.3,when-at-or-before:jdk1.3.1

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
Wed Nov  9 11:27:55 2005
@@ -18,7 +18,7 @@
 # a file <testname>_app.properties to be used instead of this file.
 #
 #
-excludeJCC=1.1
+
 startServer=false
 database=wombat;create=true
 derby.optimizer.noTimeout=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties
Wed Nov  9 11:27:55 2005
@@ -18,7 +18,6 @@
 # a file <testname>_app.properties to be used instead of this file.
 #
 #
-excludeJCC=1.1
 startServer=false
 database=wombat;create=true
 derby.optimizer.noTimeout=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30_app.properties
Wed Nov  9 11:27:55 2005
@@ -1,4 +1,3 @@
 usedefaults=true
-excludeJCC=1.2
 runwithjdk13=false
 runwithibm13=false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
Wed Nov  9 11:27:55 2005
@@ -8,7 +8,6 @@
 runwithjdk13=false
 runwithibm13=false
 runwithj9=false
-excludeJCC=1.1
 
 # DataSource properties, only used if ij.dataSource is set
 ij.dataSource.databaseName=wombat

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
Wed Nov  9 11:27:55 2005
@@ -5,8 +5,6 @@
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 
-excludeJCC=1.1
-
 # DataSource properties, only used if ij.dataSource is set
 ij.dataSource.databaseName=wombat
 ij.dataSource.createDatabase=create

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
Wed Nov  9 11:27:55 2005
@@ -2,7 +2,6 @@
 
 runwithjdk13=false
 runwithibm13=false
-excludeJCC=1.1
 
 usedefaults=true
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
Wed Nov  9 11:27:55 2005
@@ -1,6 +1,5 @@
 
 runwithjdk13=false
 runwithibm13=false
-excludeJCC=1.1
 
 usedefaults=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties?rev=332116&r1=332115&r2=332116&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties
Wed Nov  9 11:27:55 2005
@@ -2,5 +2,4 @@
 runwithjdk13=false
 runwithibm13=false
 runwithj9=false
-excludeJCC=1.1
 



Mime
View raw message