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 [3/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/jdbc4/LobSortTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java Tue Jul 8 13:51:51 2014
@@ -28,14 +28,12 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
import java.util.Random;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.streams.CharAlphabet;
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.SystemPropertyTestSetup;
@@ -200,7 +198,7 @@ public class LobSortTest
Properties props = new Properties();
// Adjust sort buffer size to trigger the bug situation with less data.
props.setProperty("derby.storage.sortBufferMax", "4");
- TestSuite suite = new TestSuite(LobSortTest.class,
+ BaseTestSuite suite = new BaseTestSuite(LobSortTest.class,
"LobSortTestEmbedded");
return new CleanDatabaseTestSetup(
new SystemPropertyTestSetup(suite, props, true)) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java Tue Jul 8 13:51:51 2014
@@ -23,14 +23,13 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
import java.io.IOException;
-import junit.framework.*;
-
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.File;
import java.sql.Blob;
import java.sql.Connection;
+import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -433,9 +432,11 @@ public class LobStreamTest extends BaseJ
public static Test suite() {
//testing only embedded driver generic test suite testing both
//client and ebedded is present in jdbcapi/LobStreamsTest
- TestSuite ts = new TestSuite ("LobStreamTest");
+ BaseTestSuite ts = new BaseTestSuite("LobStreamTest");
ts.addTest(TestConfiguration.embeddedSuite(LobStreamTest.class));
- TestSuite encSuite = new TestSuite ("LobStreamsTest:encrypted");
+
+ BaseTestSuite encSuite =
+ new BaseTestSuite("LobStreamsTest:encrypted");
encSuite.addTestSuite (LobStreamTest.class);
ts.addTest(Decorator.encryptedDatabase (encSuite));
return ts;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java Tue Jul 8 13:51:51 2014
@@ -27,24 +27,22 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.SQLTimeoutException;
import java.util.Properties;
-import javax.sql.DataSource;
import javax.sql.CommonDataSource;
import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
import javax.sql.XADataSource;
-
-import junit.framework.*;
-
+import junit.framework.Test;
import org.apache.derby.authentication.UserAuthenticator;
-
-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.Derby;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBCClient;
import org.apache.derbyTesting.junit.JDBCClientSetup;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -213,15 +211,17 @@ public class LoginTimeoutTest extends Ba
*/
public static Test suite()
{
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
+
+ Test embedded = new BaseTestSuite(
+ LoginTimeoutTest.class, "embedded LoginTimeoutTest" );
- Test embedded = new TestSuite( LoginTimeoutTest.class, "embedded LoginTimeoutTest" );
embedded = TestConfiguration.singleUseDatabaseDecorator( embedded );
embedded = new SystemPropertyTestSetup( embedded, systemProperties() );
suite.addTest( embedded );
if (Derby.hasServer() && Derby.hasClient()) {
- Test clientServer = new TestSuite(
+ Test clientServer = new BaseTestSuite(
LoginTimeoutTest.class, "client/server LoginTimeoutTest");
clientServer =
TestConfiguration.singleUseDatabaseDecorator(clientServer);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java Tue Jul 8 13:51:51 2014
@@ -21,20 +21,35 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import junit.framework.*;
-
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLXML;
+import java.sql.Statement;
+import java.sql.Types;
+import junit.framework.Test;
+import org.apache.derby.iapi.services.io.DerbyIOException;
+import org.apache.derby.shared.common.sanity.SanityManager;
+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.functionTests.util.streams.LoopingAlphabetStream;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.io.*;
-import java.sql.*;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.DerbyIOException;
-
/**
* This class is used to test JDBC4 specific methods in the PreparedStatement(s)
* object.
@@ -162,7 +177,9 @@ public class PreparedStatementTest exten
}
public static Test suite() {
- TestSuite suite = new TestSuite("PreparedStatementTest suite");
+ BaseTestSuite suite =
+ new BaseTestSuite("PreparedStatementTest suite");
+
suite.addTest(baseSuite("PreparedStatementTest:embedded"));
suite.addTest(
TestConfiguration.connectionXADecorator(
@@ -188,7 +205,7 @@ public class PreparedStatementTest exten
}
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(PreparedStatementTest.class);
return new CleanDatabaseTestSetup(suite) {
@@ -208,7 +225,9 @@ public class PreparedStatementTest exten
* Returns a suite for tests that need JDBC statement caching to be enabled.
*/
private static Test statementCachingSuite() {
- TestSuite suite = new TestSuite("JDBC statement caching suite");
+ BaseTestSuite suite =
+ new BaseTestSuite("JDBC statement caching suite");
+
suite.addTest(new PreparedStatementTest("cpTestIsPoolableHintFalse"));
suite.addTest(new PreparedStatementTest("cpTestIsPoolableHintTrue"));
return TestConfiguration.connectionCPDecorator(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java Tue Jul 8 13:51:51 2014
@@ -35,16 +35,14 @@ import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
-
-import junit.framework.*;
-
+import junit.framework.Test;
import org.apache.derby.iapi.types.HarmonySerialBlob;
import org.apache.derby.iapi.types.HarmonySerialClob;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.functionTests.tests.lang.Price;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests for new methods added for PreparedStatement in JDBC 4.2.
@@ -181,7 +179,7 @@ public class PreparedStatementTest42 ext
public static Test suite()
{
- TestSuite suite = new TestSuite("PreparedStatementTest42");
+ BaseTestSuite suite = new BaseTestSuite("PreparedStatementTest42");
suite.addTest( TestConfiguration.defaultSuite( PreparedStatementTest42.class ) );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java Tue Jul 8 13:51:51 2014
@@ -21,34 +21,32 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.NClob;
import java.sql.PreparedStatement;
-import java.sql.CallableStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.NClob;
-import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.Reader;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.HashMap;
+import junit.framework.Test;
import org.apache.derby.iapi.types.HarmonySerialBlob;
import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -1746,7 +1744,7 @@ public class ResultSetTest extends Wrap
************************************************************************/
public static Test suite() {
- TestSuite rsSuite = new TestSuite("ResultSetTest suite");
+ BaseTestSuite rsSuite = new BaseTestSuite("ResultSetTest suite");
rsSuite.addTest(decorateTestSuite(TestConfiguration.defaultSuite
(ResultSetTest.class,false)));
return rsSuite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java Tue Jul 8 13:51:51 2014
@@ -19,15 +19,13 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Types;
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;
/**
@@ -169,12 +167,18 @@ public class SetObjectUnsupportedTest ex
* Create a suite with all tests.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("SetObjectUnsupportedTest suite");
+ BaseTestSuite suite =
+ new BaseTestSuite("SetObjectUnsupportedTest suite");
+
suite.addTest(baseSuite(false, "SetObjectUnsupportedTest:prepared"));
suite.addTest(baseSuite(true, "SetObjectUnsupportedTest:callable"));
- TestSuite client = new TestSuite("SetObjectUnsupportedTest:client");
+
+ BaseTestSuite client =
+ new BaseTestSuite("SetObjectUnsupportedTest:client");
+
client.addTest(baseSuite(false, "SetObjectUnsupportedTest:prepared"));
client.addTest(baseSuite(true, "SetObjectUnsupportedTest:callable"));
+
suite.addTest(TestConfiguration.clientServerDecorator(client));
return suite;
}
@@ -189,7 +193,7 @@ public class SetObjectUnsupportedTest ex
* @return a test suite
*/
static Test baseSuite(boolean callable, String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
for (TypeInfo typeInfo : TYPES) {
suite.addTest(new SetObjectUnsupportedTest
("testUnsupportedSetObject", typeInfo, callable));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java Tue Jul 8 13:51:51 2014
@@ -21,17 +21,24 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
+import java.sql.Statement;
import java.util.Arrays;
-import javax.sql.*;
-import junit.framework.*;
-
+import java.util.Enumeration;
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.PooledConnection;
+import javax.sql.StatementEvent;
+import javax.sql.StatementEventListener;
+import javax.sql.XADataSource;
+import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.util.Enumeration;
-
/*
This class is used to test the JDBC4 statement event
support
@@ -164,7 +171,7 @@ public class StatementEventsTest extends
* @return a test suite
*/
private static Test baseSuite(String name) {
- TestSuite suites = new TestSuite(name);
+ BaseTestSuite suites = new BaseTestSuite(name);
boolean[] truefalse = new boolean[] { true, false };
for (boolean xa : truefalse) {
for (boolean callable : truefalse) {
@@ -176,7 +183,7 @@ public class StatementEventsTest extends
/** Create a test suite with all tests in the class. */
public static Test suite() {
- TestSuite suite = new TestSuite("StatementEventsTest suite");
+ BaseTestSuite suite = new BaseTestSuite("StatementEventsTest suite");
suite.addTest(baseSuite("StatementEventsTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("StatementEventsTest:client")));
@@ -187,12 +194,14 @@ public class StatementEventsTest extends
* Test suite class which contains all test cases in
* <code>StatementEventsTest</code> for a given configuration.
*/
- private static class Suite extends TestSuite {
+ private static class Suite extends BaseTestSuite {
private Suite(boolean xa, boolean callable) {
super(StatementEventsTest.class);
- for (Enumeration e = tests(); e.hasMoreElements(); ) {
+
+ // Iterate over the sorted fixtures and tinker with them
+ for (Enumeration<?> i = tests(); i.hasMoreElements(); ) {
StatementEventsTest test =
- (StatementEventsTest) e.nextElement();
+ (StatementEventsTest) i.nextElement();
test.setXA(xa);
test.setCallable(callable);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java Tue Jul 8 13:51:51 2014
@@ -20,25 +20,28 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.vti.VTITemplate;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLTimeoutException;
+import java.sql.Statement;
+import junit.framework.Test;
+import org.apache.derby.client.am.ClientStatement;
import org.apache.derby.impl.jdbc.EmbedResultSet;
import org.apache.derby.impl.sql.execute.RowUtil;
-
+import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.BatchUpdateTest;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.SetQueryTimeoutTest;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.Wrapper41Statement;
import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.*;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.*;
-import org.apache.derby.client.am.ClientStatement;
-
/**
* Tests for new methods added for Statement in JDBC4.
*/
@@ -598,12 +601,12 @@ public class StatementTest
* Create test suite for StatementTest.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("StatementTest suite");
+ BaseTestSuite suite = new BaseTestSuite("StatementTest suite");
// Decorate test suite with a TestSetup class.
suite.addTest(new StatementTestSetup(
- new TestSuite(StatementTest.class)));
+ new BaseTestSuite(StatementTest.class)));
suite.addTest(TestConfiguration.clientServerDecorator(
- new StatementTestSetup(new TestSuite(StatementTest.class))));
+ new StatementTestSetup(new BaseTestSuite(StatementTest.class))));
return suite;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java Tue Jul 8 13:51:51 2014
@@ -27,12 +27,10 @@ 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.functionTests.util.SQLStateConstants;
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;
@@ -81,7 +79,7 @@ public class TestDbMetaData extends Base
}
private static Test baseSuite(String name) {
- TestSuite testSuite = new TestSuite(name);
+ BaseTestSuite testSuite = new BaseTestSuite(name);
testSuite.addTestSuite(TestDbMetaData.class);
return new CleanDatabaseTestSetup(testSuite) {
protected void decorateSQL(Statement s) throws SQLException {
@@ -91,7 +89,7 @@ public class TestDbMetaData extends Base
}
public static Test suite() {
- TestSuite suite = new TestSuite("TestDbMetaData suite");
+ BaseTestSuite suite = new BaseTestSuite("TestDbMetaData suite");
suite.addTest(baseSuite("TestDbMetaData:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("TestDbMetaData:client")));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java Tue Jul 8 13:51:51 2014
@@ -20,20 +20,33 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import java.sql.*;
-import javax.sql.*;
-
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Savepoint;
+import java.sql.Statement;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
+import javax.sql.PooledConnection;
+import javax.sql.XAConnection;
+import javax.sql.XADataSource;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.TestUtil;
import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.J2EEDataSource;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java Tue Jul 8 13:51:51 2014
@@ -23,13 +23,11 @@ package org.apache.derbyTesting.function
import java.lang.reflect.Method;
import java.sql.SQLException;
-
+import junit.framework.Test;
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;
-
/**
* Suite to run all JUnit tests in this package:
* org.apache.derbyTesting.functionTests.tests.jdbc4
@@ -46,7 +44,7 @@ public class _Suite extends BaseTestCase
public static Test suite() throws SQLException {
- TestSuite suite = new TestSuite("jdbc4");
+ BaseTestSuite suite = new BaseTestSuite("jdbc4");
// These really need to run standalone.
//suite.addTestSuite(AutoloadBooting.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java Tue Jul 8 13:51:51 2014
@@ -30,17 +30,13 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import java.util.HashSet;
import java.util.Locale;
import java.util.Properties;
-
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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -87,7 +83,7 @@ public class AuthenticationTest extends
}
public static Test suite() {
- TestSuite suite = new TestSuite("AuthenticationTest");
+ BaseTestSuite suite = new BaseTestSuite("AuthenticationTest");
suite.addTest(baseSuite("AuthenticationTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("AuthenticationTest:client")));
@@ -95,7 +91,7 @@ public class AuthenticationTest extends
}
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite("AuthenticationTest");
+ BaseTestSuite suite = new BaseTestSuite("AuthenticationTest");
Test test = new AuthenticationTest(
"testConnectShutdownAuthentication");
@@ -154,13 +150,13 @@ public class AuthenticationTest extends
return TestConfiguration.singleUseDatabaseDecorator(suite);
}
- protected static void setBaseProps(TestSuite suite, Test test)
+ protected static void setBaseProps(BaseTestSuite suite, Test test)
{
setBaseProps(suite, test, null);
}
private static void setBaseProps(
- TestSuite suite, Test test, Properties extraDbProps)
+ BaseTestSuite suite, Test test, Properties extraDbProps)
{
// Use DatabasePropertyTestSetup.builtinAuthentication decorator
// to set the user properties required by this test (and shutdown
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java Tue Jul 8 13:51:51 2014
@@ -25,18 +25,16 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
import java.sql.Savepoint;
import java.sql.Statement;
-import java.sql.SQLException;
-
+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 junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Tests the JDBC 3.0 ability to establish a result set of auto-generated keys.
* <p>
@@ -96,7 +94,7 @@ public class AutoGenJDBC30Test extends B
* Implements suite() to run in embedded and client configurations.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("AutoGenJDBC30Test");
+ BaseTestSuite suite = new BaseTestSuite("AutoGenJDBC30Test");
suite.addTest(baseSuite("AutoGenJDBC30Test:embedded"));
@@ -113,7 +111,7 @@ public class AutoGenJDBC30Test extends B
*/
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
if (!JDBC.vmSupportsJDBC3()) {
// empty suite
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java Tue Jul 8 13:51:51 2014
@@ -22,21 +22,18 @@
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
import java.net.InetAddress;
-import java.sql.Driver;
import java.sql.Connection;
+import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-
-import javax.sql.DataSource;
import java.util.Enumeration;
-
+import javax.sql.DataSource;
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.drda.NetworkServerControl;
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.JDBCDataSource;
@@ -90,7 +87,7 @@ public class AutoloadTest extends BaseJD
*/
public static Test suite() {
if (!JDBC.vmSupportsJDBC3())
- return new TestSuite("empty: no java.sql.DriverManager");
+ return new BaseTestSuite("empty: no java.sql.DriverManager");
boolean embeddedAutoLoad = false;
@@ -132,7 +129,7 @@ public class AutoloadTest extends BaseJD
if (jdbc4Autoload || embeddedAutoLoad || clientAutoLoad)
{
- TestSuite suite = new TestSuite("AutoloadTest");
+ BaseTestSuite suite = new BaseTestSuite("AutoloadTest");
if (jdbc4Autoload && !embeddedAutoLoad)
{
@@ -164,7 +161,8 @@ public class AutoloadTest extends BaseJD
// Run a single test that ensures that the driver is
// not loaded implicitly by some other means.
- TestSuite suite = new TestSuite("AutoloadTest: no autoloading expected");
+ BaseTestSuite suite =
+ new BaseTestSuite("AutoloadTest: no autoloading expected");
suite.addTest(SecurityManagerSetup.noSecurityManager(new AutoloadTest("testEmbeddedNotStarted")));
suite.addTest(new AutoloadTest("noloadTestNodriverLoaded"));
@@ -179,7 +177,7 @@ public class AutoloadTest extends BaseJD
*/
private static Test baseAutoLoadSuite(String which)
{
- TestSuite suite = new TestSuite("AutoloadTest: " + which);
+ BaseTestSuite suite = new BaseTestSuite("AutoloadTest: " + which);
suite.addTest(new AutoloadTest("testRegisteredDriver"));
if ("embedded".equals(which))
@@ -227,7 +225,7 @@ public class AutoloadTest extends BaseJD
* </ul>
*/
static Test fullAutoloadSuite() {
- TestSuite suite = new TestSuite("AutoloadTest:All");
+ BaseTestSuite suite = new BaseTestSuite("AutoloadTest:All");
suite.addTest(new AutoloadTest(AutoloadTest.class));
suite.addTest(new AutoloadTest(JDBCDriversEmbeddedTest.class));
suite.addTest(new AutoloadTest(JDBCDriversClientTest.class));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java Tue Jul 8 13:51:51 2014
@@ -27,7 +27,7 @@ import org.apache.derbyTesting.junit.JDB
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
@@ -798,7 +798,8 @@ final public class BLOBTest extends Base
*/
public static Test suite()
{
- TestSuite mainSuite = new TestSuite(BLOBTest.class, "BLOBTest");
+ BaseTestSuite mainSuite =
+ new BaseTestSuite(BLOBTest.class, "BLOBTest");
return new BLOBDataModelSetup(mainSuite);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java Tue Jul 8 13:51:51 2014
@@ -38,11 +38,9 @@ import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.Arrays;
-
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;
@@ -158,7 +156,7 @@ public class BatchUpdateTest extends Bas
}
public static Test suite() {
- TestSuite suite = new TestSuite("BatchUpdateTest");
+ BaseTestSuite suite = new BaseTestSuite("BatchUpdateTest");
suite.addTest(baseSuite("BatchUpdateTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("BatchUpdateTest:client")));
@@ -173,13 +171,13 @@ public class BatchUpdateTest extends Bas
*/
public static Test embeddedSuite() {
- TestSuite suite = new TestSuite("BatchUpdateTest");
+ BaseTestSuite suite = new BaseTestSuite("BatchUpdateTest");
suite.addTest(baseSuite("BatchUpdateTest:embedded"));
return suite;
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(BatchUpdateTest.class);
return new CleanDatabaseTestSetup(
DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4))
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java Tue Jul 8 13:51:51 2014
@@ -26,26 +26,32 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
+import java.sql.Blob;
+import java.sql.Clob;
+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.sql.Types;
import java.util.Arrays;
import java.util.Random;
import java.util.zip.CRC32;
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.util.Formatters;
-
+import org.apache.derbyTesting.functionTests.util.streams.ByteAlphabet;
import org.apache.derbyTesting.functionTests.util.streams.CharAlphabet;
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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.Utilities;
-
-import junit.framework.*;
-import java.sql.*;
-
-import org.apache.derbyTesting.functionTests.util.streams.ByteAlphabet;
import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.Utilities;
/**
* Test of JDBC blob and clob
@@ -3162,7 +3168,7 @@ public class BlobClob4BlobTest extends B
}
public static Test suite() {
- TestSuite suite = new TestSuite("BlobClob4BlobTest");
+ BaseTestSuite suite = new BaseTestSuite("BlobClob4BlobTest");
suite.addTest(baseSuite("embedded"));
suite.addTest(
TestConfiguration.clientServerDecorator(baseSuite("client")));
@@ -3178,7 +3184,7 @@ public class BlobClob4BlobTest extends B
}
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(
+ BaseTestSuite suite = new BaseTestSuite(
BlobClob4BlobTest.class, "BlobClob4BlobTest:" + name);
return new CleanDatabaseTestSetup(
DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java Tue Jul 8 13:51:51 2014
@@ -21,17 +21,11 @@
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
import java.io.UnsupportedEncodingException;
-import java.sql.Blob;
import java.sql.CallableStatement;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -62,7 +56,8 @@ public class BlobStoredProcedureTest ext
*/
public static Test suite() {
if (JDBC.vmSupportsJSR169()) {
- return new TestSuite("empty: client not supported on JSR169; procs use DriverMgr");
+ return new BaseTestSuite(
+ "empty: client not supported on JSR169; procs use DriverMgr");
}
else {
return TestConfiguration.defaultSuite(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java Tue Jul 8 13:51:51 2014
@@ -27,15 +27,15 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
-import java.sql.ResultSet;
import java.util.Arrays;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.client.am.ClientConnection;
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;
@@ -107,15 +107,15 @@ public class CacheSessionDataTest extend
/**
* Adds both the embedded and client-server versions of the baseSuite to
- * the Test. An empty TestSuite is returned unless we have JDBC3 support, because
- * all test cases call verifyCachedIsolation() which in turn
- * makes use of getTransactionIsolationJDBC()
- * (GET_TRANSACTION_ISOLATION_JDBC) which uses DriverManager to access the
- * default connection.
+ * the Test. An empty BaseTestSuite is returned unless we have JDBC3
+ support, because all test cases call verifyCachedIsolation() which in
+ turn makes use of getTransactionIsolationJDBC()
+ (GET_TRANSACTION_ISOLATION_JDBC) which uses DriverManager to access the
+ default connection.
* @return the resulting Test object
*/
public static Test suite() {
- TestSuite suite = new TestSuite("CacheSessionDataTest");
+ BaseTestSuite suite = new BaseTestSuite("CacheSessionDataTest");
if (JDBC.vmSupportsJDBC3()) {
suite.addTest(baseSuite("CacheSessionDataTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
@@ -125,13 +125,13 @@ public class CacheSessionDataTest extend
}
/**
- * Creates a new TestSuite with all the tests, and wraps it in a
- * CleanDatabaseSetup with a custom decorator.
- * @param name TestSuite name
+ * Creates a new BaseTestSuite with all the tests, and wraps it in a
+ CleanDatabaseSetup with a custom decorator.
+ * @param name BaseTestSuite name
* @return wrapped TestSuite
*/
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(CacheSessionDataTest.class);
return new CleanDatabaseTestSetup(suite) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java Tue Jul 8 13:51:51 2014
@@ -28,36 +28,31 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.MalformedURLException;
import java.net.URL;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-
-import java.util.Arrays; // Used by testUpdateLongBinaryProc
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-
import java.sql.BatchUpdateException;
import java.sql.CallableStatement;
import java.sql.Connection;
+import java.sql.Date; // Used by testUpdateLongBinaryProc
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
import java.sql.Types;
-
-
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+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 junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test the CallableStatement interface.
* <p>
@@ -175,7 +170,7 @@ public class CallableTest extends BaseJD
}
public static Test suite() {
- TestSuite suite = new TestSuite("CallableTest");
+ BaseTestSuite suite = new BaseTestSuite("CallableTest");
suite.addTest(baseSuite("CallableTest:embedded"));
@@ -198,7 +193,7 @@ public class CallableTest extends BaseJD
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
// Add tests that every JVM should be able to run.
suite.addTestSuite(CallableTest.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java Tue Jul 8 13:51:51 2014
@@ -21,16 +21,10 @@ package org.apache.derbyTesting.function
import java.sql.CallableStatement;
-import java.sql.Clob;
-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 junit.framework.Assert;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -56,7 +50,8 @@ public class ClobStoredProcedureTest ext
*/
public static Test suite() {
if (JDBC.vmSupportsJSR169()) {
- return new TestSuite("empty: client not supported on JSR169; procs use DriverMgr");
+ return new BaseTestSuite(
+ "empty: client not supported on JSR169; procs use DriverMgr");
}
else {
return TestConfiguration.defaultSuite(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java Tue Jul 8 13:51:51 2014
@@ -20,26 +20,23 @@
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
import java.sql.Clob;
-import java.sql.Connection;
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.streams.LoopingAlphabetReader;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
/**
* Test class to test <code>UpdateableReader</code> for <code>Clob</code> in
* embedded driver.
@@ -288,10 +285,11 @@ public class ClobUpdatableReaderTest ext
}
public static Test suite() {
- TestSuite ts = new TestSuite ("ClobUpdatableReaderTest");
+ BaseTestSuite ts = new BaseTestSuite("ClobUpdatableReaderTest");
ts.addTest(TestConfiguration.defaultSuite(
ClobUpdatableReaderTest.class));
- TestSuite encSuite = new TestSuite ("ClobUpdatableReaderTest:encrypted");
+ BaseTestSuite encSuite =
+ new BaseTestSuite("ClobUpdatableReaderTest:encrypted");
encSuite.addTestSuite (ClobUpdatableReaderTest.class);
ts.addTest(Decorator.encryptedDatabase (encSuite));
return ts;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java Tue Jul 8 13:51:51 2014
@@ -39,8 +39,8 @@ import javax.sql.XAConnection;
import javax.sql.XADataSource;
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.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -163,7 +163,7 @@ public class ClosedObjectTest extends Ba
/** Creates a suite with all tests in the class. */
public static Test suite() {
- TestSuite suite = new TestSuite("ClosedObjectTest suite");
+ BaseTestSuite suite = new BaseTestSuite("ClosedObjectTest suite");
suite.addTest(baseSuite(false));
suite.addTest(baseSuite(true));
return suite;
@@ -179,10 +179,12 @@ public class ClosedObjectTest extends Ba
* @exception Exception if an error occurs while building the test suite
*/
private static Test baseSuite(boolean network) {
- TestSuite topSuite = new TestSuite(
+ BaseTestSuite topSuite = new BaseTestSuite(
"ClosedObjectTest:" + (network ? "client" : "embedded"));
- TestSuite dsSuite = new TestSuite("ClosedObjectTest DataSource");
+ BaseTestSuite dsSuite = new BaseTestSuite(
+ "ClosedObjectTest DataSource");
+
DataSourceDecorator dsDecorator = new DataSourceDecorator(dsSuite);
topSuite.addTest(dsDecorator);
fillDataSourceSuite(dsSuite, dsDecorator);
@@ -201,7 +203,7 @@ public class ClosedObjectTest extends Ba
"maxStatements", Integer.valueOf(5))));
}
- TestSuite xaSuite = new TestSuite("ClosedObjectTest XA");
+ BaseTestSuite xaSuite = new BaseTestSuite("ClosedObjectTest XA");
XADataSourceDecorator xaDecorator = new XADataSourceDecorator(xaSuite);
topSuite.addTest(xaDecorator);
fillDataSourceSuite(xaSuite, xaDecorator);
@@ -220,7 +222,7 @@ public class ClosedObjectTest extends Ba
* @return a suite
*/
private static Test poolSuite(Map dsProps) {
- TestSuite poolSuite = new TestSuite(
+ BaseTestSuite poolSuite = new BaseTestSuite(
"ClosedObjectTest ConnectionPoolDataSource");
PoolDataSourceDecorator poolDecorator =
new PoolDataSourceDecorator(poolSuite, dsProps);
@@ -238,34 +240,34 @@ public class ClosedObjectTest extends Ba
* @param suite the test suite to fill
* @param dsDecorator the decorator for the test suite
*/
- private static void fillDataSourceSuite(TestSuite suite,
+ private static void fillDataSourceSuite(BaseTestSuite suite,
DataSourceDecorator dsDecorator)
{
- TestSuite rsSuite = new TestSuite("Closed ResultSet");
+ BaseTestSuite rsSuite = new BaseTestSuite("Closed ResultSet");
ResultSetObjectDecorator rsDecorator =
new ResultSetObjectDecorator(rsSuite, dsDecorator);
suite.addTest(rsDecorator);
fillObjectSuite(rsSuite, rsDecorator, ResultSet.class);
- TestSuite stmtSuite = new TestSuite("Closed Statement");
+ BaseTestSuite stmtSuite = new BaseTestSuite("Closed Statement");
StatementObjectDecorator stmtDecorator =
new StatementObjectDecorator(stmtSuite, dsDecorator);
suite.addTest(stmtDecorator);
fillObjectSuite(stmtSuite, stmtDecorator, Statement.class);
- TestSuite psSuite = new TestSuite("Closed PreparedStatement");
+ BaseTestSuite psSuite = new BaseTestSuite("Closed PreparedStatement");
PreparedStatementObjectDecorator psDecorator =
new PreparedStatementObjectDecorator(psSuite, dsDecorator);
suite.addTest(psDecorator);
fillObjectSuite(psSuite, psDecorator, PreparedStatement.class);
- TestSuite csSuite = new TestSuite("Closed CallableStatement");
+ BaseTestSuite csSuite = new BaseTestSuite("Closed CallableStatement");
CallableStatementObjectDecorator csDecorator =
new CallableStatementObjectDecorator(csSuite, dsDecorator);
suite.addTest(csDecorator);
fillObjectSuite(csSuite, csDecorator, CallableStatement.class);
- TestSuite connSuite = new TestSuite("Closed Connection");
+ BaseTestSuite connSuite = new BaseTestSuite("Closed Connection");
ConnectionObjectDecorator connDecorator =
new ConnectionObjectDecorator(connSuite, dsDecorator);
suite.addTest(connDecorator);
@@ -280,7 +282,7 @@ public class ClosedObjectTest extends Ba
* closed object to test the method on)
* @param iface the interface which contains the methods to test
*/
- private static void fillObjectSuite(TestSuite suite,
+ private static void fillObjectSuite(BaseTestSuite suite,
ObjectDecorator decorator,
Class iface)
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java Tue Jul 8 13:51:51 2014
@@ -19,8 +19,8 @@
*/
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
-import junit.framework.*;
-
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -56,7 +56,7 @@ public class Compat_BlobClob4BlobTest ex
*
*/
public static Test suite() {
- TestSuite suite = new TestSuite("Compat_BlobClob4BlobTest");
+ BaseTestSuite suite = new BaseTestSuite("Compat_BlobClob4BlobTest");
/* Embedded is not relevant for a running server....
suite.addTest(
TestConfiguration.embeddedSuite(BlobClob4BlobTest.class)); */
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java Tue Jul 8 13:51:51 2014
@@ -23,11 +23,8 @@ 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.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -851,7 +848,7 @@ public class ConcurrencyTest extends SUR
*/
public static Test suite()
{
- final TestSuite suite = new TestSuite("ConcurrencyTest");
+ final BaseTestSuite suite = new BaseTestSuite("ConcurrencyTest");
suite.addTest(baseSuite("ConcurrencyTest:embedded", true));
suite.addTest(
@@ -864,7 +861,7 @@ public class ConcurrencyTest extends SUR
}
private static Test baseSuite(String name, boolean embedded) {
- final TestSuite suite = new TestSuite(name);
+ final BaseTestSuite suite = new BaseTestSuite(name);
// This testcase does not require JDBC3/JSR169, since it does not
// specify result set concurrency) in Connection.createStatement().
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java Tue Jul 8 13:51:51 2014
@@ -25,11 +25,9 @@ import java.sql.DatabaseMetaData;
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;
@@ -88,10 +86,10 @@ public class DMDBugsTest extends BaseJDB
/* Default suite for running this test.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("DMDBugsTest");
+ BaseTestSuite suite = new BaseTestSuite("DMDBugsTest");
suite.addTest(
TestConfiguration.defaultSuite(DMDBugsTest.class));
return suite;
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java Tue Jul 8 13:51:51 2014
@@ -21,15 +21,12 @@ package org.apache.derbyTesting.function
import java.lang.reflect.Method;
import java.sql.SQLException;
-
import javax.sql.DataSource;
-
import junit.extensions.TestSetup;
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.JDBCDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -56,7 +53,7 @@ public class DSCreateShutdownDBTest exte
public static Test suite()
{
- TestSuite suite = new TestSuite("DSCreateShutdownDBTest");
+ BaseTestSuite suite = new BaseTestSuite("DSCreateShutdownDBTest");
Test test = TestConfiguration.defaultSuite(DSCreateShutdownDBTest.class);
//Test test = TestConfiguration.clientServerSuite(DSCreateShutdownDBTest.class);
suite.addTest(test);
@@ -387,4 +384,4 @@ public class DSCreateShutdownDBTest exte
JDBCDataSource.clearStringBeanProperty(ds, "ConnectionAttributes");
JDBCDataSource.clearStringBeanProperty(ds, setter);
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java Tue Jul 8 13:51:51 2014
@@ -28,9 +28,8 @@ import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
import junit.framework.Test;
-import junit.framework.TestSuite;
-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.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBC;
@@ -57,7 +56,7 @@ public class DataSourcePropertiesTest ex
public static Test suite() {
- TestSuite suite = new TestSuite("DataSourcePropertiesTest");
+ BaseTestSuite suite = new BaseTestSuite("DataSourcePropertiesTest");
// TODO: Run fixtures in J2ME and JDBC2 (with extensions)
// that can be supported there. This disabling matches
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java Tue Jul 8 13:51:51 2014
@@ -29,15 +29,12 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Properties;
-
import javax.naming.Reference;
import javax.naming.Referenceable;
import javax.naming.spi.ObjectFactory;
-
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.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -145,7 +142,7 @@ public class DataSourceReferenceTest
Test suite;
if (JDBC.vmSupportsJSR169() || !JDBC.vmSupportsJNDI()) {
// Referenceable is not supported with JSR169 or without JNDI
- suite = new TestSuite(
+ suite = new BaseTestSuite(
"DatasourceReferenceTest cannot run with JSR169");
} else {
suite = TestConfiguration.defaultSuite(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java Tue Jul 8 13:51:51 2014
@@ -32,8 +32,8 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
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.Derby;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -331,7 +331,9 @@ public class DataSourceSerializationTest
* @return A test suite.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("DataSourceSerializationTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("DataSourceSerializationTest");
+
String filePrefix = "functionTests/testData/serializedDataSources/";
// De-serialize embedded data sources only if we have the engine code.
if (Derby.hasEmbedded()) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java Tue Jul 8 13:51:51 2014
@@ -30,7 +30,7 @@ import java.sql.Statement;
import java.util.Hashtable;
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derby.jdbc.ClientDataSourceInterface;
import org.apache.derby.jdbc.BasicEmbeddedDataSource40;
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
@@ -96,7 +96,9 @@ public class DataSourceTest extends Base
* @return A suite of tests to be run with client and/or embedded
*/
private static Test baseSuite(String postfix) {
- TestSuite suite = new TestSuite("ClientAndEmbedded" + postfix);
+ BaseTestSuite
+ suite = new BaseTestSuite("ClientAndEmbedded" + postfix);
+
suite.addTest(new DataSourceTest("testBadConnectionAttributeSyntax"));
suite.addTest(new DataSourceTest("testDescriptionProperty"));
suite.addTest(new DataSourceTest("testAllDataSources"));
@@ -110,7 +112,7 @@ public class DataSourceTest extends Base
* @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");
suite.addTest(new DataSourceTest("testClientDSConnectionAttributes"));
suite.addTest(new DataSourceTest(
"testClientTraceFileDSConnectionAttribute"));
@@ -126,13 +128,13 @@ public class DataSourceTest extends Base
* @return A suite of tests being run with embedded only
*/
private static Test getEmbeddedSuite(String postfix) {
- TestSuite suite = new TestSuite("Embedded" + postfix);
+ BaseTestSuite suite = new BaseTestSuite("Embedded" + postfix);
suite.addTest(new DataSourceTest("testDSRequestAuthentication"));
return suite;
}
public static Test suite() {
- TestSuite suite = new TestSuite("DataSourceTest suite");
+ BaseTestSuite suite = new BaseTestSuite("DataSourceTest suite");
// Add the tests that only run with embedded
suite.addTest(getEmbeddedSuite("embedded"));
// Add tests that will run with embedded
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Tue Jul 8 13:51:51 2014
@@ -47,10 +47,10 @@ import java.util.Properties;
import java.util.Random;
import java.util.StringTokenizer;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.tests.upgradeTests.Version;
import org.apache.derbyTesting.functionTests.util.Barrier;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -217,7 +217,7 @@ public class DatabaseMetaDataTest extend
* @return the suite
*/
public static Test suite() {
- TestSuite suite = new TestSuite("DatabaseMetaDataTest");
+ BaseTestSuite suite = new BaseTestSuite("DatabaseMetaDataTest");
suite.addTest(
TestConfiguration.defaultSuite(DatabaseMetaDataTest.class));
@@ -267,18 +267,19 @@ public class DatabaseMetaDataTest extend
private static Test connectionPoolingSuite(String jdbcClient) {
// Return an empty suite if running in JavaME environment.
if (JDBC.vmSupportsJSR169()) {
- return new TestSuite("Base connection pooling suite:DISABLED");
+ return new BaseTestSuite("Base connection pooling suite:DISABLED");
}
- TestSuite baseCpSuite = new TestSuite("Base connection pooling suite");
+ BaseTestSuite baseCpSuite =
+ new BaseTestSuite("Base connection pooling suite");
// Add the tests here.
baseCpSuite.addTest(new DatabaseMetaDataTest("testConnectionSpecific"));
// Setup the two configurations; CPDS and XADS.
- TestSuite fullCpSuite = new TestSuite(
+ BaseTestSuite fullCpSuite = new BaseTestSuite(
"DatabaseMetaData with connection pooling:" + jdbcClient);
- TestSuite cpSuite = new TestSuite("ConnectionPoolDataSource");
- TestSuite xaSuite = new TestSuite("XADataSource");
+ BaseTestSuite cpSuite = new BaseTestSuite("ConnectionPoolDataSource");
+ BaseTestSuite xaSuite = new BaseTestSuite("XADataSource");
cpSuite.addTest(TestConfiguration.connectionCPDecorator(baseCpSuite));
xaSuite.addTest(TestConfiguration.connectionXADecorator(baseCpSuite));
fullCpSuite.addTest(cpSuite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java Tue Jul 8 13:51:51 2014
@@ -21,12 +21,12 @@
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
-import java.sql.SQLException;
import java.sql.Connection;
+import java.sql.SQLException;
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.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -111,7 +111,7 @@ public class DboPowersTest extends BaseJ
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("DboPowersTest");
+ BaseTestSuite suite = new BaseTestSuite("DboPowersTest");
/* Database shutdown powers */
@@ -178,8 +178,8 @@ public class DboPowersTest extends BaseJ
/* Tests without any authorization active (level ==
* NOAUTHENTICATION).
*/
- TestSuite noauthSuite =
- new TestSuite("suite: security level=" +
+ BaseTestSuite noauthSuite =
+ new BaseTestSuite("suite: security level=" +
secLevelNames[NOAUTHENTICATION]);
noauthSuite.addTest(new DboPowersTest("testShutDown",
NOAUTHENTICATION));
@@ -196,7 +196,7 @@ public class DboPowersTest extends BaseJ
tests[autLev] = wrapShutdownUserTests(autLev);
}
- TestSuite suite = new TestSuite("dboPowers:"+framework);
+ BaseTestSuite suite = new BaseTestSuite("dboPowers:"+framework);
/* run tests with no authentication enabled */
suite.addTest(tests[NOAUTHENTICATION]);
@@ -225,8 +225,8 @@ public class DboPowersTest extends BaseJ
private static Test wrapShutdownUserTests(int autLev)
{
// add decorator for different users authenticated
- TestSuite usersSuite =
- new TestSuite("usersSuite: security level=" +
+ BaseTestSuite usersSuite =
+ new BaseTestSuite("usersSuite: security level=" +
secLevelNames[autLev]);
// First decorate with users, then with
@@ -336,8 +336,8 @@ public class DboPowersTest extends BaseJ
* variants: Necessary since framework doesn't know
* bootPassword.
*/
- TestSuite noauthSuite =
- new TestSuite("suite: security level=" +
+ BaseTestSuite noauthSuite =
+ new BaseTestSuite("suite: security level=" +
secLevelNames[NOAUTHENTICATION]);
for (int tNo = 0; tNo < cryptoTests.length; tNo++) {
@@ -357,7 +357,7 @@ public class DboPowersTest extends BaseJ
tests[autLev] = wrapCryptoUserTests(autLev);
}
- TestSuite suite = new TestSuite("dboPowers:"+framework);
+ BaseTestSuite suite = new BaseTestSuite("dboPowers:"+framework);
/* run tests with no authentication enabled */
suite.addTest(tests[NOAUTHENTICATION]);
@@ -383,8 +383,8 @@ public class DboPowersTest extends BaseJ
private static Test wrapCryptoUserTests(int autLev)
{
// add decorator for different users authenticated
- TestSuite usersSuite =
- new TestSuite("usersSuite: security level=" +
+ BaseTestSuite usersSuite =
+ new BaseTestSuite("usersSuite: security level=" +
secLevelNames[autLev]);
// First decorate with users, then with authentication. Note
@@ -658,8 +658,8 @@ public class DboPowersTest extends BaseJ
/* Tests without any authorization active (level ==
* NOAUTHENTICATION).
*/
- TestSuite noauthSuite =
- new TestSuite("suite: security level=" +
+ BaseTestSuite noauthSuite =
+ new BaseTestSuite("suite: security level=" +
secLevelNames[NOAUTHENTICATION]);
noauthSuite.addTest(new DboPowersTest("testHardUpgrade",
NOAUTHENTICATION,
@@ -677,7 +677,7 @@ public class DboPowersTest extends BaseJ
tests[autLev] = wrapHardUpgradeUserTests(autLev);
}
- TestSuite suite = new TestSuite("dboPowers:"+framework);
+ BaseTestSuite suite = new BaseTestSuite("dboPowers:"+framework);
// A priori, doing a hard upgrade is a no-op here; we are only
// interested in checking if we have the powers to do it. However,
@@ -716,8 +716,8 @@ public class DboPowersTest extends BaseJ
private static Test wrapHardUpgradeUserTests(int autLev)
{
// add decorator for different users authenticated
- TestSuite usersSuite =
- new TestSuite("usersSuite: security level=" +
+ BaseTestSuite usersSuite =
+ new BaseTestSuite("usersSuite: security level=" +
secLevelNames[autLev]);
// First decorate with users, then with
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java Tue Jul 8 13:51:51 2014
@@ -21,30 +21,24 @@ limitations under the License.
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
-
import java.math.BigInteger;
-
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import java.util.Arrays;
+import junit.framework.Test;
+import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests that inserts with streams whose lengths differs from the the length
@@ -70,11 +64,11 @@ public class Derby2017LayerATest
* @return A suite of tests.
*/
public static Test suite() {
- TestSuite ts = new TestSuite();
+ BaseTestSuite ts = new BaseTestSuite();
ts.addTest(
TestConfiguration.defaultSuite(Derby2017LayerATest.class));
// Run the tests below with the client driver only.
- TestSuite clientSuite = new TestSuite("Client only tests");
+ BaseTestSuite clientSuite = new BaseTestSuite("Client only tests");
clientSuite.addTest(new Derby2017LayerATest(
"cs_FailedStreamInsertCharBufferBoundaries"));
clientSuite.addTest(new Derby2017LayerATest(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java Tue Jul 8 13:51:51 2014
@@ -19,16 +19,14 @@
*/
package org.apache.derbyTesting.functionTests.tests.jdbcapi;
+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.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.sql.Statement;
-import java.sql.SQLException;
-import java.sql.ResultSet;
-
public class Derby5158Test extends BaseJDBCTestCase
{
@@ -40,7 +38,7 @@ public class Derby5158Test extends BaseJ
protected static Test makeSuite(String name)
{
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
Test cst = TestConfiguration.defaultSuite(Derby5158Test.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java Tue Jul 8 13:51:51 2014
@@ -24,10 +24,8 @@ package org.apache.derbyTesting.function
import java.sql.DriverManager;
import java.sql.SQLException;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -45,10 +43,12 @@ public class DriverMgrAuthenticationTest
public static Test suite() {
// This test uses driverManager and so is not suitable for JSR169
if (JDBC.vmSupportsJSR169())
- return new TestSuite("DriverManager not available with JSR169;" +
+ return new BaseTestSuite(
+ "DriverManager not available with JSR169;" +
"empty DriverMgrAuthenticationTest");
else {
- TestSuite suite = new TestSuite("DriverMgrAuthenticationTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("DriverMgrAuthenticationTest");
suite.addTest(
baseSuite("DriverMgrAuthenticationTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
@@ -60,7 +60,8 @@ public class DriverMgrAuthenticationTest
// baseSuite takes advantage of setting system properties as defined
// in AuthenticationTest
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite("DriverMgrAuthenticationTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("DriverMgrAuthenticationTest");
Test test = new DriverMgrAuthenticationTest(
"testConnectShutdownAuthentication");