svn commit: r470418 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java

[dj...@apache.org]

Author: djd
Date: Thu Nov  2 09:04:12 2006
New Revision: 470418

URL: http://svn.apache.org/viewvc?view=rev&rev=470418
Log:
DERBY-2021 Fix SURTest.suite() to run client & embedded.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java?view=diff&rev=470418&r1=470417&r2=470418
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java Thu Nov  2 09:04:12 2006
@@ -19,6 +19,7 @@
  */
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -1576,18 +1577,29 @@
         return "MYCURSOR";
     }
     
-    
     /**
-     * The suite contains all testcases in this class running on different 
-     * data models
+     * Run the base suite in embedded and client mode.
+     * @return
      */
     public static Test suite() {
-        
         TestSuite mainSuite = new TestSuite("SURTest");
-        
         // DB2 client doesn't support this functionality
         if (usingDerbyNet())
             return mainSuite;
+        
+        mainSuite.addTest(baseSuite("SURTest:embedded"));
+        mainSuite.addTest(
+                TestConfiguration.clientServerDecorator(baseSuite("SURTest:client")));
+        return mainSuite;      
+    }
+    
+    /**
+     * The suite contains all testcases in this class running on different 
+     * data models
+     */
+    private static Test baseSuite(String name) { 
+        
+        TestSuite mainSuite = new TestSuite(name);
         
         // Iterate over all data models and decorate the tests:
         for (Iterator i = SURDataModelSetup.SURDataModel.values().iterator();