db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1608782 [9/11] - in /db/derby/code/trunk/java/testing/org/apache: derby/ derby/client/am/ derby/impl/jdbc/ derbyTesting/functionTests/harness/ derbyTesting/functionTests/suites/ derbyTesting/functionTests/tests/compatibility/ derbyTesting/...
Date Tue, 08 Jul 2014 13:52:02 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java Tue Jul  8 13:51:51 2014
@@ -24,13 +24,9 @@ package org.apache.derbyTesting.function
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class TestPreStartedSlaveServer extends ClientRunner
@@ -51,7 +47,7 @@ public class TestPreStartedSlaveServer e
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
-        TestSuite suite = new TestSuite("TestPreStartedSlaveServer");
+        BaseTestSuite suite = new BaseTestSuite("TestPreStartedSlaveServer");
                 
         suite.addTest(TestPreStartedSlaveServer.suite(slaveServerHost, slaveServerPort));
         System.out.println("*** Done suite.addTest(TestPreStartedSlaveServer.suite())");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java Tue Jul  8 13:51:51 2014
@@ -22,15 +22,9 @@ limitations under the License.
 package org.apache.derbyTesting.functionTests.tests.replicationTests;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class TestPreStoppedMaster extends ClientRunner
@@ -51,7 +45,7 @@ public class TestPreStoppedMaster extend
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
-        TestSuite suite = new TestSuite("TestPreStoppedMaster");
+        BaseTestSuite suite = new BaseTestSuite("TestPreStoppedMaster");
                 
         suite.addTest(TestPreStoppedMaster.suite(slaveServerHost, slaveServerPort));
         System.out.println("*** Done suite.addTest(TestPreStoppedMaster.suite())");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java Tue Jul  8 13:51:51 2014
@@ -22,15 +22,9 @@ limitations under the License.
 package org.apache.derbyTesting.functionTests.tests.replicationTests;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class TestPreStoppedMasterServer extends ClientRunner
@@ -51,7 +45,7 @@ public class TestPreStoppedMasterServer 
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
-        TestSuite suite = new TestSuite("TestPreStoppedMasterServer");
+        BaseTestSuite suite = new BaseTestSuite("TestPreStoppedMasterServer");
                 
         suite.addTest(TestPreStoppedMasterServer.suite(slaveServerHost, slaveServerPort));
         System.out.println("*** Done suite.addTest(TestPreStoppedMasterServer.suite())");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java Tue Jul  8 13:51:51 2014
@@ -29,7 +29,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -54,7 +54,7 @@ public class TestPreStoppedSlave extends
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
-        TestSuite suite = new TestSuite("TestPreStoppedSlave");
+        BaseTestSuite suite = new BaseTestSuite("TestPreStoppedSlave");
                 
         suite.addTest(TestPreStoppedSlave.suite(slaveServerHost, slaveServerPort));
         System.out.println("*** Done suite.addTest(TestPreStoppedSlave.suite())");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java Tue Jul  8 13:51:51 2014
@@ -29,7 +29,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -54,7 +54,7 @@ public class TestPreStoppedSlaveServer e
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
-        TestSuite suite = new TestSuite("TestPreStoppedSlaveServer");
+        BaseTestSuite suite = new BaseTestSuite("TestPreStoppedSlaveServer");
                 
         suite.addTest(TestPreStoppedSlaveServer.suite(slaveServerHost, slaveServerPort));
         System.out.println("*** Done suite.addTest(TestPreStoppedSlaveServer.suite())");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java Tue Jul  8 13:51:51 2014
@@ -28,14 +28,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.IndexStatsUtil;
 import org.apache.derbyTesting.junit.IndexStatsUtil.IdxStats;
 
@@ -244,7 +241,7 @@ public class AutomaticIndexStatisticsMul
     }
 
     public static Test suite() {
-        return new TestSuite(AutomaticIndexStatisticsMultiTest.class);
+        return new BaseTestSuite(AutomaticIndexStatisticsMultiTest.class);
     }
 
     private static class MTCompileThread

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java Tue Jul  8 13:51:51 2014
@@ -31,14 +31,11 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.Date;
-
 import javax.sql.DataSource;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.IndexStatsUtil;
 import org.apache.derbyTesting.junit.IndexStatsUtil.IdxStats;
