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 [2/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/derbynet/CheckSecurityManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java Tue Jul 8 13:51:51 2014
@@ -23,18 +23,10 @@ package org.apache.derbyTesting.function
import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
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.JDBCTestDisplayUtil;
-import org.apache.derby.impl.tools.ij.util;
-import org.apache.derbyTesting.functionTests.util.TestUtil;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.TestConfiguration;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java Tue Jul 8 13:51:51 2014
@@ -32,13 +32,11 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Locale;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.drda.NetworkServerControl;
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
import org.apache.derbyTesting.junit.LocaleTestSetup;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
@@ -310,14 +308,14 @@ public class DerbyNetAutoStartTest exten
} // end of checkLog
public static Test suite() {
- TestSuite suite = new TestSuite("DerbyNetAutoStartTest");
+ BaseTestSuite suite = new BaseTestSuite("DerbyNetAutoStartTest");
suite.addTest(baseSuite("DerbyNetAutoStartTest:embedded"));
return suite;
}
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
// Need derbynet.jar in the classpath, and cannot run with ME/JSR169/cdc profile
if (!Derby.hasServer())
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java Tue Jul 8 13:51:51 2014
@@ -25,12 +25,10 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.UnknownHostException;
-
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.NetworkServerTestSetup;
@@ -54,9 +52,9 @@ public class DerbyNetNewServerTest exten
public static Test suite() {
// Test does not run on J2ME
if (JDBC.vmSupportsJDBC3() && Derby.hasServer()) {
- return new TestSuite(DerbyNetNewServerTest.class);
+ return new BaseTestSuite(DerbyNetNewServerTest.class);
} else {
- return new TestSuite("DerbyNetNewServerTest.empty");
+ return new BaseTestSuite("DerbyNetNewServerTest.empty");
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java Tue Jul 8 13:51:51 2014
@@ -21,14 +21,15 @@
package org.apache.derbyTesting.functionTests.tests.derbynet;
import java.io.File;
-import java.util.Properties;
import java.util.Enumeration;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import java.util.Properties;
import junit.framework.Test;
import org.apache.derby.drda.NetworkServerControl;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* This tests getCurrentProperties
@@ -45,14 +46,7 @@ public class GetCurrentPropertiesTest ex
public static Test suite()
{
- // Use a fixed order for the test cases so that we know the exact
- // order in which they run. Some of them depend on the connection
- // number having a specific value, which can only be guaranteed if
- // we know exactly how many connections have been opened, hence the
- // need for a fixed order. Some also depend on seeing property values
- // set by the previous test case.
- Test test =
- TestConfiguration.orderedSuite(GetCurrentPropertiesTest.class);
+ Test test = new BaseTestSuite(GetCurrentPropertiesTest.class);
test = TestConfiguration.clientServerDecorator(test);
// Install a security manager using the special policy file.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java Tue Jul 8 13:51:51 2014
@@ -22,28 +22,25 @@
package org.apache.derbyTesting.functionTests.tests.derbynet;
-import java.util.HashMap;
-
+import java.sql.CallableStatement;
import java.sql.Connection;
+import java.sql.DriverManager;
import java.sql.ResultSet;
-import java.sql.CallableStatement;
-import java.sql.Statement;
import java.sql.SQLException;
-import java.sql.DriverManager;
-import javax.sql.DataSource;
+import java.sql.Statement;
+import java.util.HashMap;
import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
import javax.sql.PooledConnection;
-
+import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* This class tests the security mechanisms supported by Network Server
* Network server supports SECMEC_EUSRIDPWD, SECMEC_USRIDPWD, SECMEC_USRIDONL
@@ -126,10 +123,10 @@ public class NSSecurityMechanismTest ext
public static Test suite()
{
- TestSuite suite = new TestSuite("NSSecurityMechanismTest");
+ BaseTestSuite suite = new BaseTestSuite("NSSecurityMechanismTest");
- TestSuite clientSuite =
- new TestSuite("NSSecurityMechanismTest - client");
+ BaseTestSuite clientSuite =
+ new BaseTestSuite("NSSecurityMechanismTest - client");
clientSuite.addTest(new NSSecurityMechanismTest(
"testNetworkServerSecurityMechanism"));
suite.addTest(TestConfiguration.clientServerDecorator(clientSuite));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Tue Jul 8 13:51:51 2014
@@ -21,14 +21,11 @@
package org.apache.derbyTesting.functionTests.tests.derbynet;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.HarnessJavaTest;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* NetHarnessJavaTest includes .java tests in the derbynet directory that
@@ -67,7 +64,8 @@ public class NetHarnessJavaTest extends
public static Test suite()
{
- TestSuite suite = new TestSuite("derbynet: old harness java tests");
+ BaseTestSuite suite =
+ new BaseTestSuite("derbynet: old harness java tests");
if (!Derby.hasServer())
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java Tue Jul 8 13:51:51 2014
@@ -22,9 +22,8 @@ package org.apache.derbyTesting.function
import java.util.Properties;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -70,10 +69,10 @@ public final class NetIjTest extends Scr
* Return the suite that runs all the derbynet scripts.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("NetScripts");
+ BaseTestSuite suite = new BaseTestSuite("NetScripts");
// Set up the scripts run with the network client
- TestSuite clientTests = new TestSuite("NetScripts:client");
+ BaseTestSuite clientTests = new BaseTestSuite("NetScripts:client");
clientTests.addTest(getSuite(CLIENT_TESTS));
int port = TestConfiguration.getCurrent().getPort();
@@ -105,7 +104,7 @@ public final class NetIjTest extends Scr
* that cleans the database.
*/
private static Test getSuite(String[] list) {
- TestSuite suite = new TestSuite("Net scripts");
+ BaseTestSuite suite = new BaseTestSuite("Net scripts");
for (int i = 0; i < list.length; i++)
suite.addTest(
new CleanDatabaseTestSetup(
@@ -113,4 +112,4 @@ public final class NetIjTest extends Scr
return getIJConfig(suite);
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java Tue Jul 8 13:51:51 2014
@@ -21,17 +21,6 @@
package org.apache.derbyTesting.functionTests.tests.derbynet;
-import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
-import org.apache.derbyTesting.functionTests.util.TestUtil;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.Derby;
-import org.apache.derbyTesting.junit.NetworkServerTestSetup;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-
import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -41,9 +30,17 @@ import java.security.PrivilegedException
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derby.drda.NetworkServerControl;
+import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
+import org.apache.derbyTesting.functionTests.util.TestUtil;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.Derby;
+import org.apache.derbyTesting.junit.NetworkServerTestSetup;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
public class NetworkServerControlApiTest extends BaseJDBCTestCase {
@@ -246,15 +243,8 @@ public class NetworkServerControlApiTest
*/
private static Test decorateTest()
{
- // Use a fixed ordering of the test cases. Some of the test cases set
- // properties that will be seen by subsequent test cases, but only if
- // they run in one particular order. Also, some test cases depend on
- // the exact connection number, which can only be guaranteed if we
- // know exactly how many connections have been established so far, and
- // then we need a stable ordering of the test cases.
Test test = TestConfiguration.clientServerDecorator(
- TestConfiguration.orderedSuite(
- NetworkServerControlApiTest.class));
+ new BaseTestSuite(NetworkServerControlApiTest.class));
//
// Install a security manager using the initial policy file.
//
@@ -264,7 +254,8 @@ public class NetworkServerControlApiTest
public static Test suite()
{
- TestSuite suite = new TestSuite("NetworkServerControlApiTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("NetworkServerControlApiTest");
// Need derbynet.jar in the classpath!
if (!Derby.hasServer())
@@ -280,7 +271,9 @@ public class NetworkServerControlApiTest
return suite;
}
- private static TestSuite decorateSystemPropertyTests(TestSuite suite) {
+ private static BaseTestSuite decorateSystemPropertyTests(
+ BaseTestSuite suite) {
+
Properties traceProps = new Properties();
traceProps.put("derby.drda.traceDirectory","/");
traceProps.put("derby.drda.traceAll","true");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java Tue Jul 8 13:51:51 2014
@@ -23,14 +23,13 @@ package org.apache.derbyTesting.function
import java.io.IOException;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
+import org.apache.derbyTesting.junit.DerbyConstants;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.DerbyConstants;
public class NetworkServerControlClientCommandTest extends BaseJDBCTestCase {
@@ -151,7 +150,8 @@ public class NetworkServerControlClientC
public static Test suite() {
- TestSuite suite = new TestSuite("NetworkServerControlClientCommandTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("NetworkServerControlClientCommandTest");
// need network server so we can compare command output
// and we don't run on J2ME because java command is different.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java Tue Jul 8 13:51:51 2014
@@ -21,6 +21,11 @@
package org.apache.derbyTesting.functionTests.tests.derbynet;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
import java.sql.BatchUpdateException;
import java.sql.CallableStatement;
import java.sql.DataTruncation;
@@ -33,22 +38,15 @@ import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
-
-import java.math.BigDecimal;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.Arrays;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.Formatters;
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.TestConfiguration;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* This Junit test class tests the JDBC PreparedStatement. This test
@@ -81,14 +79,15 @@ public class PrepareStatementTest extend
{
if ( JDBC.vmSupportsJSR169())
// see DERBY-2233 for details
- return new TestSuite("empty PrepareStatementTest - client not supported on JSR169");
+ return new BaseTestSuite(
+ "empty PrepareStatementTest - client not supported on JSR169");
else
{
- TestSuite suite = new TestSuite("PrepareStatementTest");
+ BaseTestSuite suite = new BaseTestSuite("PrepareStatementTest");
suite.addTest(TestConfiguration.defaultSuite(PrepareStatementTest.class));
suite.addTest(TestConfiguration.clientServerDecorator(
TestConfiguration.connectionCPDecorator(new CleanDatabaseTestSetup(
- new TestSuite(PrepareStatementTest.class)))));
+ new BaseTestSuite(PrepareStatementTest.class)))));
return suite;
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java Tue Jul 8 13:51:51 2014
@@ -28,32 +28,27 @@ import java.io.Reader;
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
-
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
-
import java.nio.charset.Charset;
-
import java.security.AccessController;
import java.security.PrivilegedActionException;
-
import java.sql.DriverManager;
import java.sql.SQLException;
-
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Locale;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.impl.drda.ProtocolTestAdapter;
-
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.functionTests.util.ProtocolTestGrammar;
-
-import org.apache.derbyTesting.junit.*;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* This class is used to test error conditions in the protocol.
@@ -854,7 +849,7 @@ public class ProtocolTest
*/
public static Test suite()
throws Exception {
- TestSuite suite = new TestSuite("Derby DRDA protocol tests");
+ BaseTestSuite suite = new BaseTestSuite("Derby DRDA protocol tests");
// Process the list of files and create test cases for the sub-tests.
// NOTE: We cannot assume anything about the order in which the tests
// are executed.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java Tue Jul 8 13:51:51 2014
@@ -27,11 +27,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Locale;
-
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.LocaleTestSetup;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
@@ -76,7 +74,7 @@ public class RuntimeInfoTest extends Bas
* @return The test suite with both English and German locales.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("RuntimeInfoTest");
+ BaseTestSuite suite = new BaseTestSuite("RuntimeInfoTest");
// Run testRunTests in both English and German locale
suite.addTest(decorateTest(englishLocale, "testRunTests"));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java Tue Jul 8 13:51:51 2014
@@ -24,16 +24,15 @@ package org.apache.derbyTesting.function
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.Derby;
+import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBCDataSource;
/**
@@ -58,7 +57,7 @@ public class SSLTest extends BaseJDBCTes
{
//NetworkServerTestSetup.setWaitTime(10000L);
- TestSuite suite = new TestSuite("SSLTest");
+ BaseTestSuite suite = new BaseTestSuite("SSLTest");
// Server booting requires that we run from the jar files
if (!TestConfiguration.loadingFromJars()) { return suite; }
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java Tue Jul 8 13:51:51 2014
@@ -26,17 +26,16 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.Arrays;
-
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.Derby;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SpawnedProcess;
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
/**
* This Junit test class tests whether the server comes up under a security
@@ -152,7 +151,7 @@ public class SecureServerTest extends Ba
{
//NetworkServerTestSetup.setWaitTime( 10000L );
- TestSuite suite = new TestSuite("SecureServerTest");
+ BaseTestSuite suite = new BaseTestSuite("SecureServerTest");
// Server booting requires that we run from the jar files
if ( !TestConfiguration.loadingFromJars() ) { return suite; }
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Tue Jul 8 13:51:51 2014
@@ -27,13 +27,11 @@ import java.security.AccessController;
import java.sql.SQLException;
import java.util.Locale;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.drda.NetworkServerControl;
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
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.NetworkServerTestSetup;
@@ -69,7 +67,7 @@ public class ServerPropertiesTest exten
public static Test suite()
{
- TestSuite suite = new TestSuite("ServerPropertiesTest");
+ BaseTestSuite suite = new BaseTestSuite("ServerPropertiesTest");
if (!Derby.hasServer()) return suite;
// don't run with JSR169 for 1. this is network server and
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java Tue Jul 8 13:51:51 2014
@@ -24,13 +24,11 @@ import java.io.File;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.drda.NetworkServerControl;
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -48,7 +46,8 @@ public class ShutDownDBWhenNSShutsDownTe
* Only run the fixtures in network server mode as that's what they are testing.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("ShutDownDBWhenNSShutsDownTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("ShutDownDBWhenNSShutsDownTest");
suite.addTest(TestConfiguration.clientServerDecorator(
new ShutDownDBWhenNSShutsDownTest(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java Tue Jul 8 13:51:51 2014
@@ -19,26 +19,24 @@
*/
package org.apache.derbyTesting.functionTests.tests.derbynet;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.am.ClientMessageId;
-import org.apache.derby.shared.common.reference.SQLState;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.io.IOException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.sql.Statement;
+import junit.framework.Test;
+import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.client.am.SqlException;
+import org.apache.derby.shared.common.reference.SQLState;
+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 is used for testing the SqlException class. This test can be added
@@ -314,7 +312,8 @@ public class SqlExceptionTest extends Ba
public static Test suite() {
if ( JDBC.vmSupportsJSR169())
// see DERBY-2157 for details
- return new TestSuite("empty SqlExceptionTest - client not supported on JSR169");
+ return new BaseTestSuite(
+ "empty SqlExceptionTest - client not supported on JSR169");
else
{
Test test = TestConfiguration.defaultSuite(SqlExceptionTest.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java Tue Jul 8 13:51:51 2014
@@ -21,22 +21,19 @@ limitations under the License.
package org.apache.derbyTesting.functionTests.tests.derbynet;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
-
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.SQLException;
-
+import java.sql.Statement;
+import junit.framework.Test;
import org.apache.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.TestConfiguration;
/**
* Test that an exception is raised if the flow of data from the server to the
@@ -137,10 +134,11 @@ public class SuicideOfStreamingTest
// may be required.
return new CleanDatabaseTestSetup(
TestConfiguration.clientServerDecorator(
- new TestSuite(SuicideOfStreamingTest.class,
+ new BaseTestSuite(SuicideOfStreamingTest.class,
"SuicideOfStreamingTest")));
}
- return new TestSuite("SuicideOfStreamingTest <DISABLED IN INSANE MODE>");
+ return new BaseTestSuite(
+ "SuicideOfStreamingTest <DISABLED IN INSANE MODE>");
}
} // End class SuicideOfStreamingTest
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java Tue Jul 8 13:51:51 2014
@@ -24,18 +24,16 @@ package org.apache.derbyTesting.function
import java.net.URL;
import java.util.ArrayList;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.Derby;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
/**
This tests the sysinfo command
@@ -100,7 +98,7 @@ public class SysinfoTest extends BaseJDB
* 6 tests, 3 with properties set, 3 without.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("SysinfoTest");
+ BaseTestSuite suite = new BaseTestSuite("SysinfoTest");
// we need to be able to run the server
if (!Derby.hasServer()) return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java Tue Jul 8 13:51:51 2014
@@ -21,13 +21,12 @@
*/
package org.apache.derbyTesting.functionTests.tests.derbynet;
+import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
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.derbynet
@@ -44,7 +43,7 @@ public class _Suite extends BaseTestCase
public static Test suite() throws Exception {
- TestSuite suite = new TestSuite("derbynet");
+ BaseTestSuite suite = new BaseTestSuite("derbynet");
suite.addTest(PrepareStatementTest.suite());
suite.addTest(ShutDownDBWhenNSShutsDownTest.suite());
suite.addTest(DRDAProtocolTest.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java Tue Jul 8 13:51:51 2014
@@ -25,8 +25,6 @@ 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.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java Tue Jul 8 13:51:51 2014
@@ -23,8 +23,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -38,7 +38,7 @@ public class ModuleLoadingTest extends B
}
public static Test suite() {
- TestSuite ts = new TestSuite();
+ BaseTestSuite ts = new BaseTestSuite();
// Run concurrentLoadingOfSortFactory in a separate database so that
// the sort factory isn't already loaded.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java Tue Jul 8 13:51:51 2014
@@ -25,13 +25,11 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.io.IOException;
import java.sql.SQLException;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -58,7 +56,7 @@ public class ReadMeFilesTest extends Bas
}
public static Test suite() {
- TestSuite suite = new TestSuite("ReadMeFilesTest");
+ BaseTestSuite suite = new BaseTestSuite("ReadMeFilesTest");
//DERBY-5232 (Put a stern README file in log and seg0 directories
// to warn users of corrpution they will cause if they touch files
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java Tue Jul 8 13:51:51 2014
@@ -22,38 +22,38 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.lang.reflect.Array;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Field;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
-import java.sql.SQLException;
+import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.PreparedStatement;
-import java.sql.CallableStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.Set;
-import java.util.HashSet;
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.drda.NetworkServerControl;
import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
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.Derby;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.NetworkServerTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
-import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
-import org.apache.derbyTesting.junit.*;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests related to use of restrictive file permissions (DERBY-5363).
@@ -85,7 +85,7 @@ public class RestrictiveFilePermissionsT
println("warning: testing of strict permissions in " +
"RestrictiveFilePermissionsTest can not take place, " +
"need Java 7");
- return new TestSuite();
+ return new BaseTestSuite();
}
File f = new File("system/testPermissions");
@@ -111,7 +111,8 @@ public class RestrictiveFilePermissionsT
// setting of the property derby.storage.useDefaultFilePermissions.
// The extra setup file is for testJarFiles.
- TestSuite totalSuite = new TestSuite("RestrictiveFilePermissionsTest");
+ BaseTestSuite totalSuite =
+ new BaseTestSuite("RestrictiveFilePermissionsTest");
Properties p = new Properties();
p.put("derby.storage.useDefaultFilePermissions", "false");
@@ -121,7 +122,7 @@ public class RestrictiveFilePermissionsT
new SystemPropertyTestSetup(
TestConfiguration.singleUseDatabaseDecorator(
new SupportFilesSetup(
- new TestSuite(
+ new BaseTestSuite(
RestrictiveFilePermissionsTest.class,
"haveWeGotAllCreatedFilesSuite"),
new String[] {"functionTests/tests/lang/dcl_id.jar"}),
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java Tue Jul 8 13:51:51 2014
@@ -22,8 +22,8 @@
package org.apache.derbyTesting.functionTests.tests.engine;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Suite to run all JUnit tests in this package:
@@ -44,7 +44,7 @@ public class _Suite extends BaseTestCase
}
public static Test suite() throws Exception {
- TestSuite suite = new TestSuite("engine");
+ BaseTestSuite suite = new BaseTestSuite("engine");
suite.addTest(ErrorStreamTest.suite());
suite.addTest(LockInterruptTest.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java Tue Jul 8 13:51:51 2014
@@ -20,13 +20,12 @@
package org.apache.derbyTesting.functionTests.tests.i18n;
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class I18NImportExport extends ScriptTestCase {
@@ -39,7 +38,7 @@ public class I18NImportExport extends Sc
public static Test suite() {
- TestSuite suite = new TestSuite("I18NImportExport");
+ BaseTestSuite suite = new BaseTestSuite("I18NImportExport");
suite.addTest(
new CleanDatabaseTestSetup(
new I18NImportExport("I18NImportExport")));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java Tue Jul 8 13:51:51 2014
@@ -23,10 +23,7 @@
package org.apache.derbyTesting.functionTests.tests.i18n;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.tests.tools.ImportExportProcedureTest;
import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.SupportFilesSetup;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java Tue Jul 8 13:51:51 2014
@@ -25,8 +25,8 @@ import java.sql.CallableStatement;
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 org.apache.derbyTesting.junit.TestConfiguration;
@@ -51,8 +51,9 @@ public class JapanCodeConversionTest ext
(String[]) null);
}
- return new TestSuite("JapanCodeConversionTest - skipped because of " +
- "missing support for EUC_JP and SJIS");
+ return new BaseTestSuite(
+ "JapanCodeConversionTest - skipped because of " +
+ "missing support for EUC_JP and SJIS");
}
protected void tearDown() throws Exception {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java Tue Jul 8 13:51:51 2014
@@ -21,15 +21,13 @@
package org.apache.derbyTesting.functionTests.tests.i18n;
import java.util.Properties;
-
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* LocalizedAttributeScriptTest runs the ij scripts (.sql file)
* LocalizedConnectionAttribute.sql and compares the output to a canon file in
@@ -61,7 +59,7 @@ public final class LocalizedAttributeScr
*/
public static Test suite() {
- TestSuite suite = new TestSuite("LocalizedScripts");
+ BaseTestSuite suite = new BaseTestSuite("LocalizedScripts");
// Note that it doesn't really make sense to run with network
// server/client, as LocalizedConnectionAttributes.sql has a hardcoded
@@ -71,7 +69,8 @@ public final class LocalizedAttributeScr
// statement automatically invokes DriverManager.
if (JDBC.vmSupportsJSR169())
return suite;
- TestSuite localizedTests = new TestSuite("LocalizedScripts:embedded");
+ BaseTestSuite localizedTests =
+ new BaseTestSuite("LocalizedScripts:embedded");
localizedTests.addTest(getSuite());
Test local = TestConfiguration.singleUseDatabaseDecoratorNoShutdown(
localizedTests);
@@ -99,7 +98,7 @@ public final class LocalizedAttributeScr
* that cleans the database.
*/
private static Test getSuite() {
- TestSuite suite = new TestSuite("localized scripts");
+ BaseTestSuite suite = new BaseTestSuite("localized scripts");
Properties uiProps = new Properties();
uiProps.put("derby.ui.locale","de_DE");
@@ -120,4 +119,4 @@ public final class LocalizedAttributeScr
TestConfiguration.getCurrent().getDatabasePath("detest"));
super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java Tue Jul 8 13:51:51 2014
@@ -22,16 +22,14 @@ package org.apache.derbyTesting.function
import java.nio.charset.Charset;
import java.util.Properties;
-
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.TimeZoneTestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* LocalizedDisplayScriptTest runs the ij script LocalizedDisplay.sql
* and compares the output to a canon file in the standard master package.
@@ -64,7 +62,7 @@ public final class LocalizedDisplayScrip
*/
public static Test suite() {
- TestSuite suite = new TestSuite("LocalizedDisplay");
+ BaseTestSuite suite = new BaseTestSuite("LocalizedDisplay");
// This test will fail with JSR169, because lack of support for
// rs.getBigDecimal() will prevent the localization of numeric and
@@ -82,7 +80,9 @@ public final class LocalizedDisplayScrip
return suite;
}
- TestSuite localizedEmbeddedTests = new TestSuite("LocalizedDisplay:embedded");
+ BaseTestSuite localizedEmbeddedTests =
+ new BaseTestSuite("LocalizedDisplay:embedded");
+
localizedEmbeddedTests.addTest(getSuite());
Test embeddedrun = TestConfiguration.singleUseDatabaseDecorator(localizedEmbeddedTests);
// add the client test
@@ -94,7 +94,9 @@ public final class LocalizedDisplayScrip
// resulting in localized display by default, and thus a diff with the
// master.
// Set up the script's run with the network client
- TestSuite localizedTests = new TestSuite("LocalizedDisplay:client");
+ BaseTestSuite localizedTests =
+ new BaseTestSuite("LocalizedDisplay:client");
+
localizedTests.addTest(getSuite());
Test client = TestConfiguration.clientServerDecorator(
TestConfiguration.singleUseDatabaseDecorator(localizedTests));
@@ -119,7 +121,7 @@ public final class LocalizedDisplayScrip
* that cleans the database.
*/
private static Test getSuite() {
- TestSuite suite = new TestSuite("localized Display");
+ BaseTestSuite suite = new BaseTestSuite("localized Display");
Properties uiProps = new Properties();
uiProps.put("derby.ui.locale","es_AR");
uiProps.put("derby.ui.codeset", ENCODING);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java Tue Jul 8 13:51:51 2014
@@ -27,11 +27,9 @@ import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.Locale;
-
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.LocaleTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -308,7 +306,7 @@ public class UrlLocaleTest extends BaseJ
}
public static Test suite() {
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
suite.addTestSuite(UrlLocaleTest.class);
suite.addTest(new LocaleTestSetup(
new UrlLocaleTest("messageLocale_unknown"),
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java Tue Jul 8 13:51:51 2014
@@ -21,12 +21,11 @@
*/
package org.apache.derbyTesting.functionTests.tests.i18n;
+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.i18n
@@ -49,7 +48,7 @@ public class _Suite extends BaseTestCase
public static Test suite() {
- TestSuite suite = new TestSuite("i18n");
+ BaseTestSuite suite = new BaseTestSuite("i18n");
// Also, none of these tests will run with JSR169.
if (JDBC.vmSupportsJSR169())
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java Tue Jul 8 13:51:51 2014
@@ -23,7 +23,6 @@ package org.apache.derbyTesting.function
import java.security.AccessControlException;
import java.security.AccessController;
-import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -31,20 +30,15 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import javax.sql.ConnectionPoolDataSource;
-import javax.sql.DataSource;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBCDataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Tests for the new JDBC 4.1 Connection.abort(Executor) method. This
@@ -88,7 +82,7 @@ public class AbortTest extends Wrapper41
public static Test suite()
{
- TestSuite suite = new TestSuite( "AbortTest" );
+ BaseTestSuite suite = new BaseTestSuite( "AbortTest" );
suite.addTest( baseSuite( true ) );
suite.addTest( baseSuite( false ) );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java Tue Jul 8 13:51:51 2014
@@ -21,18 +21,26 @@
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.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Vector;
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.sql.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
/* This class is used to store the details of the methods that
* throw a SQLFeatureNotSupportedException in the implementation
* of java.sql.Blob.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java Tue Jul 8 13:51:51 2014
@@ -21,17 +21,30 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import junit.framework.*;
-
-import org.apache.derby.iapi.types.HarmonySerialBlob;
-import org.apache.derby.iapi.types.HarmonySerialClob;
-
-import org.apache.derbyTesting.junit.TestConfiguration;
-
import java.io.IOException;
import java.io.Reader;
import java.math.BigDecimal;
-import java.sql.*;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLDataException;
+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 junit.framework.Test;
+import org.apache.derby.iapi.types.HarmonySerialBlob;
+import org.apache.derby.iapi.types.HarmonySerialClob;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests of the <code>java.sql.CallableStatement</code> JDBC40 API.
@@ -831,7 +844,9 @@ public class CallableStatementTest exte
* Return suite with all tests of the class.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("CallableStatementTest suite");
+ BaseTestSuite suite =
+ new BaseTestSuite("CallableStatementTest suite");
+
suite.addTest(baseSuite("CallableStatementTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("CallableStatementTest:client")));
@@ -842,7 +857,9 @@ public class CallableStatementTest exte
}
private static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(CallableStatementTest.class, name);
+ BaseTestSuite suite =
+ new BaseTestSuite(CallableStatementTest.class, name);
+
return new CallableStatementTestSetup(suite);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java Tue Jul 8 13:51:51 2014
@@ -21,48 +21,34 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import java.util.ArrayList;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ParameterMetaData;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.SQLException;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FilePermission;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Blob;
+import java.sql.Clob;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import java.sql.Statement;
+import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.concurrent.Executor;
import javax.sql.ConnectionPoolDataSource;
-import javax.sql.DataSource;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import java.security.AccessController;
-import java.security.*;
-import java.util.concurrent.Executor;
-import org.apache.derbyTesting.junit.NetworkServerTestSetup;
-import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derby.jdbc.ClientDataSource;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.J2EEDataSource;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBCDataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* This class is used to test the implementations of the JDBC 4.0 methods
@@ -112,7 +98,7 @@ public class ConnectionMethodsTest exten
///////////////////////////////////////////////////////////////////////
public static Test suite() {
- TestSuite suite = new TestSuite("ConnectionMethodsTest");
+ BaseTestSuite suite = new BaseTestSuite("ConnectionMethodsTest");
suite.addTest(baseSuite("ConnectionMethodsTest:embedded"));
@@ -123,7 +109,9 @@ public class ConnectionMethodsTest exten
}
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(ConnectionMethodsTest.class, name);
+ BaseTestSuite suite =
+ new BaseTestSuite(ConnectionMethodsTest.class, name);
+
Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ConnectionMethods/short.txt"} );
return new CleanDatabaseTestSetup(test) {
protected void decorateSQL(Statement s) throws SQLException {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java Tue Jul 8 13:51:51 2014
@@ -20,18 +20,26 @@
*/
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import junit.framework.*;
-
-import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
-import java.sql.*;
+import java.sql.Blob;
+import java.sql.ClientInfoStatus;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import junit.framework.Test;
+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;
/**
* Tests for the JDBC 4.0 specific methods in the connection object(s).
@@ -378,16 +386,16 @@ public class ConnectionTest
/**
* Create suite containing client-only tests.
*/
- private static TestSuite clientSuite(String name) {
- TestSuite clientSuite = new TestSuite(name);
+ private static BaseTestSuite clientSuite(String name) {
+ BaseTestSuite clientSuite = new BaseTestSuite(name);
return clientSuite;
}
/**
* Create suite containing embedded-only tests.
*/
- private static TestSuite embeddedSuite(String name) {
- TestSuite embeddedSuite = new TestSuite(name);
+ private static BaseTestSuite embeddedSuite(String name) {
+ BaseTestSuite embeddedSuite = new BaseTestSuite(name);
embeddedSuite.addTest(new ConnectionTest(
"embeddedCreateBlob"));
embeddedSuite.addTest(new ConnectionTest(
@@ -401,29 +409,29 @@ public class ConnectionTest
* when appropriate.
*/
public static Test suite() {
- TestSuite connSuite = new TestSuite("ConnectionTest suite");
+ BaseTestSuite connSuite = new BaseTestSuite("ConnectionTest suite");
- TestSuite embedded = new TestSuite("ConnectionTest:embedded");
+ BaseTestSuite embedded = new BaseTestSuite("ConnectionTest:embedded");
embedded.addTestSuite(ConnectionTest.class);
embedded.addTest(embeddedSuite("ConnectionTest:embedded-only"));
connSuite.addTest(embedded);
// repeat the embedded tests obtaining a connection from
// an XA data source.
- embedded = new TestSuite("ConnectionTest:embedded XADataSource");
+ embedded = new BaseTestSuite("ConnectionTest:embedded XADataSource");
embedded.addTestSuite(ConnectionTest.class);
embedded.addTest(embeddedSuite("ConnectionTest:embedded-only XADataSource"));
connSuite.addTest(TestConfiguration.connectionXADecorator(embedded));
- TestSuite client = new TestSuite("ConnectionTest:client");
+ BaseTestSuite client = new BaseTestSuite("ConnectionTest:client");
client.addTestSuite(ConnectionTest.class);
client.addTest(clientSuite("ConnectionTest:client-only"));
connSuite.addTest(TestConfiguration.clientServerDecorator(client));
// repeat the client tests obtaining a connection from
// an XA data source.
- client = new TestSuite("ConnectionTest:client XADataSource");
+ client = new BaseTestSuite("ConnectionTest:client XADataSource");
client.addTestSuite(ConnectionTest.class);
client.addTest(clientSuite("ConnectionTest:client-only XADataSource"));
connSuite.addTest(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java Tue Jul 8 13:51:51 2014
@@ -21,19 +21,24 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import junit.framework.*;
-
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import javax.sql.CommonDataSource;
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
+import javax.sql.PooledConnection;
+import javax.sql.XADataSource;
+import junit.framework.Test;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.AssertEventCatcher;
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.JDBCDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.sql.*;
-
-import javax.sql.*;
-
/**
* Tests of the <code>javax.sql.DataSource</code> JDBC40 API.
*/
@@ -328,7 +333,7 @@ public class DataSourceTest extends Base
*/
public static Test suite() {
// Use explicit ordering of fixtures until fix of DERBY-5988
- TestSuite s = new TestSuite("datasourcetestsuite-embedded");
+ BaseTestSuite s = new BaseTestSuite("datasourcetestsuite-embedded");
s.addTest(new DataSourceTest("testIsNotWrapperForPoolDataSource"));
s.addTest(new DataSourceTest("testIsNotWrapperForXADataSource"));
s.addTest(new DataSourceTest("testUnwrapConnectionPoolDataSource"));
@@ -339,7 +344,7 @@ public class DataSourceTest extends Base
s.addTest(new DataSourceTest("testUnwrapResultSet"));
s.addTest(new DataSourceTest("testUnwrapDataSource"));
s.addTest(new DataSourceTest("test_jdbc4_1"));
- TestSuite ns = new TestSuite("datasourcetestsuite-net");
+ BaseTestSuite ns = new BaseTestSuite("datasourcetestsuite-net");
ns.addTest(new DataSourceTest("testIsNotWrapperForPoolDataSource"));
ns.addTest(new DataSourceTest("testIsNotWrapperForXADataSource"));
ns.addTest(new DataSourceTest("testUnwrapConnectionPoolDataSource"));
@@ -351,7 +356,7 @@ public class DataSourceTest extends Base
ns.addTest(new DataSourceTest("testUnwrapDataSource"));
ns.addTest(new DataSourceTest("test_jdbc4_1"));
- TestSuite totalsuite = new TestSuite("datasourcetest");
+ BaseTestSuite totalsuite = new BaseTestSuite("datasourcetest");
totalsuite.addTest(new CleanDatabaseTestSetup(s));
totalsuite.addTest(TestConfiguration.clientServerDecorator(
new CleanDatabaseTestSetup(ns)));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java Tue Jul 8 13:51:51 2014
@@ -11,18 +11,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
-
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.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
-import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
-
/*
Class org.apache.derbyTesting.functionTests.tests.jdbc4.Derby3650Test
@@ -572,7 +568,7 @@ public class Derby3650Test extends BaseJ
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(Derby3650Test.class);
return new CleanDatabaseTestSetup(
DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4))
@@ -599,7 +595,7 @@ public class Derby3650Test extends BaseJ
public static Test suite()
{
- TestSuite suite = new TestSuite("Derby3650Test");
+ BaseTestSuite suite = new BaseTestSuite("Derby3650Test");
suite.addTest(baseSuite("Derby3650Test:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(
baseSuite("Derby3650Test:client")));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java Tue Jul 8 13:51:51 2014
@@ -25,11 +25,9 @@ import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
-
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;
@@ -73,7 +71,7 @@ public class Driver40Test extends BaseJD
{
if (JDBC.vmSupportsJSR169())
{
- return new TestSuite(
+ return new BaseTestSuite(
"DriverTest40 tests java.sql.Driver, not supported with JSR169");
}
return TestConfiguration.defaultSuite(Driver40Test.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java Tue Jul 8 13:51:51 2014
@@ -24,15 +24,13 @@ package org.apache.derbyTesting.function
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLFeatureNotSupportedException;
-
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;
-import org.apache.derbyTesting.junit.SpawnedProcess;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.SpawnedProcess;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -77,7 +75,7 @@ public class Driver40UnbootedTest extend
{
if (JDBC.vmSupportsJSR169())
{
- return new TestSuite(
+ return new BaseTestSuite(
"DriverTest tests java.sql.Driver, not supported with JSR169");
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java Tue Jul 8 13:51:51 2014
@@ -21,17 +21,15 @@
package org.apache.derbyTesting.functionTests.tests.jdbc4;
-import java.lang.reflect.InvocationTargetException;
import java.sql.Connection;
-import java.sql.SQLException;
import javax.sql.ConnectionPoolDataSource;
-import javax.sql.DataSource;
import javax.sql.PooledConnection;
import javax.sql.StatementEvent;
import javax.sql.StatementEventListener;
import javax.sql.XADataSource;
-import junit.framework.*;
+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.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -77,7 +75,7 @@ public class JDBC4FromJDBC3DataSourceTes
}
// Else return empty suite.
- return new TestSuite("JDBC 4 from JDBC 3 Data Sources");
+ return new BaseTestSuite("JDBC 4 from JDBC 3 Data Sources");
}
/**