You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2014/07/08 15:52:02 UTC
svn commit: r1608782 [5/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/...
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java Tue Jul 8 13:51:51 2014
@@ -26,11 +26,9 @@ 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.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -1189,7 +1187,7 @@ public class AutoIncrementTest extends B
public static Test suite() {
return new CleanDatabaseTestSetup(
- new TestSuite(AutoIncrementTest.class, "AutoIncrementTest")) {
+ new BaseTestSuite(AutoIncrementTest.class, "AutoIncrementTest")) {
protected void decorateSQL(Statement s)
throws SQLException
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java Tue Jul 8 13:51:51 2014
@@ -22,17 +22,11 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.SQLException;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -82,7 +76,8 @@ public class AwareVTITest extends Gener
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(AwareVTITest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ AwareVTITest.class);
Test result = new CleanDatabaseTestSetup( suite );
return result;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java Tue Jul 8 13:51:51 2014
@@ -21,12 +21,10 @@ 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.functionTests.util.Formatters;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -260,7 +258,7 @@ public class BigDataTest extends BaseJDB
}
public static Test suite() {
- TestSuite suite = new TestSuite("BigDataTest");
+ BaseTestSuite suite = new BaseTestSuite("BigDataTest");
suite.addTest(TestConfiguration.defaultSuite(BigDataTest.class));
return suite;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java Tue Jul 8 13:51:51 2014
@@ -28,16 +28,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derby.iapi.types.HarmonySerialBlob;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.XML;
-import org.apache.derby.iapi.types.HarmonySerialBlob;
-
/**
* <p>
* Test Derby's expanding support for BOOLEAN values.
@@ -99,7 +96,8 @@ public class BooleanValuesTest extends
*/
public static Test suite()
{
- Test result = (TestSuite) TestConfiguration.defaultSuite(BooleanValuesTest.class);
+ Test result = (BaseTestSuite)TestConfiguration.defaultSuite(
+ BooleanValuesTest.class);
return result;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java Tue Jul 8 13:51:51 2014
@@ -25,15 +25,12 @@ 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.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.Utilities;
/**
* Where current of cursorname and case sensitivity
@@ -61,7 +58,7 @@ public class Bug5054Test extends BaseJDB
* run.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("Bug5054Test");
+ BaseTestSuite suite = new BaseTestSuite("Bug5054Test");
Test test = new CleanDatabaseTestSetup(TestConfiguration
.embeddedSuite(Bug5054Test.class)) {
protected void decorateSQL(Statement stmt) throws SQLException {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java Tue Jul 8 13:51:51 2014
@@ -23,21 +23,19 @@ package org.apache.derbyTesting.function
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.ResultSet;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
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.SQLUtilities;
@@ -275,7 +273,7 @@ public class CaseExpressionTest extends
*/
public static Test suite()
{
- TestSuite suite = (TestSuite)
+ BaseTestSuite suite = (BaseTestSuite)
TestConfiguration.embeddedSuite(CaseExpressionTest.class);
return new CleanDatabaseTestSetup(suite) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java Tue Jul 8 13:51:51 2014
@@ -25,11 +25,9 @@ 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.CleanDatabaseTestSetup;
/**
@@ -61,8 +59,10 @@ public class CharUTF8Test extends BaseJD
* run.
*/
public static Test suite() {
- return new CleanDatabaseTestSetup(new TestSuite(CharUTF8Test.class)) {
- protected void decorateSQL(Statement stmt) throws SQLException {
+ return new CleanDatabaseTestSetup(
+ new BaseTestSuite(CharUTF8Test.class)) {
+
+ protected void decorateSQL(Statement stmt) throws SQLException {
stmt.execute("CREATE TABLE TEST(id int not null primary key, body varchar(60))");
}
};
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java Tue Jul 8 13:51:51 2014
@@ -21,16 +21,15 @@ limitations under the License.
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.JDBC;
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;
@@ -49,7 +48,7 @@ public final class CheckConstraintTest e
public static Test suite()
{
- TestSuite suite = new TestSuite("checkConstraint Test");
+ BaseTestSuite suite = new BaseTestSuite("checkConstraint Test");
suite.addTest(TestConfiguration.defaultSuite(CheckConstraintTest.class));
return new SupportFilesSetup(
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?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- 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 Tue Jul 8 13:51:51 2014
@@ -27,24 +27,20 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import java.text.Collator;
import java.util.Locale;
-
import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.derby.iapi.types.HarmonySerialClob;
-
import org.apache.derbyTesting.functionTests.tests.jdbcapi.BatchUpdateTest;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest;
-import org.apache.derbyTesting.junit.XML;
+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.Decorator;
import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.functionTests.util.TestUtil;
+import org.apache.derbyTesting.junit.XML;
public class CollationTest extends BaseJDBCTestCase {
@@ -2087,7 +2083,7 @@ public void testMissingCollatorSupport()
*/
public static Test suite() {
- TestSuite suite = new TestSuite("CollationTest");
+ BaseTestSuite suite = new BaseTestSuite("CollationTest");
//Add the test case for a locale which does not exist. We have asked for
//locale as 'xx' and since there is not support Collator support for such
//a locale, we will get an exception during database create time.
@@ -2167,7 +2163,8 @@ public void testMissingCollatorSupport()
private static Test collatedSuite(
String locale, boolean caseInsensitive, String[] testNames)
{
- TestSuite suite = new TestSuite("CollationTest:territory=" + locale);
+ BaseTestSuite suite =
+ new BaseTestSuite("CollationTest:territory=" + locale);
for (int i = 0; i < testNames.length; i++) {
suite.addTest(new CollationTest(testNames[i]));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java Tue Jul 8 13:51:51 2014
@@ -27,22 +27,18 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import java.text.Collator;
import java.text.RuleBasedCollator;
-
import java.util.Locale;
import java.util.Properties;
-
import junit.framework.Assert;
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.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -1997,7 +1993,7 @@ public class CollationTest2 extends Base
{
// only test in embedded mode, all tests are server side actions.
- TestSuite suite = new TestSuite("CollationTest2");
+ BaseTestSuite suite = new BaseTestSuite("CollationTest2");
suite.addTest(new CollationTest2("testDefaultCollation"));
suite.addTest(collatedTest("en", "testEnglishCollation"));
suite.addTest(caseInsensitiveCollationSuite());
@@ -2050,7 +2046,9 @@ public class CollationTest2 extends Base
* @return A suite of tests.
*/
private static Test caseInsensitiveCollationSuite() {
- TestSuite suite = new TestSuite("Case insensitive specific tests");
+ BaseTestSuite suite =
+ new BaseTestSuite("Case insensitive specific tests");
+
suite.addTest(new CollationTest2("ci_testDerby5367"));
return Decorator.territoryCollatedCaseInsensitiveDatabase(
suite, "en_US");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java Tue Jul 8 13:51:51 2014
@@ -19,15 +19,14 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.lang;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.ResultSet;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.Formatters;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
public final class ColumnDefaultsTest extends BaseJDBCTestCase {
@@ -42,7 +41,7 @@ public final class ColumnDefaultsTest ex
public static Test suite()
{
- TestSuite suite = new TestSuite("ColumnDefaultsTest Test");
+ BaseTestSuite suite = new BaseTestSuite("ColumnDefaultsTest Test");
suite.addTest(TestConfiguration.defaultSuite(ColumnDefaultsTest.class));
return suite;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java Tue Jul 8 13:51:51 2014
@@ -25,10 +25,7 @@ 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.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java Tue Jul 8 13:51:51 2014
@@ -26,12 +26,10 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.TestRoutines;
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;
@@ -49,10 +47,10 @@ public class ConnectTest extends BaseJDB
if ( JDBC.vmSupportsJSR169())
// Test uses DriverManager which
// is not supported with JSR169
- return
- new TestSuite("empty ConnectTest:DriverManager not supported");
+ return
+ new BaseTestSuite("empty ConnectTest:DriverManager not supported");
else {
- TestSuite suite = new TestSuite("ConnectTest suite");
+ BaseTestSuite suite = new BaseTestSuite("ConnectTest suite");
suite.addTest(TestConfiguration.defaultSuite(ConnectTest.class));
// Derby2026 test uses explicit client connection so not relevant to embedded
suite.addTest(TestConfiguration.
@@ -175,4 +173,4 @@ public class ConnectTest extends BaseJDB
}
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java Tue Jul 8 13:51:51 2014
@@ -40,13 +40,13 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.impl.jdbc.EmbedConnection;
import org.apache.derby.impl.sql.GenericPreparedStatement;
import org.apache.derbyTesting.functionTests.tests.memorydb.MemoryDbManager;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -94,7 +94,7 @@ public class ConstraintCharacteristicsTe
public static Test suite() {
final String nameRoot = ConstraintCharacteristicsTest.class.getName();
- final TestSuite suite = new TestSuite(nameRoot);
+ final BaseTestSuite suite = new BaseTestSuite(nameRoot);
suite.addTest(baseSuite(nameRoot + ":embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
@@ -111,7 +111,7 @@ public class ConstraintCharacteristicsTe
// locks.waitTimeout setting.
private static Test restSuite(final String name) {
- final TestSuite suite = new TestSuite(name);
+ final BaseTestSuite suite = new BaseTestSuite(name);
suite.addTest(new ConstraintCharacteristicsTest(
"testDeferredRowsInvalidation"));
@@ -127,7 +127,7 @@ public class ConstraintCharacteristicsTe
}
private static Test baseSuite(final String name) {
- final TestSuite suite = new TestSuite(name);
+ final BaseTestSuite suite = new BaseTestSuite(name);
suite.addTest(new ConstraintCharacteristicsTest(
"testSyntaxAndBinding"));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java Tue Jul 8 13:51:51 2014
@@ -25,10 +25,9 @@ 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;
/** This tests the current of statements, i.e.
* delete where current of and update where current of.
@@ -47,7 +46,7 @@ public class CurrentOfTest extends BaseJ
* Create a suite of tests.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("CurrentOfTest");
+ BaseTestSuite suite = new BaseTestSuite("CurrentOfTest");
suite.addTestSuite(CurrentOfTest.class);
//To run the test in both embedded and client/server mode
//commenting it for the time being sicne the test fails in the client/server mode
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java Tue Jul 8 13:51:51 2014
@@ -7,8 +7,8 @@ import java.sql.ResultSetMetaData;
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;
@@ -34,7 +34,7 @@ public final class CurrentSchemaTest ext
public static Test suite()
{
- TestSuite suite = new TestSuite("CurrentSchemaTest");
+ BaseTestSuite suite = new BaseTestSuite("CurrentSchemaTest");
suite.addTest(TestConfiguration.defaultSuite(CurrentSchemaTest.class));
return suite;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java Tue Jul 8 13:51:51 2014
@@ -23,11 +23,9 @@ 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;
/**
@@ -198,7 +196,7 @@ public class CursorTest extends BaseJDBC
}
public static Test suite() {
- TestSuite suite = new TestSuite("CursorTest");
+ BaseTestSuite suite = new BaseTestSuite("CursorTest");
suite.addTest(TestConfiguration.defaultSuite(CursorTest.class));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java Tue Jul 8 13:51:51 2014
@@ -25,8 +25,8 @@ 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.SQLUtilities;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -44,7 +44,9 @@ public final class DB2IsolationLevelsTes
public static Test suite()
{
- TestSuite suite = new TestSuite("DB2IsolationLevelsTest Test");
+ BaseTestSuite suite =
+ new BaseTestSuite("DB2IsolationLevelsTest Test");
+
suite.addTest(TestConfiguration.defaultSuite(
DB2IsolationLevelsTest.class));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java Tue Jul 8 13:51:51 2014
@@ -24,16 +24,14 @@ package org.apache.derbyTesting.function
import java.io.File;
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 java.sql.DriverManager;
-import java.sql.PreparedStatement;
-
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.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
@@ -236,7 +234,7 @@ public class DBInJarTest extends BaseJDB
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(DBInJarTest.class);
// Don't run with security manager, we need access to user.dir to archive
// the database.
@@ -260,7 +258,7 @@ public class DBInJarTest extends BaseJDB
}
public static Test suite() {
- TestSuite suite = new TestSuite("DBInJarTest");
+ BaseTestSuite suite = new BaseTestSuite("DBInJarTest");
suite.addTest(baseSuite("DBInJarTest:embedded"));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java Tue Jul 8 13:51:51 2014
@@ -21,15 +21,12 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.net.URL;
import java.sql.Connection;
-import java.sql.PreparedStatement;
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.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests that certain operations can only be performed by the DBO.
@@ -121,7 +118,7 @@ public class DBOAccessTest extends Gener
Test unauthorizedRun = TestConfiguration.embeddedSuite( NoAuthorization.class );
unauthorizedRun = new SupportFilesSetup( unauthorizedRun, testFiles );
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
suite.addTest( authorizedRun );
suite.addTest( unauthorizedRun );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java Tue Jul 8 13:51:51 2014
@@ -38,21 +38,18 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-
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.ClasspathSetup;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.LoginTimeoutTestSetup;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
/**
* Test database class loading, executing routines from the
@@ -76,7 +73,8 @@ public class DatabaseClassLoadingTest ex
*/
public static Test suite() throws Exception
{
- final TestSuite suite = new TestSuite("DatabaseClassLoadingTest");
+ final BaseTestSuite suite =
+ new BaseTestSuite("DatabaseClassLoadingTest");
// Need DriverManager to execute the add contact procedure
// as it uses server side jdbc.
@@ -198,7 +196,8 @@ public class DatabaseClassLoadingTest ex
* have the database in its context class loader.
*/
private static Test loginTimeoutSuite() throws Exception {
- TestSuite suite = new TestSuite("Class loading with login timeout");
+ BaseTestSuite suite =
+ new BaseTestSuite("Class loading with login timeout");
// First run a test when the database is not in the classpath.
// Expect the connection attempt to fail.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java Tue Jul 8 13:51:51 2014
@@ -31,11 +31,9 @@ import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.TimeZone;
-
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.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -56,7 +54,7 @@ public final class DateTimeTest extends
}
public static Test suite() {
- TestSuite suite = new TestSuite("DateTimeTest");
+ BaseTestSuite suite = new BaseTestSuite("DateTimeTest");
suite.addTest(baseSuite("DateTimeTest:Embedded"));
suite.addTest(TestConfiguration
.clientServerDecorator(baseSuite("DateTimeTest:Client")));
@@ -64,7 +62,7 @@ public final class DateTimeTest extends
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(DateTimeTest.class);
return new CleanDatabaseTestSetup(suite) {
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java Tue Jul 8 13:51:51 2014
@@ -23,11 +23,9 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.LinkedList;
-
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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.Decorator;
@@ -154,7 +152,7 @@ public class DeadlockModeTest extends Ba
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(DeadlockModeTest.class);
return new CleanDatabaseTestSetup(
DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4))
@@ -177,7 +175,7 @@ public class DeadlockModeTest extends Ba
}
public static Test suite() {
- TestSuite suite = new TestSuite("DeadlockModeTest ");
+ BaseTestSuite suite = new BaseTestSuite("DeadlockModeTest ");
suite.addTest(
baseSuite("DeadlockModeTest:embedded")
);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java Tue Jul 8 13:51:51 2014
@@ -24,17 +24,17 @@ package org.apache.derbyTesting.function
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Savepoint;
import java.sql.Statement;
-import java.sql.SQLException;
-
import javax.sql.ConnectionPoolDataSource;
import javax.sql.PooledConnection;
-
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.J2EEDataSource;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Test for declared global temporary tables (introduced in Cloudscape 5.2)
@@ -55,7 +55,7 @@ public class DeclareGlobalTempTableJavaJ
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
suite.addTest(TestConfiguration.embeddedSuite(
DeclareGlobalTempTableJavaJDBC30Test.class));
suite.addTest(TestConfiguration.clientServerDecorator(
@@ -69,7 +69,7 @@ public class DeclareGlobalTempTableJavaJ
* @return A suite of tests being run with client only
*/
private static Test getClientSuite() {
- TestSuite suite = new TestSuite("Client/Server");
+ BaseTestSuite suite = new BaseTestSuite("Client/Server");
// skip the tests with more than 1 savepoint -
// see (lack of support described in) DERBY-3687
// so, only do the following with network server/client:
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java Tue Jul 8 13:51:51 2014
@@ -24,11 +24,10 @@ package org.apache.derbyTesting.function
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
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;
public class Derby5005Test extends BaseJDBCTestCase {
@@ -43,7 +42,7 @@ public class Derby5005Test extends BaseJ
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("Derby5005Test");
+ BaseTestSuite suite = new BaseTestSuite("Derby5005Test");
suite.addTest(makeSuite());
// suite.addTest(
@@ -60,7 +59,7 @@ public class Derby5005Test extends BaseJ
private static Test makeSuite()
{
return new CleanDatabaseTestSetup(
- new TestSuite(Derby5005Test.class)) {
+ new BaseTestSuite(Derby5005Test.class)) {
protected void decorateSQL(Statement s)
throws SQLException {
getConnection().setAutoCommit(false);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java Tue Jul 8 13:51:51 2014
@@ -23,10 +23,9 @@ package org.apache.derbyTesting.function
import java.sql.SQLException;
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.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
public class Derby5652 extends BaseJDBCTestCase
{
@@ -63,7 +62,7 @@ public class Derby5652 extends BaseJDBCT
*/
public static Test suite()
{
- TestSuite suite = new TestSuite( "Derby5652" );
+ BaseTestSuite suite = new BaseTestSuite( "Derby5652" );
Test test = new Derby5652( "basicTest" );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java Tue Jul 8 13:51:51 2014
@@ -23,11 +23,9 @@ package org.apache.derbyTesting.function
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.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -42,12 +40,12 @@ public class Derby6587Test extends BaseJ
}
public static Test suite(){
- TestSuite suite = new TestSuite("Derby6587Test");
+ BaseTestSuite suite = new BaseTestSuite("Derby6587Test");
suite.addTest(baseSuite("Derby6587:embedded"));
return suite;
}
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(Derby6587Test.class, name);
+ BaseTestSuite suite = new BaseTestSuite(Derby6587Test.class, name);
Test test = new SupportFilesSetup(suite,
new String[] {
"functionTests/testData/Derby6587/Derby6587_TABLE1_T.csv",
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java Tue Jul 8 13:51:51 2014
@@ -24,22 +24,18 @@ package org.apache.derbyTesting.function
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-
+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.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.SQLUtilities;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Tests for DISTINCT. These tests mostly assume: no indexes, no order by, no grouping
*
@@ -51,7 +47,7 @@ public class DistinctTest extends BaseJD
}
public static Test suite() {
- Test s = new TestSuite(DistinctTest.class);
+ Test s = new BaseTestSuite(DistinctTest.class);
Properties p = new Properties();
p.put("derby.optimizer.noTimeout", "true");
Test t = new SystemPropertyTestSetup(s, p);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java Tue Jul 8 13:51:51 2014
@@ -28,8 +28,8 @@ import java.sql.Types;
import java.util.HashMap;
import java.util.Map;
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.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
@@ -60,10 +60,13 @@ public class DynamicLikeOptimizationTest
}
public static Test suite() {
- TestSuite tests = new TestSuite("DynamicLikeOptimizationTest");
+ BaseTestSuite tests =
+ new BaseTestSuite("DynamicLikeOptimizationTest");
+
tests.addTestSuite(DynamicLikeOptimizationTest.class);
tests.addTest(TestConfiguration.clientServerDecorator(
- new TestSuite(DynamicLikeOptimizationTest.class)));
+ new BaseTestSuite(DynamicLikeOptimizationTest.class)));
+
return new CleanDatabaseTestSetup(tests) {
protected void decorateSQL(Statement stmt) throws SQLException {
stmt.executeUpdate("create table t1(c11 int)");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java Tue Jul 8 13:51:51 2014
@@ -21,18 +21,15 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.LocaleTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Locale;
-
+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.LocaleTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
public final class ErrorCodeTest extends BaseJDBCTestCase {
@@ -46,7 +43,7 @@ public final class ErrorCodeTest extends
public static Test suite()
{
- TestSuite suite = new TestSuite("errorcode Test");
+ BaseTestSuite suite = new BaseTestSuite("errorcode Test");
suite.addTest(TestConfiguration.defaultSuite(ErrorCodeTest.class));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java Tue Jul 8 13:51:51 2014
@@ -28,9 +28,9 @@ import java.sql.Statement;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.Barrier;
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.JDBC;
@@ -46,7 +46,7 @@ public class ErrorMessageTest extends Ba
* embedded driver.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("ErrorMessageTest");
+ BaseTestSuite suite = new BaseTestSuite("ErrorMessageTest");
if (JDBC.vmSupportsJSR169()) {
// Foundation 1.1 doesn't support the regex classes. Return an
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java Tue Jul 8 13:51:51 2014
@@ -21,18 +21,17 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import junit.framework.*;
-
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+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.TestConfiguration;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-
/**
* This test contains a variety of cases of EXISTS predicates with subqueries.
*
@@ -74,7 +73,7 @@ public class ExistsWithSubqueriesTest ex
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("EXISTS with SET operations");
+ BaseTestSuite suite = new BaseTestSuite("EXISTS with SET operations");
/* This is a language/optimization test so behavior will be the
* same for embedded and client/server. Therefore we only need
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java Tue Jul 8 13:51:51 2014
@@ -21,24 +21,22 @@
package org.apache.derbyTesting.functionTests.tests.lang;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.io.IOException;
+import java.sql.Statement;
import java.sql.Types;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
public class ForBitDataTest extends BaseJDBCTestCase {
@@ -883,14 +881,14 @@ public class ForBitDataTest extends Base
* Create a suite of tests.
**/
public static Test suite() {
- TestSuite suite = new TestSuite("ForBitTestData");
+ BaseTestSuite suite = new BaseTestSuite("ForBitTestData");
suite.addTest(baseSuite("ForBitTestData:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ForBitTestData:client")));
return suite;
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(ForBitDataTest.class);
return new CleanDatabaseTestSetup(suite)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java Tue Jul 8 13:51:51 2014
@@ -23,23 +23,17 @@ package org.apache.derbyTesting.function
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Properties;
-
+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.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.SQLUtilities;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Tests for forupdate.
*
@@ -62,14 +56,14 @@ public class ForUpdateTest extends BaseJ
* Create a suite of tests.
**/
public static Test suite() {
- TestSuite suite = new TestSuite("ForUpdateTest");
+ BaseTestSuite suite = new BaseTestSuite("ForUpdateTest");
suite.addTest(baseSuite("ForUpdateTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ForUpdateTest:client")));
return suite;
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(ForUpdateTest.class);
return new CleanDatabaseTestSetup(suite)
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java Tue Jul 8 13:51:51 2014
@@ -25,8 +25,8 @@ 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.SupportFilesSetup;
import static org.apache.derbyTesting.junit.TestConfiguration.clientServerSuite;
@@ -92,7 +92,7 @@ public class ForeignKeysDeferrableTest e
public static Test suite() {
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
suite.addTest(new SupportFilesSetup(
embeddedSuite(ForeignKeysDeferrableTest.class)));
suite.addTest(new SupportFilesSetup(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysNonSpsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysNonSpsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysNonSpsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysNonSpsTest.java Tue Jul 8 13:51:51 2014
@@ -26,12 +26,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Properties;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java Tue Jul 8 13:51:51 2014
@@ -22,12 +22,11 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Decorator;
-public class FullCollationTests extends TestSuite {
+public class FullCollationTests extends BaseTestSuite {
/**
* Return a suite that uses a single use database with
@@ -35,7 +34,8 @@ public class FullCollationTests extends
*/
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite("FullCollationTests:territory=" +"no_NO");
+ BaseTestSuite suite =
+ new BaseTestSuite("FullCollationTests:territory=" +"no_NO");
suite.addTest(new CollationTest("testNorwayCollation"));
suite.addTest(org.apache.derbyTesting.functionTests.tests.lang._Suite.suite());
suite.addTest(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java Tue Jul 8 13:51:51 2014
@@ -21,27 +21,12 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.DriverManager;
-import java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derby.iapi.util.StringUtil;
-import org.apache.derby.catalog.DefaultInfo;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+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.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
-
-import org.apache.derby.catalog.types.RoutineAliasInfo;
/**
* <p>
@@ -94,7 +79,8 @@ public class GeneratedColumnsPermsTest e
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(GeneratedColumnsPermsTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ GeneratedColumnsPermsTest.class);
Test cleanTest = new CleanDatabaseTestSetup( suite );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java Tue Jul 8 13:51:51 2014
@@ -21,21 +21,20 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
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 java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.catalog.DefaultInfo;
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derby.catalog.types.RoutineAliasInfo;
+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.derby.catalog.types.RoutineAliasInfo;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -93,7 +92,9 @@ public class GeneratedColumnsTest extend
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(GeneratedColumnsTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ GeneratedColumnsTest.class);
+
Test cleanDatabaseSuite = new CleanDatabaseTestSetup( suite );
//
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java Tue Jul 8 13:51:51 2014
@@ -28,11 +28,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -65,10 +63,15 @@ public final class GrantRevokeDDLTest ex
public static Test suite()
{
- if (JDBC.vmSupportsJSR169())
- return new TestSuite("GrantRevokeDDLTest"); // return empty suite;
- //test uses triggers and procedures that use DriverManager.
- TestSuite suite = new TestSuite(GrantRevokeDDLTest.class, "GrantRevokeDDL Test");
+ if (JDBC.vmSupportsJSR169()) {
+ // return empty suite;
+ return new BaseTestSuite("GrantRevokeDDLTest");
+ }
+
+ //test uses triggers and procedures that use DriverManager.
+ BaseTestSuite suite = new BaseTestSuite(
+ GrantRevokeDDLTest.class, "GrantRevokeDDL Test");
+
Test test = new SupportFilesSetup(suite);
test = new CleanDatabaseTestSetup(test);
test = DatabasePropertyTestSetup.builtinAuthentication(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java Tue Jul 8 13:51:51 2014
@@ -31,14 +31,13 @@ import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Locale;
-
+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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Test SQL GRANT and REVOKE statements
@@ -59,7 +58,7 @@ public class GrantRevokeTest extends Bas
* statements. Metadata methods test also runs in client/server mode.
*/
public static Test suite() {
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
// following is useful for debugging the lock timeout seen in rollback tests,
// can connect via network server and look at the lock table.
@@ -75,7 +74,7 @@ public class GrantRevokeTest extends Bas
* One set of grant/revoke tests for either client/server or embedded.
*/
public static Test basesuite() {
- Test test = new TestSuite(GrantRevokeTest.class);
+ Test test = new BaseTestSuite(GrantRevokeTest.class);
// DERBY-6238: Dump the contents of the lock table on lock timeout.
// Helps debug intermittent lock timeouts seen in the test.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java Tue Jul 8 13:51:51 2014
@@ -25,12 +25,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.extensions.TestSetup;
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;
public class GroupByExpressionTest extends BaseJDBCTestCase
@@ -618,7 +616,7 @@ public class GroupByExpressionTest exten
public static Test suite()
{
- TestSuite suite = new TestSuite("GROUP BY expression tests");
+ BaseTestSuite suite = new BaseTestSuite("GROUP BY expression tests");
suite.addTestSuite(GroupByExpressionTest.class);
TestSetup wrapper = new CleanDatabaseTestSetup(suite) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java Tue Jul 8 13:51:51 2014
@@ -21,24 +21,20 @@
package org.apache.derbyTesting.functionTests.tests.lang;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.PreparedStatement;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-
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.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
@@ -56,7 +52,7 @@ public class GroupByTest extends BaseJDB
public static Test suite() {
return new CleanDatabaseTestSetup(
- new TestSuite(GroupByTest.class, "GroupByTest")) {
+ new BaseTestSuite(GroupByTest.class, "GroupByTest")) {
protected void decorateSQL(Statement s)
throws SQLException
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java Tue Jul 8 13:51:51 2014
@@ -22,18 +22,14 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.sql.SQLException;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBC;
/**
* <p>
@@ -77,7 +73,7 @@ public class HalfCreatedDatabaseTest ext
public static Test suite()
{
- TestSuite suite = new TestSuite("HalfCreatedDatabaseTest");
+ BaseTestSuite suite = new BaseTestSuite("HalfCreatedDatabaseTest");
suite.addTest( decorateTest() );
@@ -86,7 +82,7 @@ public class HalfCreatedDatabaseTest ext
private static Test decorateTest()
{
- Test test = new TestSuite( HalfCreatedDatabaseTest.class );
+ Test test = new BaseTestSuite( HalfCreatedDatabaseTest.class );
test = TestConfiguration.singleUseDatabaseDecorator( test, DB_NAME );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java Tue Jul 8 13:51:51 2014
@@ -18,19 +18,18 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.PreparedStatement;
import java.sql.CallableStatement;
-import java.sql.ResultSet;
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 java.sql.DriverManager;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -47,7 +46,7 @@ public class HoldCursorTest extends Base
* Create a suite of tests.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("HoldCursorTest");
+ BaseTestSuite suite = new BaseTestSuite("HoldCursorTest");
suite.addTest(baseSuite(true));
suite.addTest(baseSuite(false));
@@ -57,7 +56,7 @@ public class HoldCursorTest extends Base
private static Test baseSuite(boolean embeddedMode) {
String name = "HoldCursorTest:" + (embeddedMode ? "embedded" : "client");
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
// Add tests that every JVM jdk1.4 or above should be able to run.
suite.addTestSuite(HoldCursorTest.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java Tue Jul 8 13:51:51 2014
@@ -24,19 +24,10 @@ package org.apache.derbyTesting.function
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.Decorator;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
+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;
/**
* Test for identity columns backed by sequence generators.
@@ -85,7 +76,7 @@ public class IdentitySequenceTest extend
*/
public static Test suite()
{
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
Test cleanTest = new CleanDatabaseTestSetup
(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java Tue Jul 8 13:51:51 2014
@@ -24,9 +24,8 @@ package org.apache.derbyTesting.function
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.sql.Types;
import java.util.ArrayList;
import java.util.BitSet;
@@ -37,16 +36,14 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.JDBC;
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.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.SQLUtilities;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
/**
* Test to verify that Derby will perform "multi-probing" of an index
@@ -175,7 +172,7 @@ public class InListMultiProbeTest extend
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("IN-list MultiProbe Suite");
+ BaseTestSuite suite = new BaseTestSuite("IN-list MultiProbe Suite");
/* This is a language/optimization test so behavior will be the
* same for embedded and client/server. Therefore we only need
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java Tue Jul 8 13:51:51 2014
@@ -20,22 +20,20 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-
-
+import java.sql.Statement;
import java.sql.Timestamp;
import java.sql.Types;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.JDBC;
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.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -51,7 +49,7 @@ public final class InbetweenTest extends
public static Test suite()
{
- TestSuite suite = new TestSuite("InbetweenTest Test");
+ BaseTestSuite suite = new BaseTestSuite("InbetweenTest Test");
suite.addTest(DatabasePropertyTestSetup.singleProperty(
TestConfiguration.defaultSuite(InbetweenTest.class),
"derby.language.statementCacheSize", "0",true));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java Tue Jul 8 13:51:51 2014
@@ -21,9 +21,9 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.functionTests.util.HarnessJavaTest;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Run a lang '.java' test from the old harness in the Junit infrastructure.
@@ -106,7 +106,9 @@ public class LangHarnessJavaTest extends
public static Test suite()
{
- TestSuite suite = new TestSuite("jdbcapi: old harness java tests");
+ BaseTestSuite suite =
+ new BaseTestSuite("jdbcapi: old harness java tests");
+
suite.addTest(baseSuite("embedded", LANG_TESTS_BOTH));
suite.addTest(baseSuite("embedded", LANG_TESTS_EMEBDDED));
@@ -116,7 +118,7 @@ public class LangHarnessJavaTest extends
}
private static Test baseSuite(String which, String[] set) {
- TestSuite suite = new TestSuite("lang: " + which);
+ BaseTestSuite suite = new BaseTestSuite("lang: " + which);
for (int i = 0; i < set.length; i++)
{
suite.addTest(decorate(new LangHarnessJavaTest(set[i])));