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 [6/11] - in
/db/derby/code/trunk/java/testing/org/apache: derby/ derby/client/am/
derby/impl/jdbc/ derbyTesting/functionTests/harness/
derbyTesting/functionTests/suites/
derbyTesting/functionTests/tests/compatibility/ derbyTesting/...
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java Tue Jul 8 13:51:51 2014
@@ -33,10 +33,10 @@ import java.sql.Types;
import java.util.Arrays;
import java.util.Locale;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.functionTests.util.ProcedureTest;
import org.apache.derbyTesting.functionTests.util.TestUtil;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.LocaleTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -64,7 +64,7 @@ public class LangProcedureTest extends B
*/
public static Test suite() {
if (JDBC.vmSupportsJSR169()) {
- return new TestSuite(
+ return new BaseTestSuite(
"Empty LangProcedureTest. " +
"JSR169 does not support jdbc:default:connection");
} else {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java Tue Jul 8 13:51:51 2014
@@ -20,9 +20,8 @@
package org.apache.derbyTesting.functionTests.tests.lang;
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.TestConfiguration;
@@ -120,14 +119,14 @@ public final class LangScripts extends S
*/
public static Test suite() {
- TestSuite suite = new TestSuite("LangScripts");
+ BaseTestSuite suite = new BaseTestSuite("LangScripts");
suite.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
suite.addTest(getSuite(EMBEDDED_TESTS));
if (JDBC.vmSupportsJDBC3())
suite.addTest(getSuite(JDBC3_TESTS));
// Set up the scripts run with the network client
- TestSuite clientTests = new TestSuite("LangScripts:client");
+ BaseTestSuite clientTests = new BaseTestSuite("LangScripts:client");
clientTests.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
Test client = TestConfiguration.clientServerDecorator(clientTests);
@@ -151,7 +150,7 @@ public final class LangScripts extends S
*/
private static Test getSuite(String[] list)
{
- TestSuite suite = new TestSuite("SQL scripts");
+ BaseTestSuite suite = new BaseTestSuite("SQL scripts");
for (int i = 0; i < list.length; i++)
suite.addTest(
new CleanDatabaseTestSetup(
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java Tue Jul 8 13:51:51 2014
@@ -19,20 +19,17 @@
package org.apache.derbyTesting.functionTests.tests.lang;
+import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Connection;
-import java.sql.ResultSet;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests the lazy creation functionality of default schema: the schema
@@ -335,11 +332,12 @@ protected void tearDown() throws Except
}
public static Test suite() {
- TestSuite suite = new TestSuite("LazyDefaultSchemaCreationTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("LazyDefaultSchemaCreationTest");
- TestSuite[] suites = {
- new TestSuite("LazyDefaultSchemaCreationTest:embedded"),
- new TestSuite("LazyDefaultSchemaCreationTest:clientServer") };
+ BaseTestSuite[] suites = {
+ new BaseTestSuite("LazyDefaultSchemaCreationTest:embedded"),
+ new BaseTestSuite("LazyDefaultSchemaCreationTest:clientServer") };
for (int i=0; i < 2; i++) {
suites[i].addTest(DatabasePropertyTestSetup.setLockTimeouts
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java Tue Jul 8 13:51:51 2014
@@ -19,18 +19,14 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLWarning;
-
+import java.sql.SQLException;
+import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -49,7 +45,7 @@ public final class LojReorderTest extend
public static Test suite()
{
- TestSuite suite = new TestSuite("LojReorderTest Test");
+ BaseTestSuite suite = new BaseTestSuite("LojReorderTest Test");
suite.addTest(TestConfiguration.defaultSuite(LojReorderTest.class));
return suite;
}
@@ -23874,4 +23870,4 @@ public final class LojReorderTest extend
st.close();
rollback();
}
-}
\ No newline at end of file
+}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java Tue Jul 8 13:51:51 2014
@@ -24,22 +24,13 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.SQLWarning;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.LocaleTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -123,7 +114,8 @@ public class LuceneBackupTest extends Ge
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite( LuceneBackupTest.class );
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ LuceneBackupTest.class );
Test secureTest = new SecurityManagerSetup( suite, POLICY_FILE );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java Tue Jul 8 13:51:51 2014
@@ -21,39 +21,19 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Date;
-import java.sql.Statement;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.sql.SQLException;
import java.util.Locale;
import java.util.Properties;
-import org.apache.lucene.analysis.Analyzer;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derby.iapi.sql.conn.ConnectionUtil;
import org.apache.derby.optional.api.LuceneIndexDescriptor;
import org.apache.derby.optional.api.LuceneUtils;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.LocaleTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.lucene.analysis.Analyzer;
/**
* <p>
@@ -121,7 +101,8 @@ public class LuceneCoarseAuthorizationTe
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(LuceneCoarseAuthorizationTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ LuceneCoarseAuthorizationTest.class);
Test unsecureTest = SecurityManagerSetup.noSecurityManager( suite );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java Tue Jul 8 13:51:51 2014
@@ -22,17 +22,9 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import java.sql.Connection;
-import java.sql.SQLException;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Arrays;
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.Decorator;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java Tue Jul 8 13:51:51 2014
@@ -21,18 +21,12 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.functionTests.tests.memorydb.MemoryDbManager;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -90,7 +84,7 @@ public class LuceneInMemoryTest extends
public static Test suite()
{
- TestSuite suite = new TestSuite( "LuceneInMemoryTest" );
+ BaseTestSuite suite = new BaseTestSuite( "LuceneInMemoryTest" );
Test baseTest = TestConfiguration.embeddedSuite( LuceneInMemoryTest.class );
suite.addTest( SecurityManagerSetup.noSecurityManager( baseTest) );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java Tue Jul 8 13:51:51 2014
@@ -21,26 +21,15 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.io.File;
import java.net.URL;
import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.optional.api.LuceneUtils;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -136,7 +125,8 @@ public class LuceneJarLoadingTest extend
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite( LuceneJarLoadingTest.class );
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ LuceneJarLoadingTest.class );
Test secureTest = new SecurityManagerSetup( suite, POLICY_FILE );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java Tue Jul 8 13:51:51 2014
@@ -21,13 +21,10 @@
*/
package org.apache.derbyTesting.functionTests.tests.lang;
-import org.apache.derbyTesting.junit.BaseTestCase;
-
import java.util.Properties;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -45,7 +42,7 @@ public class LuceneSuite extends BaseTes
public static Test suite()
{
- TestSuite suite = new TestSuite("LuceneSuite");
+ BaseTestSuite suite = new BaseTestSuite("LuceneSuite");
Properties properties = TestConfiguration.getSystemProperties();
//
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java Tue Jul 8 13:51:51 2014
@@ -27,42 +27,31 @@ import java.math.BigDecimal;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
import java.sql.Date;
import java.sql.DriverManager;
-import java.sql.Statement;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derby.iapi.sql.conn.ConnectionUtil;
import org.apache.derby.optional.api.LuceneIndexDescriptor;
import org.apache.derby.optional.api.LuceneUtils;
-
-import org.apache.derby.iapi.sql.conn.ConnectionUtil;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.LocaleTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.Version;
/**
* <p>
@@ -165,7 +154,8 @@ public class LuceneSupportPermsTest exte
String luceneVersion = getSystemProperty( LUCENE_VERSION_PROPERTY );
if ( luceneVersion != null ) { LUCENE_VERSION = luceneVersion; }
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(LuceneSupportPermsTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ LuceneSupportPermsTest.class);
Test secureTest = new SecurityManagerSetup( suite, POLICY_FILE );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java Tue Jul 8 13:51:51 2014
@@ -32,33 +32,27 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.util.Version;
-
import org.apache.derby.optional.api.LuceneIndexDescriptor;
import org.apache.derby.optional.api.LuceneUtils;
-
-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.LocaleTestSetup;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.util.Version;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
/**
* <p>
@@ -75,7 +69,7 @@ public class LuceneSupportTest extends B
}
public static Test suite() {
- TestSuite suite = new TestSuite("LuceneSupportTest");
+ BaseTestSuite suite = new BaseTestSuite("LuceneSupportTest");
Test baseTest = TestConfiguration.embeddedSuite(LuceneSupportTest.class);
Test singleUseTest = TestConfiguration.singleUseDatabaseDecorator( baseTest );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java Tue Jul 8 13:51:51 2014
@@ -24,31 +24,22 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.sql.Blob;
import java.sql.Clob;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
+import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.DriverManager;
-import java.util.Arrays;
+import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derby.iapi.util.StringUtil;
-import org.apache.derby.catalog.DefaultInfo;
import org.apache.derby.iapi.types.HarmonySerialBlob;
import org.apache.derby.iapi.types.HarmonySerialClob;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.Decorator;
-import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -150,7 +141,7 @@ public class MergeStatementTest extends
*/
public static Test suite()
{
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
suite.addTest( standardDecoration( false ) );
suite.addTest( standardDecoration( true ) );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java Tue Jul 8 13:51:51 2014
@@ -30,9 +30,8 @@ import java.sql.SQLException;
import java.sql.SQLWarning;
import java.util.Properties;
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.ClasspathSetup;
import org.apache.derbyTesting.junit.DatabaseChangeSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -344,7 +343,7 @@ public class NativeAuthenticationService
*/
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
//
// Special version of the test which uses an encrypted database for credentials.
@@ -394,7 +393,7 @@ public class NativeAuthenticationService
*/
private static Test allConfigurations(boolean clientServer) throws Exception
{
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
//
// No authentication.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java Tue Jul 8 13:51:51 2014
@@ -22,35 +22,26 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import java.io.StringWriter;
-import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.Decorator;
-import org.apache.derbyTesting.junit.SecurityManagerSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBC;
-
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.impl.jdbc.EmbedConnection;
-import org.apache.derby.iapi.sql.Activation;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* <p>
@@ -106,7 +97,7 @@ public class NewOptimizerOverridesTest
*/
public static Test suite()
{
- TestSuite suite = new TestSuite( "NewOptimizerOverridesTest" );
+ BaseTestSuite suite = new BaseTestSuite("NewOptimizerOverridesTest");
suite.addTest( TestConfiguration.embeddedSuite( NewOptimizerOverridesTest.class ) );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java Tue Jul 8 13:51:51 2014
@@ -28,11 +28,9 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SQLUtilities;
@@ -355,7 +353,7 @@ public class NullIfTest extends BaseJDBC
* @return test suite
*/
public static Test suite() {
- TestSuite suite = new TestSuite("NullIfTest");
+ BaseTestSuite suite = new BaseTestSuite("NullIfTest");
suite.addTest(baseSuite("NullIfTest:embedded"));
@@ -365,7 +363,7 @@ public class NullIfTest extends BaseJDBC
}
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(NullIfTest.class);
return new CleanDatabaseTestSetup(suite) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java Tue Jul 8 13:51:51 2014
@@ -21,7 +21,6 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -30,14 +29,11 @@ import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Types;
import java.util.Enumeration;
-
import junit.framework.Test;
import junit.framework.TestFailure;
import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -59,7 +55,9 @@ public class NullableUniqueConstraintTes
* run.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("NullableUniqueConstraintTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("NullableUniqueConstraintTest");
+
suite.addTest(TestConfiguration.defaultSuite(
NullableUniqueConstraintTest.class));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java Tue Jul 8 13:51:51 2014
@@ -21,20 +21,17 @@
package org.apache.derbyTesting.functionTests.tests.lang;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
import java.sql.Statement;
-import java.sql.ResultSetMetaData;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
/**
* OLAP functionality test.
@@ -54,7 +51,7 @@ public class OLAPTest extends BaseJDBCTe
public static Test makeSuite() {
Test clean = new CleanDatabaseTestSetup(
- new TestSuite(OLAPTest.class)) {
+ new BaseTestSuite(OLAPTest.class)) {
protected void decorateSQL(Statement s)
throws SQLException
{
@@ -86,7 +83,7 @@ public class OLAPTest extends BaseJDBCTe
public static Test suite()
{
- TestSuite suite = new TestSuite("OLAPTest");
+ BaseTestSuite suite = new BaseTestSuite("OLAPTest");
suite.addTest(makeSuite());
suite.addTest(TestConfiguration.clientServerDecorator(makeSuite()));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java Tue Jul 8 13:51:51 2014
@@ -29,8 +29,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -65,7 +65,7 @@ public class OffsetFetchNextTest extends
}
public static Test suite() {
- TestSuite suite = new TestSuite("OffsetFetchNextTest");
+ BaseTestSuite suite = new BaseTestSuite("OffsetFetchNextTest");
suite.addTest(
baseSuite("OffsetFetchNextTest:embedded"));
@@ -78,7 +78,7 @@ public class OffsetFetchNextTest extends
public static Test baseSuite(String suiteName) {
return new CleanDatabaseTestSetup(
- new TestSuite(OffsetFetchNextTest.class,
+ new BaseTestSuite(OffsetFetchNextTest.class,
suiteName)) {
@Override
protected void decorateSQL(Statement s)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java Tue Jul 8 13:51:51 2014
@@ -21,24 +21,11 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.util.HashMap;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.Decorator;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.JDBC;
/**
* <p>
@@ -99,7 +86,9 @@ public class OptionalToolsTest extends
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(OptionalToolsTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ OptionalToolsTest.class);
+
Test test = DatabasePropertyTestSetup.builtinAuthentication
( suite, LEGAL_USERS, "optionalToolsPermissions" );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java Tue Jul 8 13:51:51 2014
@@ -26,8 +26,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
@@ -56,7 +56,8 @@ public class OrderByAndOffsetFetchInSubq
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("OrderByAndOffsetFetchInSubqueries");
+ BaseTestSuite suite =
+ new BaseTestSuite("OrderByAndOffsetFetchInSubqueries");
suite.addTest(makeSuite());
suite.addTest(
@@ -73,7 +74,7 @@ public class OrderByAndOffsetFetchInSubq
private static Test makeSuite()
{
return new CleanDatabaseTestSetup(
- new TestSuite(OrderByAndOffsetFetchInSubqueries.class)) {
+ new BaseTestSuite(OrderByAndOffsetFetchInSubqueries.class)) {
@Override
protected void decorateSQL(Statement s)
throws SQLException {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java Tue Jul 8 13:51:51 2014
@@ -23,17 +23,17 @@ package org.apache.derbyTesting.function
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.ResultSet;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.SQLUtilities;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Tests for DERBY-3926. Optimizer is choosing to avoid sort which is
@@ -52,7 +52,7 @@ public class OrderByAndSortAvoidance ext
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("OrderByAndSortAvoidance");
+ BaseTestSuite suite = new BaseTestSuite("OrderByAndSortAvoidance");
suite.addTest(makeSuite());
@@ -70,7 +70,7 @@ public class OrderByAndSortAvoidance ext
private static Test makeSuite()
{
return new CleanDatabaseTestSetup(
- new TestSuite(OrderByAndSortAvoidance.class)) {
+ new BaseTestSuite(OrderByAndSortAvoidance.class)) {
protected void decorateSQL(Statement st)
throws SQLException {
st.executeUpdate("create table a(col1 int, col2 int)");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java Tue Jul 8 13:51:51 2014
@@ -19,20 +19,19 @@ limitations under the License.
*/
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
import java.sql.SQLWarning;
-
+import java.sql.Statement;
import java.sql.Timestamp;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -50,7 +49,7 @@ public final class OuterJoinTest extends
public static Test suite()
{
//Add the test case into the test suite
- TestSuite suite = new TestSuite("OuterJoinTest Test");
+ BaseTestSuite suite = new BaseTestSuite("OuterJoinTest Test");
return TestConfiguration.defaultSuite(OuterJoinTest.class);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java Tue Jul 8 13:51:51 2014
@@ -1,19 +1,16 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.Statement;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
-import java.sql.SQLWarning;
+import java.sql.Statement;
import java.util.Arrays;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
@@ -53,7 +50,7 @@ public final class PredicatePushdownTest
public static Test suite() {
Properties systemProperties = new Properties();
systemProperties.setProperty("derby.optimizer.noTimeout","true");
- TestSuite suite = new TestSuite("predicatePushdown Test");
+ BaseTestSuite suite = new BaseTestSuite("predicatePushdown Test");
suite.addTest(new SystemPropertyTestSetup(new CleanDatabaseTestSetup(TestConfiguration
.embeddedSuite(PredicatePushdownTest.class)),systemProperties));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java Tue Jul 8 13:51:51 2014
@@ -21,15 +21,18 @@
package org.apache.derbyTesting.functionTests.tests.lang;
+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 org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.sql.*;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test the dependency system for active statements when
* a DDL is executed in a separate connection after the
@@ -86,7 +89,7 @@ public class PrepareExecuteDDL extends B
* as well.
*/
public static Test suite() {
- TestSuite suite = new TestSuite("PrepareExecuteDDL");
+ BaseTestSuite suite = new BaseTestSuite("PrepareExecuteDDL");
for (int i = 0; i < DDL.length; i++)
suite.addTest(new PrepareExecuteDDL("testPrepareExcute", DDL[i]));
return TestConfiguration.sqlAuthorizationDecorator(suite);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java Tue Jul 8 13:51:51 2014
@@ -26,8 +26,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.JDBC;
public class PrimaryKeyTest extends BaseJDBCTestCase
@@ -36,7 +36,7 @@ public class PrimaryKeyTest extends Base
super(name);
}
public static Test suite() {
- return new TestSuite(PrimaryKeyTest.class);
+ return new BaseTestSuite(PrimaryKeyTest.class);
}
@Override
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java Tue Jul 8 13:51:51 2014
@@ -24,14 +24,11 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -457,7 +454,7 @@ public class ProcedureInTriggerTest exte
private static Test basesuite() {
- Test basesuite = new TestSuite(ProcedureInTriggerTest.class);
+ Test basesuite = new BaseTestSuite(ProcedureInTriggerTest.class);
Test clean = new CleanDatabaseTestSetup(basesuite) {
protected void decorateSQL(Statement s) throws SQLException {
s.execute("create table t1 (i int primary key, b char(15))");
@@ -491,7 +488,7 @@ public class ProcedureInTriggerTest exte
}
public static Test suite() {
- TestSuite suite = new TestSuite();
+ BaseTestSuite suite = new BaseTestSuite();
if (!JDBC.vmSupportsJSR169()) {
suite.addTest(basesuite());
suite.addTest(TestConfiguration.clientServerDecorator(basesuite()));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java Tue Jul 8 13:51:51 2014
@@ -24,8 +24,8 @@ package org.apache.derbyTesting.function
import java.sql.SQLException;
import java.sql.Statement;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
/**
@@ -38,7 +38,7 @@ public class ReferentialActionsTest exte
}
public static Test suite() {
- TestSuite suite = new TestSuite("ReferentialActionsTest");
+ BaseTestSuite suite = new BaseTestSuite("ReferentialActionsTest");
// DERBY-2353: Need to set derby.language.logQueryPlan to expose the
// bug (got a NullPointerException when writing the plan to derby.log)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java Tue Jul 8 13:51:51 2014
@@ -25,15 +25,13 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
+import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Tests for forupdate.
@@ -85,14 +83,16 @@ public class ReleaseCompileLocksTest ext
* Create a suite of tests.
**/
public static Test suite() {
- TestSuite suite = new TestSuite("ReleasecompileLocksTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("ReleasecompileLocksTest");
+
suite.addTest(baseSuite("ReleaseCompileLocksTest:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ReleaseCompileLocksTest:client")));
return suite;
}
protected static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(ReleaseCompileLocksTest.class);
return new CleanDatabaseTestSetup(suite)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java Tue Jul 8 13:51:51 2014
@@ -25,13 +25,11 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -80,7 +78,9 @@ public class RestrictedVTITest extends
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(RestrictedVTITest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ RestrictedVTITest.class);
+
Test result = new CleanDatabaseTestSetup( suite );
return result;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java Tue Jul 8 13:51:51 2014
@@ -34,7 +34,7 @@ import java.io.PrintStream;
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
@@ -499,7 +499,7 @@ public class ResultSetsFromPreparedState
*/
public static Test suite()
{
- TestSuite suite = new TestSuite
+ BaseTestSuite suite = new BaseTestSuite
("Create ResultSets from PreparedStatements");
suite.addTestSuite(ResultSetsFromPreparedStatementTest.class);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java Tue Jul 8 13:51:51 2014
@@ -21,23 +21,22 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
import java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
/**
* This tests that SQL roles actually confer the correct privileges, that is,
@@ -83,7 +82,8 @@ public class RolesConferredPrivilegesTes
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("RolesConferredPrivilegesTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("RolesConferredPrivilegesTest");
suite.addTest(makeSuite());
@@ -105,7 +105,7 @@ public class RolesConferredPrivilegesTes
* sqlAuthorization.
*/
Test clean = new CleanDatabaseTestSetup(
- new TestSuite(RolesConferredPrivilegesTest.class)) {
+ new BaseTestSuite(RolesConferredPrivilegesTest.class)) {
protected void decorateSQL(Statement s)
throws SQLException {
/*
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java Tue Jul 8 13:51:51 2014
@@ -21,22 +21,21 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import javax.sql.PooledConnection;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
import javax.sql.ConnectionPoolDataSource;
+import javax.sql.PooledConnection;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.J2EEDataSource;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.J2EEDataSource;
/**
* This JUnit tests the SQL roles feature. This feature relies on
@@ -128,7 +127,7 @@ public class RolesTest extends BaseJDBCT
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("RolesTest");
+ BaseTestSuite suite = new BaseTestSuite("RolesTest");
/* Negative syntax tests */
suite.addTest(negativeSyntaxSuite("suite: negative syntax, embedded"));
@@ -168,11 +167,11 @@ public class RolesTest extends BaseJDBCT
*/
private static Test negativeSyntaxSuite(String framework)
{
- TestSuite suite = new TestSuite("roles:"+framework);
+ BaseTestSuite suite = new BaseTestSuite("roles:"+framework);
/* Tests running without sql authorization set.
*/
- TestSuite noauthSuite = new TestSuite(
+ BaseTestSuite noauthSuite = new BaseTestSuite(
"suite: security level=noSqlAuthorization");
noauthSuite.addTest(new RolesTest("testNegativeSyntax",
NO_SQLAUTHORIZATION,
@@ -329,7 +328,7 @@ public class RolesTest extends BaseJDBCT
* Tests running without sql authorization set. The purpose
* of this is just to make sure the proper errors are given.
*/
- TestSuite noauthSuite = new TestSuite(
+ BaseTestSuite noauthSuite = new BaseTestSuite(
"suite: security level=noSqlAuthorization");
noauthSuite.addTest(new RolesTest("testSemantics",
NO_SQLAUTHORIZATION,
@@ -340,7 +339,7 @@ public class RolesTest extends BaseJDBCT
* First decorate with users, then with authentication +
* sqlAuthorization.
*/
- TestSuite suite = new TestSuite("roles:"+framework);
+ BaseTestSuite suite = new BaseTestSuite("roles:"+framework);
suite.addTest(noauthSuite);
suite.addTest(wrapInAuthorization("testSemantics"));
@@ -357,8 +356,8 @@ public class RolesTest extends BaseJDBCT
private static Test wrapInAuthorization(String testName)
{
// add decorator for different users authenticated
- TestSuite usersSuite =
- new TestSuite("suite: security level=sqlAuthorization");
+ BaseTestSuite usersSuite =
+ new BaseTestSuite("suite: security level=sqlAuthorization");
// First decorate with users (except "additionaluser"), then
// with authorization decorator
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java Tue Jul 8 13:51:51 2014
@@ -30,11 +30,9 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Time;
import java.sql.Types;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -55,7 +53,8 @@ public class RoutineTest extends BaseJDB
}
public static Test suite() {
- TestSuite suite = new TestSuite(RoutineTest.class, "RoutineTest");
+ BaseTestSuite suite =
+ new BaseTestSuite(RoutineTest.class, "RoutineTest");
return new CleanDatabaseTestSetup(suite);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java Tue Jul 8 13:51:51 2014
@@ -21,19 +21,19 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
import java.sql.Connection;
-import java.sql.Statement;
+import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.DriverManager;
+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.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* Test that routines declared with EXTERNAL SECURITY DEFINER/INVOKER behaves
@@ -79,7 +79,7 @@ public class RoutinesDefinersRightsTest
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("RoutinesDefinersRightsTest");
+ BaseTestSuite suite = new BaseTestSuite("RoutinesDefinersRightsTest");
if (!JDBC.vmSupportsJSR169()) {
// JSR169 cannot run with tests with stored procedures
@@ -108,7 +108,7 @@ public class RoutinesDefinersRightsTest
* sqlAuthorization.
*/
Test clean = new CleanDatabaseTestSetup(
- new TestSuite(RoutinesDefinersRightsTest.class)) {
+ new BaseTestSuite(RoutinesDefinersRightsTest.class)) {
protected void decorateSQL(Statement s)
throws SQLException {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java Tue Jul 8 13:51:51 2014
@@ -20,21 +20,17 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.io.IOException;
import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
public class SQLAuthorizationPropTest extends BaseJDBCTestCase {
@@ -43,8 +39,8 @@ public class SQLAuthorizationPropTest ex
}
public static Test suite() {
- TestSuite suite = new TestSuite(SQLAuthorizationPropTest.class,
- "SQLAuthorizationPropTest");
+ BaseTestSuite suite = new BaseTestSuite(
+ SQLAuthorizationPropTest.class, "SQLAuthorizationPropTest");
// Use DatabasePropertyTestSetup decorator to set the property
// required by this test (and shutdown the database for the
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java Tue Jul 8 13:51:51 2014
@@ -21,19 +21,18 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
+import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.DriverManager;
+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.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.TestConfiguration;
import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* SQLSessionContextTest tests the SQL session context stacking,
@@ -111,7 +110,7 @@ public class SQLSessionContextTest exten
*/
public static Test suite()
{
- TestSuite suite = new TestSuite("SQLSessionContextTest");
+ BaseTestSuite suite = new BaseTestSuite("SQLSessionContextTest");
/* Positive tests */
if (!JDBC.vmSupportsJSR169()) {
@@ -146,8 +145,8 @@ public class SQLSessionContextTest exten
*/
// add decorator for different users authenticated
- TestSuite usersSuite =
- new TestSuite("suite: positiveSuite");
+ BaseTestSuite usersSuite =
+ new BaseTestSuite("suite: positiveSuite");
// First decorate with users, then with authorization
// decorator
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java Tue Jul 8 13:51:51 2014
@@ -1,5 +1,5 @@
/**
- * Derby - Class org.apache.derbyTesting.functionTests.tests.lang.ScrollCursors1est
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.lang.ScrollCursors1Test
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,22 +22,19 @@
package org.apache.derbyTesting.functionTests.tests.lang;
import java.sql.CallableStatement;
+import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
import org.apache.derbyTesting.junit.TestConfiguration;
-import java.sql.Connection;
-
public class ScrollCursors1Test extends BaseJDBCTestCase {
public ScrollCursors1Test(String name) {
@@ -701,7 +698,7 @@ public class ScrollCursors1Test extends
public static Test baseSuite(String name) {
- TestSuite suite = new TestSuite(name);
+ BaseTestSuite suite = new BaseTestSuite(name);
suite.addTestSuite(ScrollCursors1Test.class);
return new CleanDatabaseTestSetup(suite) {
@@ -728,7 +725,7 @@ public class ScrollCursors1Test extends
}
public static Test suite() {
- TestSuite suite = new TestSuite("ScrollCursors1");
+ BaseTestSuite suite = new BaseTestSuite("ScrollCursors1");
suite.addTest(baseSuite("ScrollCursors1:embedded"));
suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ScrollCursors1:client")));
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java Tue Jul 8 13:51:51 2014
@@ -23,14 +23,12 @@ package org.apache.derbyTesting.function
import java.io.File;
import java.security.AccessControlException;
-import java.sql.Connection;
import java.sql.CallableStatement;
+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.DerbyConstants;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
import org.apache.derbyTesting.junit.SupportFilesSetup;
@@ -89,7 +87,8 @@ public class SecurityPolicyReloadingTest
public static Test suite()
{
- TestSuite suite = new TestSuite("SecurityPolicyReloadingTest");
+ BaseTestSuite suite =
+ new BaseTestSuite("SecurityPolicyReloadingTest");
// The reloaded policy requires restricted property-reading permissions,
// which is easy to do if you can subdivide the protection domains by
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java Tue Jul 8 13:51:51 2014
@@ -26,11 +26,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
@@ -54,7 +52,7 @@ public class SelectivityTest extends Bas
props.setProperty("derby.language.statementCacheSize", "0");
// set the props, and boot the db
Test test = new DatabasePropertyTestSetup(
- new TestSuite(SelectivityTest.class), props, true);
+ new BaseTestSuite(SelectivityTest.class), props, true);
return new CleanDatabaseTestSetup(test) {
protected void decorateSQL(Statement s) throws SQLException
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java Tue Jul 8 13:51:51 2014
@@ -21,31 +21,20 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.math.BigDecimal;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.sql.Connection;
-import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Timestamp;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
-
+import org.apache.derby.catalog.SequencePreallocator;
+import org.apache.derby.iapi.store.access.TransactionController;
+import org.apache.derby.iapi.types.SQLLongint;
import org.apache.derby.impl.sql.catalog.SequenceGenerator;
import org.apache.derby.impl.sql.catalog.SequenceRange;
import org.apache.derby.impl.sql.catalog.SequenceUpdater;
-import org.apache.derby.catalog.SequencePreallocator;
-import org.apache.derby.iapi.types.SQLLongint;
-import org.apache.derby.iapi.store.access.TransactionController;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
/**
* <p>
@@ -108,7 +97,9 @@ public class SequenceGeneratorTest exte
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(SequenceGeneratorTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ SequenceGeneratorTest.class);
+
Test cleanTest = new CleanDatabaseTestSetup( suite );
Test timeoutTest = DatabasePropertyTestSetup.setLockTimeouts( cleanTest, 5, 5 );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java Tue Jul 8 13:51:51 2014
@@ -21,25 +21,12 @@
package org.apache.derbyTesting.functionTests.tests.lang;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.DriverManager;
-import java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.derby.iapi.util.StringUtil;
-import org.apache.derby.catalog.DefaultInfo;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
/**
* <p>
@@ -94,7 +81,8 @@ public class SequencePermsTest extends G
*/
public static Test suite()
{
- TestSuite suite = (TestSuite) TestConfiguration.embeddedSuite(SequencePermsTest.class);
+ BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
+ SequencePermsTest.class);
Test cleanTest = new CleanDatabaseTestSetup( suite );
Test authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java Tue Jul 8 13:51:51 2014
@@ -26,16 +26,13 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derby.iapi.reference.SQLState;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
-import org.apache.derby.iapi.reference.SQLState;
/**
* Test sequences.
@@ -60,7 +57,9 @@ public class SequenceTest extends Genera
* Construct top level suite in this JUnit test
*/
public static Test suite() {
- TestSuite suite = new TestSuite(SequenceTest.class, "Sequence Test");
+ BaseTestSuite suite =
+ new BaseTestSuite(SequenceTest.class, "Sequence Test");
+
// Need atleast JSR169 to run these tests
if (!JDBC.vmSupportsJSR169() && !JDBC.vmSupportsJDBC3()) {
return suite;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java?rev=1608782&r1=1608781&r2=1608782&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java Tue Jul 8 13:51:51 2014
@@ -29,14 +29,11 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
-
import javax.sql.DataSource;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.derby.jdbc.ClientDataSource;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
@@ -56,10 +53,9 @@ public class ShutdownDatabaseTest extend
public static Test suite() {
// Only run in embedded as running in client/server
// hits a problem. See DERBY-2477. To see the bug
- // juts use the defaultSuite.
- return new CleanDatabaseTestSetup(
- new TestSuite(ShutdownDatabaseTest.class, "ShutdownDatabaseTest"));
- // return TestConfiguration.defaultSuite(ShutdownDatabaseTest.class);
+ // just use the defaultSuite.
+ return new CleanDatabaseTestSetup(new BaseTestSuite(
+ ShutdownDatabaseTest.class, "ShutdownDatabaseTest"));
}
protected void initializeConnection(Connection conn) throws SQLException {