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 [10/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/tools/ToolScripts.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java Tue Jul 8 13:51:51 2014
@@ -19,13 +19,11 @@
*/
package org.apache.derbyTesting.functionTests.tests.tools;
-import java.sql.Statement;
import java.sql.SQLException;
-
+import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -106,7 +104,7 @@ public final class ToolScripts extends S
*/
public static Test suite() {
- TestSuite suite = new TestSuite("ToolScripts");
+ BaseTestSuite suite = new BaseTestSuite("ToolScripts");
suite.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
suite.addTest(getSuite(EMBEDDED_TESTS));
if (JDBC.vmSupportsJDBC3())
@@ -114,7 +112,7 @@ public final class ToolScripts extends S
suite.addTest(getAuthorizationSuite(SQLAUTHORIZATION_TESTS));
// Set up the scripts run with the network client
- TestSuite clientTests = new TestSuite("ToolScripts:client");
+ BaseTestSuite clientTests = new BaseTestSuite("ToolScripts:client");
clientTests.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
clientTests.addTest(getAuthorizationSuite(SQLAUTHORIZATION_TESTS));
clientTests.addTest(getSuite(CLIENT_TESTS));
@@ -146,7 +144,7 @@ public final class ToolScripts extends S
* that cleans the database.
*/
private static Test getSuite(String[] list) {
- TestSuite suite = new TestSuite("Tool scripts");
+ BaseTestSuite suite = new BaseTestSuite("Tool scripts");
for (int i = 0; i < list.length; i++)
suite.addTest(
new CleanDatabaseTestSetup(
@@ -165,7 +163,9 @@ public final class ToolScripts extends S
* </ul>
*/
private static Test getAuthorizationSuite(String[][][] list) {
- TestSuite suite = new TestSuite("Tool scripts w/authorization");
+ BaseTestSuite suite =
+ new BaseTestSuite("Tool scripts w/authorization");
+
final String PWSUFFIX = "pwSuffix";
for (int i = 0; i < list.length; i++) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java Tue Jul 8 13:51:51 2014
@@ -21,12 +21,11 @@
*/
package org.apache.derbyTesting.functionTests.tests.tools;
+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.tools
@@ -43,7 +42,7 @@ public class _Suite extends BaseTestCase
public static Test suite() {
- TestSuite suite = new TestSuite("tools");
+ BaseTestSuite suite = new BaseTestSuite("tools");
suite.addTest(IJRunScriptTest.suite());
suite.addTest(ImportExportTest.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Tue Jul 8 13:51:51 2014
@@ -25,10 +25,9 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
/**
@@ -44,7 +43,7 @@ public class derbyrunjartest extends Bas
public static Test suite() {
Class cl = derbyrunjartest.class;
- TestSuite suite = new TestSuite(cl);
+ BaseTestSuite suite = new BaseTestSuite(cl);
// The server command can only be used on platforms that support
// the network server.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java Tue Jul 8 13:51:51 2014
@@ -23,11 +23,9 @@ package org.apache.derbyTesting.function
import java.util.Locale;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.LocaleTestSetup;
@@ -52,7 +50,7 @@ public class ij2Test extends ScriptTestC
test = TestConfiguration.singleUseDatabaseDecorator(test, "wombat1");
test = new CleanDatabaseTestSetup(test);
- TestSuite suite = new TestSuite("ij2Scripts");
+ BaseTestSuite suite = new BaseTestSuite("ij2Scripts");
suite.addTest(test);
if (JDBC.vmSupportsJDBC3()) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java Tue Jul 8 13:51:51 2014
@@ -22,11 +22,9 @@
package org.apache.derbyTesting.functionTests.tests.tools;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -45,8 +43,10 @@ public class ij5Test extends ScriptTestC
// And as we're trying to test ij.showNoConnectionsAtStart=false,
// we cannot get the same output with non-JSR-169 platforms. So,
// return an empty suite (i.e. don't run with JSR 169).
- if (JDBC.vmSupportsJSR169())
- return new TestSuite("empty: cannot obtain expected output with JSR169");
+ if (JDBC.vmSupportsJSR169()) {
+ return new BaseTestSuite(
+ "empty: cannot obtain expected output with JSR169");
+ }
props.setProperty("ij.showNoConnectionsAtStart", "false");
props.setProperty("ij.showNoCountForSelect", "false");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Tue Jul 8 13:51:51 2014
@@ -28,17 +28,15 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import javax.sql.DataSource;
-
+import junit.framework.Test;
import org.apache.derby.catalog.SystemProcedures;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.XML;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Basic fixtures and setup for the upgrade test, not
* tied to any specific release.
@@ -46,26 +44,9 @@ import junit.framework.TestSuite;
public class BasicSetup extends UpgradeChange {
public static Test suite() {
- TestSuite suite = new TestSuite("Upgrade basic setup");
-
- // Make the test cases run in a fixed order so they become
- // more deterministic. Some orderings may make them run into
- // problems in old versions. Since it's too late to fix bugs
- // in old versions, we have to work around them like this
- // instead.
- //
- // The specific problem that prompted this particular
- // workaround, was a combination of DERBY-5947 and DERBY-4577.
- // DERBY-5947 changed the size of the trigger plans stored in
- // SYS.SYSSTATEMENTS. Although that change should be harmless
- // in itself, it happened to make some of the triggers in this
- // test have plans of the exact right size to hit DERBY-4577
- // when downgrading to a version without the fix for
- // DERBY-4577 in the post soft-upgrade phase. This only
- // happened for some orderings, so always run the test with a
- // known good ordering.
+ BaseTestSuite suite = new BaseTestSuite("Upgrade basic setup");
- suite.addTest(TestConfiguration.orderedSuite(BasicSetup.class));
+ suite.addTest(new BaseTestSuite(BasicSetup.class));
if (XML.classpathMeetsXMLReqs()) {
// Only test XML operators if they are supported by the version
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java Tue Jul 8 13:51:51 2014
@@ -20,14 +20,10 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import java.sql.Connection;
-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.BaseTestSuite;
/**
* Upgrade test cases for changes made in 10.1.
@@ -44,7 +40,7 @@ import junit.framework.TestSuite;
public class Changes10_1 extends UpgradeChange {
public static Test suite() {
- TestSuite suite = new TestSuite("Upgrade changes for 10.1");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.1");
suite.addTestSuite(Changes10_1.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java Tue Jul 8 13:51:51 2014
@@ -22,16 +22,13 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.io.IOException;
-
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.PrivilegedFileOpsForTests;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -87,7 +84,7 @@ public class Changes10_10 extends Upgrad
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.9");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.9");
suite.addTestSuite(Changes10_10.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java Tue Jul 8 13:51:51 2014
@@ -26,11 +26,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Properties;
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;
@@ -78,7 +78,7 @@ public class Changes10_11 extends Upgrad
* @return the test suite created.
*/
public static Test suite(int phase) {
- return new TestSuite(Changes10_11.class, "Upgrade test for 10.11");
+ return new BaseTestSuite(Changes10_11.class, "Upgrade test for 10.11");
}
//////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java Tue Jul 8 13:51:51 2014
@@ -20,17 +20,13 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -53,7 +49,7 @@ import org.apache.derbyTesting.junit.JDB
public class Changes10_2 extends UpgradeChange {
public static Test suite() {
- TestSuite suite = new TestSuite("Upgrade changes for 10.2");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.2");
suite.addTestSuite(Changes10_2.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java Tue Jul 8 13:51:51 2014
@@ -20,22 +20,16 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.JDBCDataSource;
-import org.apache.derbyTesting.junit.TestConfiguration;
-
import org.apache.derbyTesting.functionTests.tests.jdbcapi.BlobStoredProcedureTest;
import org.apache.derbyTesting.functionTests.tests.jdbcapi.ClobStoredProcedureTest;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -58,7 +52,7 @@ public class Changes10_3 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade changes for 10.3");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.3");
suite.addTestSuite(Changes10_3.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java Tue Jul 8 13:51:51 2014
@@ -20,25 +20,20 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.JDBCDataSource;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-
-import java.text.Collator;
-import java.util.Locale;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Types;
-
+import java.text.Collator;
+import java.util.Locale;
import javax.sql.DataSource;
-
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.JDBCDataSource;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
/**
* Upgrade test cases for 10.4.
@@ -81,7 +76,7 @@ public class Changes10_4 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.4");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.4");
suite.addTestSuite(Changes10_4.class);
return new SupportFilesSetup((Test) suite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java Tue Jul 8 13:51:51 2014
@@ -20,18 +20,15 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-
-import org.apache.derbyTesting.junit.JDBCDataSource;
+import java.sql.CallableStatement;
+import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Connection;
-import java.sql.CallableStatement;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBCDataSource;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
/**
* Upgrade test cases for 10.5.
@@ -62,7 +59,7 @@ public class Changes10_5 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.5");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.5");
suite.addTestSuite(Changes10_5.class);
return new SupportFilesSetup((Test) suite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java Tue Jul 8 13:51:51 2014
@@ -20,18 +20,15 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-
import java.lang.reflect.Method;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.ResultSet;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derby.catalog.types.RoutineAliasInfo;
import org.apache.derby.catalog.TypeDescriptor;
+import org.apache.derby.catalog.types.RoutineAliasInfo;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
/**
* Upgrade test cases for 10.6.
@@ -77,7 +74,7 @@ public class Changes10_6 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.6");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.6");
suite.addTestSuite(Changes10_6.class);
return new SupportFilesSetup((Test) suite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java Tue Jul 8 13:51:51 2014
@@ -20,19 +20,16 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
-
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
-import java.sql.ResultSet;
import java.util.HashSet;
import java.util.Set;
-
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.SupportFilesSetup;
/**
@@ -89,7 +86,7 @@ public class Changes10_7 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.7");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.7");
suite.addTestSuite(Changes10_7.class);
return new SupportFilesSetup((Test) suite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java Tue Jul 8 13:51:51 2014
@@ -31,13 +31,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.tests.upgradeTests.helpers.DisposableIndexStatistics;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.IndexStatsUtil;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -98,7 +95,7 @@ public class Changes10_9 extends Upgrade
* @return the test suite created.
*/
public static Test suite(int phase) {
- TestSuite suite = new TestSuite("Upgrade test for 10.9");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.9");
suite.addTestSuite(Changes10_9.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java Tue Jul 8 13:51:51 2014
@@ -22,13 +22,11 @@ package org.apache.derbyTesting.function
import java.lang.reflect.Method;
import java.util.Properties;
-
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -78,13 +76,13 @@ class UpgradeRun extends UpgradeClassLoa
// If no jars then just skip.
if (oldLoader == null)
{
- TestSuite suite = new TestSuite(
+ BaseTestSuite suite = new BaseTestSuite(
"Empty: Skipped upgrade Tests (no jars) for " + getTextVersion(version));
return suite;
}
- TestSuite suite = new TestSuite(
+ BaseTestSuite suite = new BaseTestSuite(
"Upgrade Tests from " + getTextVersion(version));
BaseTestCase.traceit("Prepare to run upgrade tests from " + getTextVersion(version));
@@ -158,7 +156,7 @@ class UpgradeRun extends UpgradeClassLoa
*
*/
private static Test baseSuite(String name, int phase, int[] version) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
int oldMajor = version[0];
int oldMinor = version[1];
@@ -328,9 +326,12 @@ class UpgradeRun extends UpgradeClassLoa
* add the DatabaseMetaDataTest.class as is.
* Note also, that this does not execute fixture initialCompilationTest.
*/
- private static void runDataBaseMetaDataTest (TestSuite suite, int oldMinor)
+ private static void runDataBaseMetaDataTest (
+ BaseTestSuite suite, int oldMinor)
{
- TestSuite dmdSuite = new TestSuite("DatabaseMetaData subsuite");
+ BaseTestSuite dmdSuite =
+ new BaseTestSuite("DatabaseMetaData subsuite");
+
Method[] methods = DatabaseMetaDataTest.class.getMethods();
for (int i = 0; i < methods.length; i++) {
Method m = methods[i];
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java Tue Jul 8 13:51:51 2014
@@ -22,23 +22,18 @@ package org.apache.derbyTesting.function
import java.lang.reflect.Method;
import java.sql.Connection;
-import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Properties;
import javax.sql.DataSource;
-
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.JDBCClient;
import org.apache.derbyTesting.junit.JDBCClientSetup;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -246,7 +241,7 @@ public class UpgradeTrajectoryTest exten
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("Upgrade trajectory test");
+ BaseTestSuite suite = new BaseTestSuite("Upgrade trajectory test");
addTrajectories( suite );
@@ -260,7 +255,7 @@ public class UpgradeTrajectoryTest exten
* Add all of the trajectories we intend to test.
* </p>
*/
- private static void addTrajectories( TestSuite suite )
+ private static void addTrajectories( BaseTestSuite suite )
{
Version.Trajectory[] trajectories = makeTrajectories();
int count = trajectories.length;
@@ -359,7 +354,8 @@ public class UpgradeTrajectoryTest exten
* Add only the test case which hard-upgrades along all edges of the Trajectory.
* </p>
*/
- private static void addHardUpgradeOnlyTrajectory( TestSuite suite, Version.Trajectory trajectory )
+ private static void addHardUpgradeOnlyTrajectory(
+ BaseTestSuite suite, Version.Trajectory trajectory )
{
// a valid trajectory must have a start point and a different end point
int versionCount = trajectory.getVersionCount();
@@ -379,7 +375,8 @@ public class UpgradeTrajectoryTest exten
* hard and softupgrade.
* </p>
*/
- private static void addTrajectory( TestSuite suite, Version.Trajectory trajectory )
+ private static void addTrajectory(
+ BaseTestSuite suite, Version.Trajectory trajectory )
{
// a valid trajectory must have a start point and a different end point
int versionCount = trajectory.getVersionCount();
@@ -393,7 +390,11 @@ public class UpgradeTrajectoryTest exten
addTrajectory( suite, trajectory, hardUpgradeRequests, 1 );
}
- private static void addTrajectory( TestSuite suite, Version.Trajectory trajectory, boolean[] hardUpgradeRequests, int idx )
+ private static void addTrajectory(
+ BaseTestSuite suite,
+ Version.Trajectory trajectory,
+ boolean[] hardUpgradeRequests,
+ int idx )
{
if ( idx >= trajectory.getVersionCount() )
{
@@ -427,7 +428,10 @@ public class UpgradeTrajectoryTest exten
* Add a single trajectory to the suite, with upgrade instructions.
* </p>
*/
- private static void addTrajectory( TestSuite suite, Version.Trajectory trajectory, boolean[] hardUpgradeRequests )
+ private static void addTrajectory(
+ BaseTestSuite suite,
+ Version.Trajectory trajectory,
+ boolean[] hardUpgradeRequests )
{
UpgradeTrajectoryTest utt = new UpgradeTrajectoryTest( trajectory, hardUpgradeRequests );
TestSetup setup = TestConfiguration.additionalDatabaseDecorator( utt, UPGRADED_DATABASE );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java Tue Jul 8 13:51:51 2014
@@ -21,12 +21,9 @@ limitations under the License.
package org.apache.derbyTesting.functionTests.tests.upgradeTests;
import java.util.Arrays;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Run the full upgrade suite. This is the only
@@ -127,7 +124,7 @@ public class _Suite extends BaseTestCase
String id = "Upgrade Suite: "
+ OLD_RELEASE_PATH_PROPERTY + "=" + UpgradeRun.jarPath
+ " / " + OLD_VERSIONS_PATH_PROPERTY + "=" + UpgradeRun.oldVersionsPath;
- TestSuite suite = new TestSuite(id);
+ BaseTestSuite suite = new BaseTestSuite(id);
old = OldVersions.getSupportedVersions();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java Tue Jul 8 13:51:51 2014
@@ -16,7 +16,13 @@
*/
package org.apache.derbyTesting.functionTests.util;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
import java.util.Enumeration;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -1287,7 +1293,8 @@ public class SQLToJUnit
" }\n\n" +
" public static Test suite()\n" +
" {\n" +
- " TestSuite suite = new TestSuite(\"IJToJUnitTest Test\");\n" +
+ " BaseTestSuite suite = " +
+ "new BaseTestSuite(\"IJToJUnitTest Test\");\n" +
" suite.addTest(TestConfiguration.defaultSuite(IJToJUnitTest.class));\n" +
" return suite;\n" +
" }\n\n" +
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java Tue Jul 8 13:51:51 2014
@@ -23,12 +23,10 @@ import java.io.InputStream;
import java.net.URL;
import java.sql.Connection;
import java.util.Locale;
-
+import junit.framework.Test;
import org.apache.derby.iapi.tools.i18n.LocalizedResource;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.Derby;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.LocaleTestSetup;
/**
@@ -129,7 +127,7 @@ public abstract class ScriptTestCase ext
// Need the tools to run the scripts as this
// test uses ij as the script runner.
if (!Derby.hasTools())
- return new TestSuite("empty: no tools support");
+ return new BaseTestSuite("empty: no tools support");
// No decorator needed currently.
return test;
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestSuite.java?rev=1608782&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestSuite.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestSuite.java Tue Jul 8 13:51:51 2014
@@ -0,0 +1,94 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.junit.BaseTestSuite
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ */
+package org.apache.derbyTesting.junit;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Derby replacement for TestSuite. This version, when provided with a
+ * {@code Class} argument in a constructor or method, constructs a
+ * {@code TestSuite} with a lexicographically sorted set of fixtures (i.e. test
+ * cases) to avoid random fixture ordering (after Java 6). Its usage is similar
+ * to the original JUnit TestSuite class.
+ */
+public class BaseTestSuite extends TestSuite {
+
+ public BaseTestSuite() {
+ super();
+ }
+
+ public BaseTestSuite(String name) {
+ super(name);
+ }
+
+ public BaseTestSuite(Class cls, String name) {
+ super(name);
+ orderedSuite(cls);
+ }
+
+ public BaseTestSuite(Class cls) {
+ super(TestConfiguration.suiteName(cls));
+ orderedSuite(cls);
+ }
+
+ @Override
+ public void addTestSuite(Class cls) {
+ orderedSuite(cls);
+ }
+
+ private void orderedSuite(Class<?> cls) {
+ // Extract all tests from the test class and order them.
+ ArrayList<TestCase> tests = new ArrayList<TestCase>();
+
+ Enumeration<?> e = new TestSuite(cls).tests();
+
+ while (e.hasMoreElements()) {
+ tests.add((TestCase) e.nextElement());
+ }
+
+ Collections.sort(tests, TEST_ORDERER);
+
+ for (TestCase t : tests) {
+ addTest(t);
+ }
+ }
+
+ /**
+ * A comparator that orders {@code TestCase}s lexicographically by
+ * their names.
+ */
+ private static final Comparator<TestCase> TEST_ORDERER =
+ new Comparator<TestCase>() {
+ @Override
+ public int compare(TestCase t1, TestCase t2) {
+ return t1.getName().compareTo(t2.getName());
+ }
+ };
+
+
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java Tue Jul 8 13:51:51 2014
@@ -22,9 +22,7 @@ package org.apache.derbyTesting.junit;
import java.util.Properties;
import java.util.Random;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Utility class that provides static methods to decorate tests.
@@ -78,7 +76,7 @@ public class Decorator {
public static Test encryptedDatabaseBpw(Test test, String bootPassword)
{
if (JDBC.vmSupportsJSR169())
- return new TestSuite("no encryption support");
+ return new BaseTestSuite("no encryption support");
Properties attributes = new Properties();
attributes.setProperty("dataEncryption", "true");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java Tue Jul 8 13:51:51 2014
@@ -60,11 +60,11 @@ package org.apache.derbyTesting.junit;
* // repeat the test 4 times.
* int iterations = 100;
* int repeats = 4;
- * TestSuite suite = new TestSuite();
+ * BaseTestSuite suite = new BaseTestSuite();
* suite.addTest(new ScanCoveredIdxTest("scanAllRows",iterations,repeats));
*
* // To add client tests.
- * TestSuite client = new TestSuite("Client");
+ * BaseTestSuite client = new BaseTestSuite("Client");
* client.addTest(new ScanCoveredIdxTest("scanAllRows",iterations,repeats));
* client.addTest(new ScanCoveredIdxTest("scanAndRetrieveAllRows",iterations,repeats));
*
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java Tue Jul 8 13:51:51 2014
@@ -32,12 +32,8 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.Enumeration;
import java.util.Properties;
-
-
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
/**
@@ -172,9 +168,12 @@ public final class SecurityManagerSetup
*/
public static Test noSecurityManager(Test test)
{
- if (externalSecurityManagerInstalled)
- return new TestSuite("skipped due to external security manager "
- + test.toString());
+ if (externalSecurityManagerInstalled) {
+ return new BaseTestSuite(
+ "skipped due to external security manager "
+ + test.toString());
+ }
+
return new SecurityManagerSetup(test, NO_POLICY);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Tue Jul 8 13:51:51 2014
@@ -20,26 +20,23 @@
package org.apache.derbyTesting.junit;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import java.security.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Properties;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
-
+import java.util.Properties;
import junit.extensions.TestSetup;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Class which holds information about the configuration of a Test.
@@ -247,7 +244,7 @@ public final class TestConfiguration {
*/
public static Test defaultSuite(Class testClass, boolean cleanDB)
{
- final TestSuite suite = new TestSuite(suiteName(testClass));
+ final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
if (cleanDB)
{
@@ -297,7 +294,7 @@ public final class TestConfiguration {
*/
public static Test defaultExistingServerSuite(Class testClass, boolean cleanDB)
{
- final TestSuite suite = new TestSuite(suiteName(testClass));
+ final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
if (cleanDB)
{
@@ -339,7 +336,7 @@ public final class TestConfiguration {
String hostName,
int portNumber)
{
- final TestSuite suite = new TestSuite(suiteName(testClass));
+ final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
if (cleanDB)
{
@@ -359,7 +356,7 @@ public final class TestConfiguration {
int portNumber,
String dbPath)
{
- final TestSuite suite = new TestSuite(suiteName(testClass));
+ final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
if (cleanDB)
{
@@ -385,7 +382,7 @@ public final class TestConfiguration {
*/
public static Test forceJDBC3Suite(Class testClass)
{
- final TestSuite suite = new TestSuite(suiteName(testClass));
+ final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
suite.addTest(
new CleanDatabaseTestSetup(
@@ -402,7 +399,7 @@ public final class TestConfiguration {
* Generate a suite name from a class name, taking
* only the last element of the fully qualified class name.
*/
- private static String suiteName(Class testClass)
+ static String suiteName(Class testClass)
{
int lastDot = testClass.getName().lastIndexOf('.');
String suiteName = testClass.getName();
@@ -413,50 +410,12 @@ public final class TestConfiguration {
}
/**
- * A comparator that orders {@code TestCase}s lexicographically by
- * their names.
- */
- private static final Comparator<TestCase> TEST_ORDERER =
- new Comparator<TestCase>() {
- public int compare(TestCase t1, TestCase t2) {
- return t1.getName().compareTo(t2.getName());
- }
- };
-
- /**
- * Create a test suite with all the test cases in the specified class. The
- * test cases should be ordered lexicographically by their names.
- *
- * @param testClass the class with the test cases
- * @return a lexicographically ordered test suite
- */
- public static Test orderedSuite(Class testClass) {
- // Extract all tests from the test class and order them.
- ArrayList<TestCase> tests = new ArrayList<TestCase>();
-
- Enumeration e = new TestSuite(testClass).tests();
- while (e.hasMoreElements()) {
- tests.add((TestCase) e.nextElement());
- }
-
- Collections.sort(tests, TEST_ORDERER);
-
- // Build a new test suite with the tests in lexicographic order.
- TestSuite suite = new TestSuite(suiteName(testClass));
- for (Iterator it = tests.iterator(); it.hasNext(); ) {
- suite.addTest((Test) it.next());
- }
-
- return suite;
- }
-
- /**
* Create a suite for the passed test class that includes
* all the default fixtures from the class.
*/
public static Test embeddedSuite(Class testClass)
{
- return new TestSuite(testClass,
+ return new BaseTestSuite(testClass,
suiteName(testClass)+":embedded");
}
@@ -575,7 +534,9 @@ public final class TestConfiguration {
if (!(Derby.hasClient())
|| JDBC.vmSupportsJSR169())
{
- return new TestSuite("empty: no network server support in JSR169 (or derbyclient.jar missing).");
+ return new BaseTestSuite(
+ "empty: no network server support in JSR169 " +
+ "(or derbyclient.jar missing).");
}
Test r =
@@ -593,7 +554,7 @@ public final class TestConfiguration {
// Need to have network server and client and not
// running in J2ME (JSR169).
if (!supportsClientServer()) {
- return new TestSuite("empty: no network server support");
+ return new BaseTestSuite("empty: no network server support");
}
//
@@ -613,7 +574,7 @@ public final class TestConfiguration {
// Need to have network server and client and not
// running in J2ME (JSR169).
if (!supportsClientServer()) {
- return new TestSuite("empty: no network server support");
+ return new BaseTestSuite("empty: no network server support");
}
Test r =
@@ -631,7 +592,7 @@ public final class TestConfiguration {
// Need to have network server and client and not
// running in J2ME (JSR169).
if (!supportsClientServer()) {
- return new TestSuite("empty: no network server support");
+ return new BaseTestSuite("empty: no network server support");
}
Test r =
@@ -648,7 +609,7 @@ public final class TestConfiguration {
// Need to have network server and client and not
// running in J2ME (JSR169).
if (!supportsClientServer()) {
- return new TestSuite("empty: no network server support");
+ return new BaseTestSuite("empty: no network server support");
}
int port = getCurrent().getNextAvailablePort();
@@ -678,7 +639,9 @@ public final class TestConfiguration {
* environment
*/
private static Test bareClientServerSuite(Class testClass) {
- TestSuite suite = new TestSuite(suiteName(testClass) + ":client");
+ BaseTestSuite suite =
+ new BaseTestSuite(suiteName(testClass) + ":client");
+
if (supportsClientServer()) {
suite.addTestSuite(testClass);
}
@@ -1019,7 +982,7 @@ public final class TestConfiguration {
return new ConnectorSetup(test,
"org.apache.derbyTesting.junit.ConnectionPoolDataSourceConnector");
} else {
- return new TestSuite("ConnectionPoolDataSource not supported");
+ return new BaseTestSuite("ConnectionPoolDataSource not supported");
}
}
@@ -1041,7 +1004,7 @@ public final class TestConfiguration {
return new ConnectorSetup(test,
"org.apache.derbyTesting.junit.XADataSourceConnector");
} else {
- return new TestSuite("XADataSource not supported");
+ return new BaseTestSuite("XADataSource not supported");
}
}
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/_Suite.java Tue Jul 8 13:51:51 2014
@@ -22,10 +22,14 @@ Derby - Class org.apache.derbyTesting.pe
package org.apache.derbyTesting.perf.basic;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseTestCase;
-import org.apache.derbyTesting.perf.basic.jdbc.*;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.perf.basic.jdbc.CountTest;
+import org.apache.derbyTesting.perf.basic.jdbc.CoveredIdxScan;
+import org.apache.derbyTesting.perf.basic.jdbc.HeapScan;
+import org.apache.derbyTesting.perf.basic.jdbc.SelectDistinctTest;
+import org.apache.derbyTesting.perf.basic.jdbc.SortTest;
+import org.apache.derbyTesting.perf.basic.jdbc.ValuesTest;
/**
* Basic Performance Suite
@@ -34,7 +38,7 @@ public class _Suite extends BaseTestCase
public static Test suite()
{
- TestSuite suite = new TestSuite("BasicPerf");
+ BaseTestSuite suite = new BaseTestSuite("BasicPerf");
suite.addTest(ValuesTest.suite());
suite.addTest(CountTest.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java Tue Jul 8 13:51:51 2014
@@ -31,8 +31,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
import org.apache.derbyTesting.perf.clients.BackToBackLoadGenerator;
@@ -118,12 +118,12 @@ public class BlobAccessTest
* @return A suite of tests.
*/
public static Test suite() {
- TestSuite mainSuite = new TestSuite("BlobAccessTest suite");
+ BaseTestSuite mainSuite = new BaseTestSuite("BlobAccessTest suite");
if (!disableSmallBlobs) {
int iters = 50;
int reps = 3;
println("Adding small Blob tests.");
- TestSuite smallSuite = new TestSuite("Small Blob suite");
+ BaseTestSuite smallSuite = new BaseTestSuite("Small Blob suite");
smallSuite.addTest(new BlobAccessTest(
"testFetchSmallBlobs", iters, reps));
smallSuite.addTest(new BlobAccessTest(
@@ -136,7 +136,7 @@ public class BlobAccessTest
int iters = 5;
int reps = 3;
println("Adding large Blob tests.");
- TestSuite largeSuite = new TestSuite("Large Blob suite");
+ BaseTestSuite largeSuite = new BaseTestSuite("Large Blob suite");
largeSuite.addTest(new BlobAccessTest(
"testFetchLargeBlobs", iters, reps));
largeSuite.addTest(new BlobAccessTest(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java Tue Jul 8 13:51:51 2014
@@ -30,8 +30,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
import org.apache.derbyTesting.perf.clients.BackToBackLoadGenerator;
@@ -125,12 +125,12 @@ public class ClobAccessTest
}
public static Test suite() {
- TestSuite mainSuite = new TestSuite("ClobAccessTest suite");
+ BaseTestSuite mainSuite = new BaseTestSuite("ClobAccessTest suite");
if (!disableSmallClobs) {
int iters = 50;
int reps = 1;
println("Adding small Clob tests.");
- TestSuite smallSuite = new TestSuite("Small Clob suite");
+ BaseTestSuite smallSuite = new BaseTestSuite("Small Clob suite");
smallSuite.addTest(new ClobAccessTest(
"testFetchSmallClobs", iters, reps));
smallSuite.addTest(new ClobAccessTest(
@@ -164,7 +164,7 @@ public class ClobAccessTest
}
}
println("Adding " + tests.length + " large Clob tests.");
- TestSuite largeSuite = new TestSuite("Large Clob suite");
+ BaseTestSuite largeSuite = new BaseTestSuite("Large Clob suite");
for (int i=0; i < tests.length; i++) {
largeSuite.addTest(new ClobAccessTest(tests[i] , iters, reps));
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java Tue Jul 8 13:51:51 2014
@@ -21,9 +21,12 @@ limitations under the License.
package org.apache.derbyTesting.perf.basic.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
/**
@@ -40,7 +43,7 @@ public class CountTest extends JDBCPerfT
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("CountTest");
+ BaseTestSuite suite = new BaseTestSuite("CountTest");
int iterations = 1200, repeats = 4;
suite.addTest(new CountTest("Count100",iterations,repeats));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java Tue Jul 8 13:51:51 2014
@@ -21,10 +21,11 @@
package org.apache.derbyTesting.perf.basic.jdbc;
-import java.sql.*;
-
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Index scan tests.
@@ -37,7 +38,7 @@ public class CoveredIdxScan extends Heap
*/
public static Test suite()
{
- TestSuite scan = new TestSuite("CoveredIdxScanTests");
+ BaseTestSuite scan = new BaseTestSuite("CoveredIdxScanTests");
int iterations = 700, repeats = 4;
scan.addTest(new CoveredIdxScan("ScanCoveredIdxInt",iterations,repeats));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java Tue Jul 8 13:51:51 2014
@@ -21,9 +21,12 @@ limitations under the License.
package org.apache.derbyTesting.perf.basic.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
/**
@@ -43,7 +46,7 @@ public class HeapScan extends JDBCPerfTe
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("HeapScanTests");
+ BaseTestSuite suite = new BaseTestSuite("HeapScanTests");
suite.addTest(baseSuite("HeapScan:CHAR", false));
suite.addTest(baseSuite("HeapScan:BINARY", true));
return suite;
@@ -61,7 +64,7 @@ public class HeapScan extends JDBCPerfTe
private static Test baseSuite(String name, boolean binaryData) {
int iterations = 700, repeats = 4;
- TestSuite heapScan = new TestSuite(name);
+ BaseTestSuite heapScan = new BaseTestSuite(name);
heapScan.addTest(new HeapScan("Scan100", binaryData,
iterations, repeats));
heapScan.addTest(new HeapScan("Scan100GetData", binaryData,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java Tue Jul 8 13:51:51 2014
@@ -25,7 +25,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Random;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
@@ -80,7 +80,7 @@ public class IndexScanTest extends JDBCP
* @return a test suite
*/
public static Test suite() {
- TestSuite suite = new TestSuite("IndexScanTest");
+ BaseTestSuite suite = new BaseTestSuite("IndexScanTest");
suite.addTest(new IndexScanTest("varchar10", 5000, 4));
suite.addTest(new IndexScanTest("varchar100", 5000, 4));
suite.addTest(new IndexScanTest("varchar1000", 5000, 4));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java Tue Jul 8 13:51:51 2014
@@ -24,7 +24,7 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
@@ -81,7 +81,7 @@ public class SelectDistinctTest extends
* @return all test cases in this class
*/
public static Test suite() {
- TestSuite suite = new TestSuite("SelectDistinctTest");
+ BaseTestSuite suite = new BaseTestSuite("SelectDistinctTest");
suite.addTest(new SelectDistinctTest(TEST_CHAR5, 2000, 4));
suite.addTest(new SelectDistinctTest(TEST_BINARY5, 2000, 4));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java Tue Jul 8 13:51:51 2014
@@ -21,9 +21,12 @@ limitations under the License.
package org.apache.derbyTesting.perf.basic.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
/**
@@ -43,7 +46,7 @@ public class SortTest extends JDBCPerfTe
{
int iterations = 350, repeats = 4;
- TestSuite suite = new TestSuite("SortTests");
+ BaseTestSuite suite = new BaseTestSuite("SortTests");
suite.addTest(new SortTest("SortDesc100",iterations,repeats));
suite.addTest(new SortTest("SortDesc100GetData",iterations,repeats));
return new BaseLoad100TestSetup(suite,rowcount,tableName);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java Tue Jul 8 13:51:51 2014
@@ -19,14 +19,13 @@
*/
package org.apache.derbyTesting.perf.basic.jdbc;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Add performance tests that use VALUES statement
@@ -43,14 +42,14 @@ public class ValuesTest extends JDBCPerf
int iterations = 100000;
int repeats = 4;
- TestSuite suite = new TestSuite("ValuesTest");
+ BaseTestSuite suite = new BaseTestSuite("ValuesTest");
// To add embed tests.
suite.addTest(new ValuesTest("fetchByColumnName",iterations,repeats));
suite.addTest(new ValuesTest("fetchByColumnNumber",iterations,repeats));
// To add client tests.
- TestSuite client = new TestSuite("Client_ValuesTest");
+ BaseTestSuite client = new BaseTestSuite("Client_ValuesTest");
client.addTest(new ValuesTest("fetchByColumnName",iterations,repeats));
client.addTest(new ValuesTest("fetchByColumnNumber",iterations,repeats));
suite.addTest(TestConfiguration.clientServerDecorator(client));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Checks.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Checks.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Checks.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Checks.java Tue Jul 8 13:51:51 2014
@@ -22,11 +22,9 @@ package org.apache.derbyTesting.system.o
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Assert;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
import org.apache.derbyTesting.system.oe.util.HandleCheckError;
import org.apache.derbyTesting.system.oe.util.OEChecks;
@@ -78,7 +76,9 @@ public class Checks extends JDBCPerfTest
* @param scale
*/
public static Test checkAllRowCounts(short scale) {
- TestSuite suite = new TestSuite("Order Entry -Check Row Counts");
+ BaseTestSuite suite =
+ new BaseTestSuite("Order Entry -Check Row Counts");
+
suite.addTest(new Checks("testWarehouseRows", scale));
suite.addTest(new Checks("testStockRows", scale));
suite.addTest(new Checks("testItemRows", scale));
@@ -98,7 +98,9 @@ public class Checks extends JDBCPerfTest
*/
public static Test consistencyChecks()
{
- TestSuite suite = new TestSuite("Order Entry -Consistency checks");
+ BaseTestSuite suite =
+ new BaseTestSuite("Order Entry -Consistency checks");
+
suite.addTest(new Checks("testCondition1"));
suite.addTest(new Checks("testCondition2"));
suite.addTest(new Checks("testCondition3"));
@@ -112,7 +114,7 @@ public class Checks extends JDBCPerfTest
* database
*/
public static Test suite() {
- TestSuite suite = new TestSuite("OrderEntry - checks");
+ BaseTestSuite suite = new BaseTestSuite("OrderEntry - checks");
suite.addTest(checkAllRowCounts((short) 1));
suite.addTest(consistencyChecks());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Populate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Populate.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Populate.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Populate.java Tue Jul 8 13:51:51 2014
@@ -20,12 +20,9 @@
package org.apache.derbyTesting.system.oe.run;
import java.sql.SQLException;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
import org.apache.derbyTesting.system.oe.client.Load;
@@ -152,7 +149,7 @@ public class Populate extends JDBCPerfTe
*/
public static Test suite() {
- TestSuite suite = new TestSuite("Order Entry");
+ BaseTestSuite suite = new BaseTestSuite("Order Entry");
suite.addTest(new Populate("testCreateDB"));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Schema.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Schema.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Schema.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/run/Schema.java Tue Jul 8 13:51:51 2014
@@ -23,10 +23,8 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.PrivilegedActionException;
import java.sql.SQLException;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBCPerfTestCase;
/**
@@ -53,7 +51,7 @@ public class Schema extends JDBCPerfTest
* @return the tests to run
*/
public static Test suite() {
- TestSuite suite = new TestSuite("Order Entry- Schema");
+ BaseTestSuite suite = new BaseTestSuite("Order Entry- Schema");
// Create Schema
addBaseSchema(suite);
@@ -61,7 +59,7 @@ public class Schema extends JDBCPerfTest
return suite;
}
- public static void addBaseSchema(TestSuite suite) {
+ public static void addBaseSchema(BaseTestSuite suite) {
// Create Schema
suite.addTest(new Schema("schema.sql"));
suite.addTest(new Schema("dataroutines.sql"));
@@ -73,7 +71,7 @@ public class Schema extends JDBCPerfTest
*
* @param suite
*/
- static void addConstraints(TestSuite suite) {
+ static void addConstraints(BaseTestSuite suite) {
suite.addTest(new Schema("primarykey.sql"));
suite.addTest(new Schema("foreignkey.sql"));
suite.addTest(new Schema("index.sql"));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java Tue Jul 8 13:51:51 2014
@@ -20,19 +20,17 @@
package org.apache.derbyTesting.system.oe.test;
+import java.sql.Connection;
+import java.sql.SQLException;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.system.oe.direct.SimpleNonStandardOperations;
import org.apache.derbyTesting.system.oe.run.Checks;
import org.apache.derbyTesting.system.oe.run.Populate;
import org.apache.derbyTesting.system.oe.run.Schema;
-import java.sql.Connection;
-import java.sql.SQLException;
-
/**
* Test the basic functionality of the Order Entry test
* using scale 1 as a functional test, to ensure that changes to the
@@ -48,7 +46,7 @@ public class OETest extends BaseJDBCTest
public static Test suite() {
- TestSuite suite = new TestSuite("Order Entry");
+ BaseTestSuite suite = new BaseTestSuite("Order Entry");
suite.addTest(Schema.suite());
// Test load part
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/_Suite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/_Suite.java Tue Jul 8 13:51:51 2014
@@ -20,9 +20,8 @@
package org.apache.derbyTesting.system.oe.test;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
public class _Suite extends BaseTestCase {
@@ -35,7 +34,7 @@ public class _Suite extends BaseTestCase
public static Test suite() {
- TestSuite suite = new TestSuite("oe");
+ BaseTestSuite suite = new BaseTestSuite("oe");
suite.addTest(OETest.suite());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java Tue Jul 8 13:51:51 2014
@@ -23,9 +23,9 @@ package org.apache.derbyTesting.unitTest
import java.io.IOException;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.iapi.services.io.ArrayInputStream;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Unit tests for {@code org.apache.derby.iapi.services.io.ArrayInputStream}.
@@ -33,7 +33,7 @@ import org.apache.derbyTesting.junit.Bas
public class ArrayInputStreamTest extends BaseTestCase {
public static Test suite() {
- return new TestSuite(ArrayInputStreamTest.class);
+ return new BaseTestSuite(ArrayInputStreamTest.class);
}
public ArrayInputStreamTest(String name) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java Tue Jul 8 13:51:51 2014
@@ -21,10 +21,9 @@
package org.apache.derbyTesting.unitTests.junit;
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.shared.common.sanity.AssertFailure;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
/**
@@ -52,7 +51,7 @@ public class AssertFailureTest extends B
}
public static Test suite() {
- TestSuite suite = new TestSuite("AssertFailureTest");
+ BaseTestSuite suite = new BaseTestSuite("AssertFailureTest");
try {
//Only add the tests if this is a sane build.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java Tue Jul 8 13:51:51 2014
@@ -24,13 +24,11 @@ package org.apache.derbyTesting.unitTest
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.impl.io.vfmem.BlockedByteArray;
import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Basic tests of the {@code BlockedByteArrayTest}.
@@ -163,7 +161,7 @@ public class BlockedByteArrayTest
}
public static Test suite() {
- return new TestSuite(BlockedByteArrayTest.class);
+ return new BaseTestSuite(BlockedByteArrayTest.class);
}
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java Tue Jul 8 13:51:51 2014
@@ -24,11 +24,11 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.CharacterStreamDescriptor;
import org.apache.derby.iapi.types.PositionedStream;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Simple tests of the character stream descriptor class.
@@ -158,7 +158,7 @@ public class CharacterStreamDescriptorTe
}
public static Test suite() {
- return new TestSuite(CharacterStreamDescriptorTest.class,
+ return new BaseTestSuite(CharacterStreamDescriptorTest.class,
"CharacterStreamDescriptorTest suite");
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java Tue Jul 8 13:51:51 2014
@@ -25,12 +25,10 @@ import java.io.DataInput;
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
-
-import org.apache.derby.iapi.services.io.DataInputUtil;
-
import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.apache.derby.iapi.services.io.DataInputUtil;
+import org.apache.derbyTesting.junit.BaseTestSuite;
/**
* Test case for DataInputUtil.
@@ -70,6 +68,7 @@ public class DataInputUtilTest extends T
* Returns a suite of tests.
*/
public static Test suite() {
- return new TestSuite(DataInputUtilTest.class, "DataInputUtilTest tests");
+ return new BaseTestSuite(
+ DataInputUtilTest.class, "DataInputUtilTest tests");
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java Tue Jul 8 13:51:51 2014
@@ -22,8 +22,8 @@
package org.apache.derbyTesting.unitTests.junit;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DerbyVersion;
/**
@@ -54,7 +54,8 @@ public class DerbyVersionTest
super(name);
}
public static Test suite() {
- return new TestSuite(DerbyVersionTest.class, "DerbyVersionTest tests");
+ return new BaseTestSuite(
+ DerbyVersionTest.class, "DerbyVersionTest tests");
}
public void testLessThan() {