svn commit: r522648 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNetClient/ suites/ tests/jdbcapi/

[km...@apache.org]

Author: kmarsden
Date: Mon Mar 26 15:21:17 2007
New Revision: 522648

URL: http://svn.apache.org/viewvc?view=rev&rev=522648
Log:
DERBY-2474  Remove tests that are redundant with XATest.java.
These tests had been left to run with jdk1.3.1, but jdk1.3.1 testing is no 
longer required.


Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xaSimplePositive.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaMorph.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaStateTran.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaMorph.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaStateTran.sql
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?view=diff&rev=522648&r1=522647&r2=522648
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude Mon Mar 26 15:21:17 2007
@@ -9,9 +9,6 @@
 # jdbcapi/*sers* these tests log on to wombat with different permissions and users
 #    test could possibly be rewritten to use another database
 # junitTests/derbyNet/CompatibilityTest.java - exits the suite
-# jdbcapi/xaSimplePositive.sql - needs more props, getting nullPointer accessing derby.log
-# jdbcapi/xaStateTran.sql - needs more props, getting nullPointer accessing derby.log
-# jdbcapi/XATest.java - fails, needs to set up wombat differently, reflectionInvocation error
 # derbynet/DerbyNetAutoStart.java - exits the suite...
 # derbynet/NSinSameJVM.java - fails with different thread names. probably ok...
 # derbynet/dblook_test_net.java - expects different dir structure
@@ -40,9 +37,6 @@
 jdbcapi/secureUsers.sql
 jdbcapi/secureUsers1.sql
 junitTests/derbyNet/CompatibilityTest.java
-jdbcapi/xaSimplePositive.sql
-jdbcapi/xaStateTran.sql
-jdbcapi/XATest.java
 derbynet/DerbyNetAutoStart.java
 derbynet/NSinSameJVM.java
 derbynet/dblook_test_net.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall?view=diff&rev=522648&r1=522647&r2=522648
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall Mon Mar 26 15:21:17 2007
@@ -1,4 +1,2 @@
 junitTests/derbyNet/CompatibilityTest.java
-jdbcapi/xaSimplePositive.sql
-jdbcapi/xaStateTran.sql
 jdbcapi/checkDataSource.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall?view=diff&rev=522648&r1=522647&r2=522648
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall Mon Mar 26 15:21:17 2007
@@ -1,10 +1,7 @@
 jdbcapi/checkDataSource.java
 jdbcapi/dataSourcePermissions.java
 jdbcapi/xaAnotherTest.sql
-jdbcapi/xaSimplePositive.sql
 jdbcapi/xaSimpleNegative.sql
-jdbcapi/xaStateTran.sql
-jdbcapi/xaMorph.sql
 store/xaOffline1.sql
 store/xab2354.sql
 unit/T_XA.unit