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 2007/07/31 23:12:59 UTC
svn commit: r561546 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: suites/AllPackages.java tests/lang/XMLTypeAndOpsTest.java

Author: kmarsden
Date: Tue Jul 31 14:12:58 2007
New Revision: 561546

URL: http://svn.apache.org/viewvc?view=rev&rev=561546
Log:
DERBY-2925  Prevent export from overwriting existing files

Resolve test failures


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?view=diff&rev=561546&r1=561545&r2=561546
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java Tue Jul 31 14:12:58 2007
@@ -50,12 +50,12 @@
     public static Test suite() throws Exception {
 
         TestSuite suite = new TestSuite("AllPackages");
-        
+
+	suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.store._Suite.suite());
-        suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
 
         // Suites that are compiled using Java SE 6 target need to
         // be added this way, otherwise creating the suite

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java?view=diff&rev=561546&r1=561545&r2=561546
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java Tue Jul 31 14:12:58 2007
@@ -347,23 +347,23 @@
 
         CallableStatement cSt = prepareCall(
             "CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ("
-            + "  null, 'T1', 'xmlexport.del', null, null, null)");
+            + "  null, 'T1', 'extinout/xmlexport.del', null, null, null)");
 
         assertStatementError("42Z71", cSt);
         
         cSt = prepareCall(
             " CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY("
-            + "  'select x from t1', 'xmlexport.del', null, null, null)");
+            + "  'select x from t1', 'extinout/xmlexport.del', null, null, null)");
         assertStatementError("42Z71", cSt);
 
         cSt = prepareCall(
             " CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ("
-            + "  null, 'T1', 'shouldntmatter.del', null, null, null, 0)");
+            + "  null, 'T1', 'extinout/shouldntmatter.del', null, null, null, 0)");
         assertStatementError("XIE0B", cSt);
         
         cSt = prepareCall(
             " CALL SYSCS_UTIL.SYSCS_IMPORT_DATA ("
-            + "  NULL, 'T1', null, '2', 'shouldntmatter.del', "
+            + "  NULL, 'T1', null, '2', 'extinout/shouldntmatter.del', "
             + "null, null, null,0)");
         assertStatementError("XIE0B", cSt);