svn commit: r559917 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbcapi/BatchUpdateTest.java lang/CollationTest.java

[km...@apache.org]

Author: kmarsden
Date: Thu Jul 26 11:11:12 2007
New Revision: 559917

URL: http://svn.apache.org/viewvc?view=rev&rev=559917
Log:
DERBY-2656 Add some tests with fixed bugs to CollationTest 


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java?view=diff&rev=559917&r1=559916&r2=559917
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java Thu Jul 26 11:11:12 2007
@@ -161,6 +161,19 @@
         return suite;
     }
     
+    
+    /**
+     * embeddedSuite runs tests only in embedded mode. 
+     * Used by CollationTest
+     * @return
+     */
+    public static Test embeddedSuite() {
+        
+        TestSuite suite = new TestSuite("BatchUpdateTest");
+        suite.addTest(baseSuite("BatchUpdateTest:embedded"));
+        return suite;
+    }
+    
     protected static Test baseSuite(String name) {
         TestSuite suite = new TestSuite(name);
         suite.addTestSuite(BatchUpdateTest.class);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?view=diff&rev=559917&r1=559916&r2=559917
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Thu Jul 26 11:11:12 2007
@@ -33,7 +33,9 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.derbyTesting.functionTests.tests.jdbcapi.BatchUpdateTest;
 import org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest;
+import org.apache.derbyTesting.functionTests.tests.nist.NistScripts;
 import org.apache.derbyTesting.junit.XML;
 //import org.apache.derby.iapi.types.XML;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
@@ -1085,6 +1087,10 @@
       
       // DMD.getTables() should not fail after the fix to DERBY-2896
       suite.addTest(DatabaseMetaDataTest.suite());
+      suite.addTest(BatchUpdateTest.embeddedSuite());
+      suite.addTest(GroupByExpressionTest.suite());
+      suite.addTest(UpdatableResultSetTest.suite());
+      
       return Decorator.territoryCollatedDatabase(suite, locale);
   }