@@ -76,7 +73,7 @@ public class AutomaticIndexStatisticsTes
     }
 
     public static Test suite() {
-        Test test = new TestSuite(AutomaticIndexStatisticsTest.class);
+        Test test = new BaseTestSuite(AutomaticIndexStatisticsTest.class);
         test = new CleanDatabaseTestSetup(test);
         test = TestConfiguration.additionalDatabaseDecorator(test, MASTERDB);
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java Tue Jul  8 13:51:51 2014
@@ -27,9 +27,9 @@ import java.sql.CallableStatement;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
@@ -113,7 +113,7 @@ public class BackupRestoreTest
      * @return A test suite.
      */
     public static Test suite() {
-        TestSuite suite = new TestSuite(BackupRestoreTest.class);
+        BaseTestSuite suite = new BaseTestSuite(BackupRestoreTest.class);
         return new SupportFilesSetup(
                 TestConfiguration.singleUseDatabaseDecorator(suite));
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java Tue Jul  8 13:51:51 2014
@@ -26,11 +26,9 @@ import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCClient;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -56,14 +54,14 @@ public class BootAllTest  extends BaseJD
     
     public static Test suite() {
         
-        TestSuite suite = new TestSuite("BootAllTest");
+        BaseTestSuite suite = new BaseTestSuite("BootAllTest");
         
         // Test uses driver manager so JDBC 2 required.
         if (JDBC.vmSupportsJDBC3())
         {           
             // Suite to create the third (inner) database and
             // perform the actual test (will be run last)
-            TestSuite db3 = new TestSuite("db3");
+            BaseTestSuite db3 = new BaseTestSuite("db3");
             db3.addTest(new BootAllTest("createShutdownDatabase"));
             db3.addTest(new BootAllTest("shutdownDerby"));
             
@@ -76,13 +74,13 @@ public class BootAllTest  extends BaseJD
             
             // Suite to create the second database (middle) and
             // embed in it the third database suite.
-            TestSuite db2 = new TestSuite("db2");
+            BaseTestSuite db2 = new BaseTestSuite("db2");
             db2.addTest(new BootAllTest("createShutdownDatabase"));
             db2.addTest(TestConfiguration.singleUseDatabaseDecorator(db3));
             
             // Suite to create the first database (outer) and
             // embed in it the second database suite.
-            TestSuite db1 = new TestSuite("db1");
+            BaseTestSuite db1 = new BaseTestSuite("db1");
             db1.addTest(new BootAllTest("createShutdownDatabase"));
             db1.addTest(TestConfiguration.singleUseDatabaseDecorator(db2));
             

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java Tue Jul  8 13:51:51 2014
@@ -20,28 +20,20 @@
  */
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import java.io.File;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
-import java.lang.Integer;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.net.SocketTimeoutException;
-import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derby.iapi.store.raw.data.DataFactory;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-
-import org.apache.derby.iapi.store.raw.data.DataFactory;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
  * Testing file locks that prevent Derby "double boot" a.k.a "dual boot",
@@ -92,7 +84,7 @@ public class BootLockTest extends BaseJD
      * @return The test suite
      */
     public static Test suite() {
-        TestSuite suite = new TestSuite("BootLockTest");
+        BaseTestSuite suite = new BaseTestSuite("BootLockTest");
         suite.addTest(decorateTest());
         return suite;
     }
@@ -105,7 +97,7 @@ public class BootLockTest extends BaseJD
      */
     private static Test decorateTest() {
 
-        Test test = new TestSuite(BootLockTest.class);
+        Test test = new BaseTestSuite(BootLockTest.class);
 
         if (JDBC.vmSupportsJSR169() && !isJ9Platform()) {
             // PhoneME requires forceDatabaseLock

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java Tue Jul  8 13:51:51 2014
@@ -24,17 +24,17 @@ package org.apache.derbyTesting.function
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLStreamHandlerFactory;
-import java.sql.*;
 import java.security.AccessController;
 import java.security.CodeSource;
 import java.security.PrivilegedAction;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.Properties;
-
 import javax.sql.DataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import junit.extensions.TestSetup;
+import junit.framework.Test;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -83,7 +83,7 @@ public class ClassLoaderBootTest extends
      */
     public static Test suite()
     {
-        TestSuite suite = new TestSuite(ClassLoaderBootTest.class);
+        BaseTestSuite suite = new BaseTestSuite(ClassLoaderBootTest.class);
         Test test = suite;
         TestSetup setup = 
             new CleanDatabaseTestSetup(test) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java Tue Jul  8 13:51:51 2014
@@ -23,17 +23,15 @@ package org.apache.derbyTesting.function
 
 import java.io.File;
 import java.sql.Connection;
-import java.sql.Statement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import javax.sql.DataSource;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derby.shared.common.sanity.SanityManager;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.TestConfiguration;
@@ -84,7 +82,7 @@ public class CryptoCrashRecoveryTest
             suite = TestConfiguration.embeddedSuite(
                     CryptoCrashRecoveryTest.class);
         } else {
-            suite = new TestSuite(
+            suite = new BaseTestSuite(
                     "CryptoCrashRecovery disabled due to non-debug build");
             println("CryptoCrashRecoveryTest disabled due to non-debug build");
         }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java Tue Jul  8 13:51:51 2014
@@ -28,11 +28,9 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import javax.sql.DataSource;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.Decorator;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -378,7 +376,7 @@ public class DecryptDatabaseTest
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite("DecryptDatabaseTest suite");
+        BaseTestSuite suite = new BaseTestSuite("DecryptDatabaseTest suite");
         suite.addTest(wrapTest());
         suite.addTest(wrapTest("AES/OFB/NoPadding"));
         return suite;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java Tue Jul  8 13:51:51 2014
@@ -1,22 +1,15 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
+import junit.framework.Assert;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 
 
 /*
@@ -233,7 +226,7 @@ public class Derby3625Test extends Store
     
     protected static Test baseSuite(String name) 
     {
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby3625Test.class);
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4)) 
@@ -269,7 +262,7 @@ public class Derby3625Test extends Store
 
     public static Test suite() 
     {
-        TestSuite suite = new TestSuite("Derby3625Test");
+        BaseTestSuite suite = new BaseTestSuite("Derby3625Test");
         suite.addTest(baseSuite("Derby36625Test:embedded"));
         return suite;
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java Tue Jul  8 13:51:51 2014
@@ -1,23 +1,15 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
 
 
 /*
@@ -312,7 +304,7 @@ public class Derby4577Test extends Store
     
     protected static Test baseSuite(String name) 
     {
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby4577Test.class);
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4)) 
@@ -345,7 +337,7 @@ public class Derby4577Test extends Store
 
     public static Test suite() 
     {
-        TestSuite suite = new TestSuite("Derby4577Test");
+        BaseTestSuite suite = new BaseTestSuite("Derby4577Test");
         suite.addTest(baseSuite("Derby4577Test:embedded"));
         return suite;
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java Tue Jul  8 13:51:51 2014
@@ -1,25 +1,15 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.util.Arrays;
-
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 
 
 /*
@@ -288,7 +278,7 @@ public class Derby4923Test extends Store
     
     protected static Test baseSuite(String name) 
     {
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby4923Test.class);
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4)) 
@@ -319,7 +309,7 @@ public class Derby4923Test extends Store
 
     public static Test suite() 
     {
-        TestSuite suite = new TestSuite("Derby4923Test");
+        BaseTestSuite suite = new BaseTestSuite("Derby4923Test");
         suite.addTest(baseSuite("Derby4923Test:embedded"));
         return suite;
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby5582AutomaticIndexStatisticsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby5582AutomaticIndexStatisticsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby5582AutomaticIndexStatisticsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby5582AutomaticIndexStatisticsTest.java Tue Jul  8 13:51:51 2014
@@ -21,11 +21,7 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java Tue Jul  8 13:51:51 2014
@@ -24,11 +24,14 @@ package org.apache.derbyTesting.function
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
-import java.util.List;
 import javax.sql.DataSource;
 import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.*;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.Decorator;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.JDBCDataSource;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 
 /**
@@ -60,7 +63,7 @@ public class EncryptDatabaseTest  extend
      * @return A suite containing embedded suites
      */
     public static Test suite() {
-        TestSuite suite = new TestSuite("EncryptDatabase");
+        BaseTestSuite suite = new BaseTestSuite("EncryptDatabase");
         suite.addTest(wrapTest());
         suite.addTest(wrapTest("DESede/CBC/NoPadding")); // from encryption
         suite.addTest(wrapTest("DESede/CFB/NoPadding")); // from encryptionCFB

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java Tue Jul  8 13:51:51 2014
@@ -20,23 +20,18 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 
 import java.io.File;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
-
+import java.sql.Statement;
 import javax.sql.DataSource;
-
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -101,7 +96,7 @@ extends BaseJDBCTestCase {
 */
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("Encryption AES suite");
+        BaseTestSuite suite = new BaseTestSuite("Encryption AES suite");
         // we're using SupportFilesSetup so the created databases will get 
         // removed. Databases get created in subdirectory EXTINOUT.
         // However, this only happens after the test is finished, so we

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java Tue Jul  8 13:51:51 2014
@@ -19,8 +19,9 @@
  */
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import org.apache.derbyTesting.junit.*;
-import junit.framework.*;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
 
 /**
  * Test basic functionality on a database encrypted with the AES algorithm.
@@ -41,7 +42,7 @@ public class EncryptionKeyAESTest
 
     public static Test suite() {
         // This test runs only in embedded due to the use of external files.
-        TestSuite suite = new TestSuite(EncryptionKeyAESTest.class,
+        BaseTestSuite suite = new BaseTestSuite(EncryptionKeyAESTest.class,
                                         "EncryptionKey AES suite");
         return new SupportFilesSetup(suite);
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java Tue Jul  8 13:51:51 2014
@@ -23,16 +23,14 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-
+import junit.framework.Test;
 import org.apache.derbyTesting.functionTests.util.Formatters;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 public final class HoldCursorJDBC30Test extends BaseJDBCTestCase {
 
     /**
@@ -104,7 +102,7 @@ public final class HoldCursorJDBC30Test 
     }
 
     public static Test suite() {
-        TestSuite suite = new TestSuite("HoldCursorJDBC30Test");
+        BaseTestSuite suite = new BaseTestSuite("HoldCursorJDBC30Test");
         suite.addTest(decorateTest(TestConfiguration.embeddedSuite(HoldCursorJDBC30Test.class)));
         suite.addTest(decorateTest(TestConfiguration.clientServerSuite(HoldCursorJDBC30Test.class)));
         
@@ -1746,4 +1744,4 @@ public final class HoldCursorJDBC30Test 
         st.close();
         stUtil.close();
     }
-}
\ No newline at end of file
+}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java Tue Jul  8 13:51:51 2014
@@ -19,27 +19,21 @@
 */
 package org.apache.derbyTesting.functionTests.tests.store;
 
-import java.io.File;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.PreparedStatement;
-import java.sql.CallableStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
-import java.sql.DriverManager;
+import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Random;
-import java.lang.Math;
 import java.util.Properties;
+import java.util.Random;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
  * This test started out as a test reproduce and verify fix for DERBY-151.
@@ -63,7 +57,7 @@ public class InterruptResilienceTest ext
 
     protected static Test makeSuite(String name)
     {
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite suite = new BaseTestSuite(name);
 
         Test est = TestConfiguration.embeddedSuite(
             InterruptResilienceTest.class);
@@ -98,21 +92,21 @@ public class InterruptResilienceTest ext
             if (getSystemProperty("java.version").startsWith("1.4.2"))
             {
                 println("InterruptResilienceTest skipped for this VM, cf. DERBY-5074/5109");
-                return new TestSuite(testName);
+                return new BaseTestSuite(testName);
             }
         }
 
         if (!JDBC.vmSupportsJDBC3()) {
             println("Test skipped for this VM, " +
                     "DriverManager is not supported with JSR169");
-            return new TestSuite(testName);
+            return new BaseTestSuite(testName);
         }
 
         if (hasInterruptibleIO()) {
             println("Test skipped due to interruptible IO.");
             println("This is default on Solaris/Sun Java <= 1.6, use " +
                     "-XX:-UseVMInterruptibleIO if available.");
-            return new TestSuite(testName);
+            return new BaseTestSuite(testName);
         }
 
         return makeSuite(testName);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java Tue Jul  8 13:51:51 2014
@@ -25,11 +25,9 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.IndexStatsUtil;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
 
@@ -146,7 +144,9 @@ public class KeepDisposableStatsProperty
      */
     public static Test suite() {
         String property = "derby.storage.indexStats.debug.keepDisposableStats";
-        TestSuite suite = new TestSuite("KeepDisposableStatsPropertyTestSuite");
+        BaseTestSuite suite =
+            new BaseTestSuite("KeepDisposableStatsPropertyTestSuite");
+
         // Test the default (expected to be false).
         suite.addTest(
                 new KeepDisposableStatsPropertyTest("testPropertyDefault"));
@@ -154,7 +154,7 @@ public class KeepDisposableStatsProperty
         // Test setting the property explicitly to true.
         Properties propsOn = new Properties();
         propsOn.setProperty(property, "true");
-        TestSuite suiteOn = new TestSuite("Do KeepDisposableStats");
+        BaseTestSuite suiteOn = new BaseTestSuite("Do KeepDisposableStats");
         suiteOn.addTest(
                 new KeepDisposableStatsPropertyTest("testPropertyTrue"));
         suite.addTest(new SystemPropertyTestSetup(suiteOn, propsOn, true));
@@ -162,7 +162,9 @@ public class KeepDisposableStatsProperty
         // Test setting the property explicitly to false.
         Properties propsOff = new Properties();
         propsOff.setProperty(property, "false");
-        TestSuite suiteOff = new TestSuite("Don't KeepDisposableStats");
+        BaseTestSuite suiteOff =
+            new BaseTestSuite("Don't KeepDisposableStats");
+
         suiteOff.addTest(
                 new KeepDisposableStatsPropertyTest("testPropertyFalse"));
         suite.addTest(new SystemPropertyTestSetup(suiteOff, propsOff, true));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java Tue Jul  8 13:51:51 2014
@@ -23,11 +23,9 @@ package org.apache.derbyTesting.function
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -38,7 +36,7 @@ public class LongColumnTest extends Base
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("LongColumnTest");
+        BaseTestSuite suite = new BaseTestSuite("LongColumnTest");
         suite.addTest(TestConfiguration.defaultSuite(LongColumnTest.class));
 
         return suite;
@@ -659,4 +657,4 @@ public class LongColumnTest extends Base
         
         st.close();
     }
-}
\ No newline at end of file
+}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java Tue Jul  8 13:51:51 2014
@@ -20,16 +20,13 @@
 
  package org.apache.derbyTesting.functionTests.tests.store;
 
-import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -50,7 +47,7 @@ public final class MadhareTest extends B
       public static Test suite()
       {
         //Add the test case into the test suite
-        TestSuite suite = new TestSuite("MadhareTest Test");
+        BaseTestSuite suite = new BaseTestSuite("MadhareTest Test");
         return TestConfiguration.defaultSuite(MadhareTest.class);
       }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java Tue Jul  8 13:51:51 2014
@@ -24,12 +24,10 @@ import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class OCRecoveryTest extends BaseJDBCTestCase {
@@ -42,7 +40,7 @@ public class OCRecoveryTest extends Base
 
     public static Test suite()
     {
-        TestSuite suite = new TestSuite("OCRecoveryTest");
+        BaseTestSuite suite = new BaseTestSuite("OCRecoveryTest");
         //DERBY-4647 exec does not work on weme
         if (BaseTestCase.isJ9Platform())
             return suite;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java Tue Jul  8 13:51:51 2014
@@ -30,14 +30,11 @@ import java.security.PrivilegedAction;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import javax.sql.DataSource;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -54,7 +51,7 @@ public class OSReadOnlyTest extends Base
         super(name);
     }
     
-    private static Test newCleanDatabase(TestSuite s) {
+    private static Test newCleanDatabase(BaseTestSuite s) {
         return new CleanDatabaseTestSetup(s) {
         /**
          * Creates the database objects used in the test cases.
@@ -85,8 +82,8 @@ public class OSReadOnlyTest extends Base
 
     protected static Test baseSuite(String name) 
     {
-        TestSuite readonly = new TestSuite("OSReadOnly");
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite readonly = new BaseTestSuite("OSReadOnly");
+        BaseTestSuite suite = new BaseTestSuite(name);
         readonly.addTestSuite(OSReadOnlyTest.class);
         suite.addTest(TestConfiguration.singleUseDatabaseDecorator(newCleanDatabase(readonly)));
         
@@ -95,7 +92,7 @@ public class OSReadOnlyTest extends Base
 
     public static Test suite() 
     {
-        TestSuite suite = new TestSuite("OSReadOnlyTest");
+        BaseTestSuite suite = new BaseTestSuite("OSReadOnlyTest");
         suite.addTest(baseSuite("OSReadOnlyTest:embedded"));
         suite.addTest(TestConfiguration
             .clientServerDecorator(baseSuite("OSReadOnlyTest:client")));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java Tue Jul  8 13:51:51 2014
@@ -26,12 +26,10 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -76,8 +74,11 @@ public class OfflineBackupTest extends B
 
     public static Test suite() {
         
-        if (JDBC.vmSupportsJSR169())
-            return new TestSuite("Empty OfflineBackupTest (uses DriverManager)");
+        if (JDBC.vmSupportsJSR169()) {
+            return new BaseTestSuite(
+                "Empty OfflineBackupTest (uses DriverManager)");
+        }
+
         return TestConfiguration.embeddedSuite(OfflineBackupTest.class);        
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java Tue Jul  8 13:51:51 2014
@@ -25,14 +25,13 @@ package org.apache.derbyTesting.function
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.util.Arrays;
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.impl.jdbc.PositionedStoreStream;
 import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 
 /**
  * Tests of the repositioning logic in {@link PositionedStoreStream}.
@@ -240,7 +239,7 @@ public class PositionedStoreStreamTest
     }
 
     public static Test suite() {
-        return new TestSuite(
+        return new BaseTestSuite(
                 PositionedStoreStreamTest.class, "PositionedStoreStreamTest");
     }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java Tue Jul  8 13:51:51 2014
@@ -24,15 +24,11 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
@@ -50,7 +46,7 @@ public final class RecoveryTest extends 
     public static Test suite()
     {
         // Add the test case into the test suite
-        TestSuite suite = new TestSuite("RecoveryTest");
+        BaseTestSuite suite = new BaseTestSuite("RecoveryTest");
         suite.addTest(decorateTest());
         return suite;
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreBaseTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreBaseTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreBaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreBaseTest.java Tue Jul  8 13:51:51 2014
@@ -1,24 +1,3 @@
-package org.apache.derbyTesting.functionTests.tests.store;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.SQLException;
-
-
 /*
 Class org.apache.derbyTesting.functionTests.tests.jdbc4.Derby3650Test
 
@@ -39,6 +18,15 @@ limitations under the License.
 
 */
 
+package org.apache.derbyTesting.functionTests.tests.store;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import junit.framework.Assert;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+
+
 
 /**
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java Tue Jul  8 13:51:51 2014
@@ -23,14 +23,11 @@ package org.apache.derbyTesting.function
 
 import java.sql.Statement;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
 
 public class StoreScriptsTest extends ScriptTestCase {
@@ -113,7 +110,7 @@ public class StoreScriptsTest extends Sc
     
     private static Test getSuite(String[] list)
     {
-        TestSuite suite = new TestSuite("SQL scripts");
+        BaseTestSuite suite = new BaseTestSuite("SQL scripts");
         for (int i = 0; i < list.length; i++)
             suite.addTest(
                     new CleanDatabaseTestSetup(
@@ -135,7 +132,7 @@ public class StoreScriptsTest extends Sc
         // Lock timeout settings that were set for the old harness store tests
         test = DatabasePropertyTestSetup.setLockTimeouts(test, 1, 4);
         
-        TestSuite suite = new TestSuite("StoreScripts");
+        BaseTestSuite suite = new BaseTestSuite("StoreScripts");
         suite.addTest(test);
 
         return getIJConfig(suite); 
@@ -159,4 +156,4 @@ public class StoreScriptsTest extends Sc
     }
 
 
-}
\ No newline at end of file
+}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java Tue Jul  8 13:51:51 2014
@@ -28,20 +28,18 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
-import java.sql.PreparedStatement;
+import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.Formatters;
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -2077,7 +2075,7 @@ public class StreamingColumnTest extends
         Properties strColProperties = new Properties();
         strColProperties.setProperty("derby.storage.sortBufferMax", "5");
         strColProperties.setProperty("derby.debug.true", "testSort");
-        TestSuite suite = new TestSuite("StreamingColumnTest");
+        BaseTestSuite suite = new BaseTestSuite("StreamingColumnTest");
         suite.addTest(baseSuite("StreamingColumnTest:embedded"));
         suite
                 .addTest(TestConfiguration
@@ -2086,7 +2084,7 @@ public class StreamingColumnTest extends
     }
 
     protected static Test baseSuite(String name) {
-        TestSuite suite = new TestSuite(name);
+        BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(StreamingColumnTest.class);
         Test test = new SupportFilesSetup(suite, new String[] {
                 "functionTests/tests/store/short.data",

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java Tue Jul  8 13:51:51 2014
@@ -21,13 +21,12 @@
 */
 package org.apache.derbyTesting.functionTests.tests.store;
 
+import junit.framework.Test;
+import org.apache.derby.shared.common.sanity.SanityManager;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 
-import junit.framework.Test;  
-import junit.framework.TestSuite;
-import org.apache.derby.shared.common.sanity.SanityManager;
-
 /**
  * Suite to run all JUnit tests in this package:
  * org.apache.derbyTesting.functionTests.tests.lang
@@ -50,7 +49,7 @@ public class _Suite extends BaseTestCase
 
     public static Test suite() {
 
-        TestSuite suite = new TestSuite("store");
+        BaseTestSuite suite = new BaseTestSuite("store");
 
         suite.addTest(BootAllTest.suite());
         suite.addTest(ClassLoaderBootTest.suite());

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java Tue Jul  8 13:51:51 2014
@@ -27,11 +27,9 @@ import java.io.UnsupportedEncodingExcept
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.Derby;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -46,11 +44,13 @@ public class ConnectWrongSubprotocolTest
     
     public static Test suite() {
         // Test does not run on J2ME
-        if (JDBC.vmSupportsJSR169())
-            return new TestSuite("empty: no support for Driver.sql.Manager with jsr 169");
+        if (JDBC.vmSupportsJSR169()) {
+            return new BaseTestSuite(
+                "empty: no support for Driver.sql.Manager with jsr 169");
+        }
         
         if (!Derby.hasTools())
-            return new TestSuite("empty: no tools support");
+            return new BaseTestSuite("empty: no tools support");
         
     	Properties props = new Properties();        
         props.setProperty("ij.connection.wrongSubprotocol", "jdbc:noone:fruitfly;create=true");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java Tue Jul  8 13:51:51 2014
@@ -25,11 +25,9 @@ import java.io.UnsupportedEncodingExcept
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.Derby;
 
@@ -42,12 +40,12 @@ public class IJRunScriptTest extends Bas
     public static Test suite()
     {
         if (Derby.hasTools()) {
-            TestSuite suite = new TestSuite("IJRunScriptTest");
+            BaseTestSuite suite = new BaseTestSuite("IJRunScriptTest");
             suite.addTestSuite(IJRunScriptTest.class);
             return new CleanDatabaseTestSetup(suite);
         }
         
-        return new TestSuite("empty: no tools support");
+        return new BaseTestSuite("empty: no tools support");
     }
     
     public IJRunScriptTest(String name)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java Tue Jul  8 13:51:51 2014
@@ -22,12 +22,9 @@
 package org.apache.derbyTesting.functionTests.tests.tools;
 
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
 import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -49,7 +46,7 @@ public class IjConnNameTest extends Scri
     }    
 
     public static Test suite() {
-        TestSuite suite = new TestSuite("IjConnNameTest");
+        BaseTestSuite suite = new BaseTestSuite("IjConnNameTest");
         
         // Test does not run on J2ME
         if (JDBC.vmSupportsJSR169())

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java Tue Jul  8 13:51:51 2014
@@ -23,13 +23,11 @@
 package org.apache.derbyTesting.functionTests.tests.tools;
 
 import java.io.PrintStream;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derby.tools.ij;
 import org.apache.derbyTesting.functionTests.util.TestNullOutputStream;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -70,7 +68,7 @@ public class IjSecurityManagerTest exten
         return test;
 	}
 	public static Test suite() {		
-		TestSuite suite = new TestSuite("IjSecurityManagerTest");
+        BaseTestSuite suite = new BaseTestSuite("IjSecurityManagerTest");
 		suite.addTest(decorateTest());
 		return suite;
 	}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java Tue Jul  8 13:51:51 2014
@@ -20,21 +20,17 @@
  */
 package org.apache.derbyTesting.functionTests.tests.tools;
 
+import java.io.IOException;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.io.IOException;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 /**
  * This class tests import/export of  a table with simple binary data types 
@@ -58,7 +54,9 @@ public class ImportExportBinaryDataTest 
      */
     public static Test suite()
     {
-        TestSuite suite = new TestSuite(ImportExportBinaryDataTest.class);
+        BaseTestSuite suite =
+            new BaseTestSuite(ImportExportBinaryDataTest.class);
+
         suite.addTest(TestConfiguration.clientServerSuite(
                       ImportExportBinaryDataTest.class));
         Test test = suite;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java Tue Jul  8 13:51:51 2014
@@ -21,11 +21,9 @@
 package org.apache.derbyTesting.functionTests.tests.tools;
 
 import java.util.Locale;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.LocaleTestSetup;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -51,7 +49,7 @@ public final class ImportExportIJTest ex
 	 * Return the suite that runs the script.
 	 */
 	public static Test suite() {
-		TestSuite suite = new TestSuite("importExportIJ");
+        BaseTestSuite suite = new BaseTestSuite("importExportIJ");
 		
         // only run with embedded
         // network server makes slightly different output

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java Tue Jul  8 13:51:51 2014
@@ -21,26 +21,22 @@
  */
 package org.apache.derbyTesting.functionTests.tests.tools;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Connection;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-import org.apache.derbyTesting.junit.JDBC;
-
 import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
 import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 
 /**
@@ -71,7 +67,7 @@ public class ImportExportLobTest extends
      */
     public static Test suite()
     {
-        TestSuite suite = new TestSuite(ImportExportLobTest.class);
+        BaseTestSuite suite = new BaseTestSuite(ImportExportLobTest.class);
         suite.addTest(TestConfiguration.clientServerSuite(
                              ImportExportLobTest.class));
         Test test = suite;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java Tue Jul  8 13:51:51 2014
@@ -26,15 +26,13 @@ import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-
+import junit.framework.Test;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Converted from ieptests.sql
  *
@@ -53,7 +51,7 @@ public class ImportExportProcedureTest e
 
     public static Test suite()
     {
-        TestSuite suite = new TestSuite("ImportExportProcedureTest");
+        BaseTestSuite suite = new BaseTestSuite("ImportExportProcedureTest");
         suite.addTest(TestConfiguration.defaultSuite(ImportExportProcedureTest.class));
         return new SupportFilesSetup(suite, new String[] { 
         		"functionTests/testData/ImportExport/db2ttypes.del",

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java Tue Jul  8 13:51:51 2014
@@ -23,16 +23,15 @@ package org.apache.derbyTesting.function
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
-
+import java.sql.Statement;
+import junit.framework.Test;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
 
 /**
  * Test import and export procedures 
@@ -44,13 +43,13 @@ public class ImportExportTest extends Ba
 	}
 	
 	public static Test suite() {
-        TestSuite suite = new TestSuite("ImportExportTest");
+        BaseTestSuite suite = new BaseTestSuite("ImportExportTest");
 
         // disabled on weme6.1 due at the moment due 
         // to problems with security exceptions.
         if (JDBC.vmSupportsJSR169())
         {
-        	return new TestSuite();
+            return new BaseTestSuite();
         }
         suite.addTest(baseSuite("ImportExportTest:embedded"));
 
@@ -61,7 +60,7 @@ public class ImportExportTest extends Ba
 	}
 	
 	public static Test baseSuite(String name) {
-		TestSuite suite = new TestSuite(ImportExportTest.class, name);
+        BaseTestSuite suite = new BaseTestSuite(ImportExportTest.class, name);
 		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/TwoLineBadEOF.dat"} );
 		return new CleanDatabaseTestSetup(test) {
             protected void decorateSQL(Statement s) throws SQLException {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java Tue Jul  8 13:51:51 2014
@@ -20,19 +20,14 @@
 package org.apache.derbyTesting.functionTests.tests.tools;
 
 import java.sql.CallableStatement;
-
-
 import java.sql.Connection;
-
 import java.sql.SQLException;
 import java.util.Properties;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.derby.impl.jdbc.EmbedConnection;
 import org.apache.derby.jdbc.InternalDriver;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -77,7 +72,8 @@ public class RollBackWrappingWhenFailOnI
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("RollBackWrappingWhenFailOnImportTest");
+        BaseTestSuite suite =
+            new BaseTestSuite("RollBackWrappingWhenFailOnImportTest");
         
         if (!JDBC.vmSupportsJDBC3()) {
             return suite;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java Tue Jul  8 13:51:51 2014
@@ -21,18 +21,17 @@
 
 package org.apache.derbyTesting.functionTests.tests.tools;
 
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
 import java.io.PrintWriter;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
+import junit.framework.Test;
 import org.apache.derby.tools.sysinfo;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 
 /**
  *  Test all the static public methods of the sysinfo class.
@@ -52,7 +51,7 @@ public class SysinfoAPITest extends Base
     }
     
     public static Test suite() {
-    	Test suite = new TestSuite(SysinfoAPITest.class, "Sysinfo API");
+        Test suite = new BaseTestSuite(SysinfoAPITest.class, "Sysinfo API");
     	
     	return suite;
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java Tue Jul  8 13:51:51 2014
@@ -28,15 +28,13 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.util.Locale;
-
 import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derby.iapi.services.info.JVMInfo;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.Derby;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.LocaleTestSetup;
-import org.apache.derby.iapi.services.info.JVMInfo;
 
 public class SysinfoCPCheckTest extends BaseJDBCTestCase {
 
@@ -50,7 +48,7 @@ public class SysinfoCPCheckTest extends 
     public static Test suite() {
 
         if (!Derby.hasTools())
-            return new TestSuite("empty: no tools support");
+            return new BaseTestSuite("empty: no tools support");
         
         // check to see if we have derbynet.jar or derbyclient.jar
         // before starting the security manager...
@@ -59,7 +57,9 @@ public class SysinfoCPCheckTest extends 
         if (!Derby.hasClient())
             isClient=false;
 
-        Test suite = new TestSuite(SysinfoCPCheckTest.class, "Sysinfo ClassPath Checker");        
+        Test suite = new BaseTestSuite(
+            SysinfoCPCheckTest.class, "Sysinfo ClassPath Checker");
+
         return new LocaleTestSetup(suite, Locale.ENGLISH);
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java Tue Jul  8 13:51:51 2014
@@ -29,8 +29,8 @@ import java.net.URLClassLoader;
 import java.util.Locale;
 import java.util.Properties;
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
 import org.apache.derbyTesting.junit.Derby;
 import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -109,10 +109,10 @@ public class SysinfoLocaleTest extends B
      */
     public static Test suite() {
         if (!Derby.hasTools()) {
-            return new TestSuite("empty: no tools support");
+            return new BaseTestSuite("empty: no tools support");
         }
 
-        TestSuite suite = new TestSuite("SysinfoLocaleTest");
+        BaseTestSuite suite = new BaseTestSuite("SysinfoLocaleTest");
 
         // Create test combinations. Messages should be localized to the
         // locale specified by derby.ui.locale, if it's set. Otherwise, the



Mime
View raw message