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/08/18 16:30:23 UTC
svn commit: r1618619 -
/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Author: dag
Date: Mon Aug 18 14:30:22 2014
New Revision: 1618619
URL: http://svn.apache.org/r1618619
Log:
DERBY-6704 Hang in AutoloadTest.spawnProcess:JDBCDriversEmbeddedTest on Mac/jdk7,8
Revert accidental commenting out of lines in previous patch for this issue.
Modified:
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?rev=1618619&r1=1618618&r2=1618619&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java Mon Aug 18 14:30:22 2014
@@ -44,134 +44,134 @@ public class _Suite extends BaseTestCase
BaseTestSuite suite = new BaseTestSuite("jdbcapi");
- // suite.addTest(BlobSetBytesBoundaryTest.suite());
- // suite.addTest(ConcurrencyTest.suite());
- // suite.addTest(DaylightSavingTest.suite());
- // suite.addTest(HoldabilityTest.suite());
- // suite.addTest(Derby5158Test.suite());
- // suite.addTest(LobLengthTest.suite());
- // suite.addTest(ProcedureTest.suite());
- // suite.addTest(SURQueryMixTest.suite());
- // suite.addTest(SURTest.suite());
- // suite.addTest(UpdatableResultSetTest.suite());
- // suite.addTest(UpdateXXXTest.suite());
- // suite.addTest(URCoveringIndexTest.suite());
- // suite.addTest(ResultSetCloseTest.suite());
- // suite.addTest(BlobClob4BlobTest.suite());
- // suite.addTest(CharacterStreamsTest.suite());
- // suite.addTest(BatchUpdateTest.suite());
- // suite.addTest(StreamTest.suite());
- // suite.addTest(DboPowersTest.suite());
- // suite.addTest(BlobStoredProcedureTest.suite());
- // suite.addTest(ClobStoredProcedureTest.suite());
- // suite.addTest(CallableTest.suite());
- // suite.addTest(ResultSetMiscTest.suite());
- // suite.addTest(PrepStmtMetaDataTest.suite());
- // suite.addTest(ScrollResultSetTest.suite());
- // suite.addTest(LobStreamsTest.suite());
- // suite.addTest(ResultSetJDBC30Test.suite());
- // suite.addTest(DatabaseMetaDataTest.suite());
- // suite.addTest(ClosedObjectTest.suite());
- // suite.addTest(SetTransactionIsolationTest.suite());
- // suite.addTest(AuthenticationTest.suite());
- // if (!JDBC.vmSupportsJSR169()) {
- // // DERBY-5069 Suites.All fails with InvocationTargetException
- // suite.addTest(DriverTest.suite());
- // }
- // suite.addTest(SURijTest.suite());
- // suite.addTest(NullSQLTextTest.suite());
- // suite.addTest(PrepStmtNullTest.suite());
- // suite.addTest(StatementJdbc30Test.suite());
- // suite.addTest(StatementJdbc20Test.suite());
- // suite.addTest(ClobTest.suite());
- // suite.addTest(BlobUpdatableStreamTest.suite());
- // suite.addTest(AIjdbcTest.suite());
- // suite.addTest(LargeDataLocksTest.suite());
- // suite.addTest(DMDBugsTest.suite());
- // suite.addTest(DataSourceTest.suite());
- // suite.addTest(SavepointJdbc30Test.suite());
- // suite.addTest(RelativeTest.suite());
- // suite.addTest(metadataMultiConnTest.suite());
- // suite.addTest(ResultSetStreamTest.suite());
- // suite.addTest(InternationalConnectSimpleDSTest.suite());
- // suite.addTest(Derby2017LayerATest.suite());
- // suite.addTest(LobRsGetterTest.suite());
-
- // // Old harness .java tests that run using the HarnessJavaTest
- // // adapter and continue to use a single master file.
- // suite.addTest(JDBCHarnessJavaTest.suite());
+ suite.addTest(BlobSetBytesBoundaryTest.suite());
+ suite.addTest(ConcurrencyTest.suite());
+ suite.addTest(DaylightSavingTest.suite());
+ suite.addTest(HoldabilityTest.suite());
+ suite.addTest(Derby5158Test.suite());
+ suite.addTest(LobLengthTest.suite());
+ suite.addTest(ProcedureTest.suite());
+ suite.addTest(SURQueryMixTest.suite());
+ suite.addTest(SURTest.suite());
+ suite.addTest(UpdatableResultSetTest.suite());
+ suite.addTest(UpdateXXXTest.suite());
+ suite.addTest(URCoveringIndexTest.suite());
+ suite.addTest(ResultSetCloseTest.suite());
+ suite.addTest(BlobClob4BlobTest.suite());
+ suite.addTest(CharacterStreamsTest.suite());
+ suite.addTest(BatchUpdateTest.suite());
+ suite.addTest(StreamTest.suite());
+ suite.addTest(DboPowersTest.suite());
+ suite.addTest(BlobStoredProcedureTest.suite());
+ suite.addTest(ClobStoredProcedureTest.suite());
+ suite.addTest(CallableTest.suite());
+ suite.addTest(ResultSetMiscTest.suite());
+ suite.addTest(PrepStmtMetaDataTest.suite());
+ suite.addTest(ScrollResultSetTest.suite());
+ suite.addTest(LobStreamsTest.suite());
+ suite.addTest(ResultSetJDBC30Test.suite());
+ suite.addTest(DatabaseMetaDataTest.suite());
+ suite.addTest(ClosedObjectTest.suite());
+ suite.addTest(SetTransactionIsolationTest.suite());
+ suite.addTest(AuthenticationTest.suite());
+ if (!JDBC.vmSupportsJSR169()) {
+ // DERBY-5069 Suites.All fails with InvocationTargetException
+ suite.addTest(DriverTest.suite());
+ }
+ suite.addTest(SURijTest.suite());
+ suite.addTest(NullSQLTextTest.suite());
+ suite.addTest(PrepStmtNullTest.suite());
+ suite.addTest(StatementJdbc30Test.suite());
+ suite.addTest(StatementJdbc20Test.suite());
+ suite.addTest(ClobTest.suite());
+ suite.addTest(BlobUpdatableStreamTest.suite());
+ suite.addTest(AIjdbcTest.suite());
+ suite.addTest(LargeDataLocksTest.suite());
+ suite.addTest(DMDBugsTest.suite());
+ suite.addTest(DataSourceTest.suite());
+ suite.addTest(SavepointJdbc30Test.suite());
+ suite.addTest(RelativeTest.suite());
+ suite.addTest(metadataMultiConnTest.suite());
+ suite.addTest(ResultSetStreamTest.suite());
+ suite.addTest(InternationalConnectSimpleDSTest.suite());
+ suite.addTest(Derby2017LayerATest.suite());
+ suite.addTest(LobRsGetterTest.suite());
+
+ // Old harness .java tests that run using the HarnessJavaTest
+ // adapter and continue to use a single master file.
+ suite.addTest(JDBCHarnessJavaTest.suite());
- // if (JDBC.vmSupportsJDBC3())
- // {
- // // Tests that do not run under JSR169
- // // DERBY-2403 blocks ParameterMappingTest from running
- // // under JSR169
- // suite.addTest(ParameterMappingTest.suite());
-
- // // Class requires javax.sql.PooledConnection
- // // even to load, even though the suite method
- // // is correctly implemented.
- // suite.addTest(DataSourcePropertiesTest.suite());
-
- // // Tests JDBC 3.0 ability to establish a result set of
- // // auto-generated keys.
- // suite.addTest(AutoGenJDBC30Test.suite());
-
- // // Test uses DriverManager
- // suite.addTest(DriverMgrAuthenticationTest.suite());
- // // Tests uses JDBC 3.0 datasources
- // suite.addTest(PoolDSAuthenticationTest.suite());
- // suite.addTest(PoolXADSCreateShutdownDBTest.suite());
- // suite.addTest(XADSAuthenticationTest.suite());
- // suite.addTest(XATransactionTest.suite());
- // suite.addTest(XATest.suite());
+ if (JDBC.vmSupportsJDBC3())
+ {
+ // Tests that do not run under JSR169
+ // DERBY-2403 blocks ParameterMappingTest from running
+ // under JSR169
+ suite.addTest(ParameterMappingTest.suite());
+
+ // Class requires javax.sql.PooledConnection
+ // even to load, even though the suite method
+ // is correctly implemented.
+ suite.addTest(DataSourcePropertiesTest.suite());
+
+ // Tests JDBC 3.0 ability to establish a result set of
+ // auto-generated keys.
+ suite.addTest(AutoGenJDBC30Test.suite());
+
+ // Test uses DriverManager
+ suite.addTest(DriverMgrAuthenticationTest.suite());
+ // Tests uses JDBC 3.0 datasources
+ suite.addTest(PoolDSAuthenticationTest.suite());
+ suite.addTest(PoolXADSCreateShutdownDBTest.suite());
+ suite.addTest(XADSAuthenticationTest.suite());
+ suite.addTest(XATransactionTest.suite());
+ suite.addTest(XATest.suite());
- // // Test uses JDBC 3.0 datasources, and javax.naming.Reference etc.
- // suite.addTest(DataSourceReferenceTest.suite());
- // suite.addTest(DataSourceSerializationTest.suite());
-
- // // Test uses DriverManager, Pooled and XADataSources, and
- // // an inner class implements ConnectionEventListener.
- // suite.addTest(J2EEDataSourceTest.suite());
- // // Test requires ClientConnectionPoolDataSource.
- // suite.addTest(ClientConnectionPoolDataSourceTest.suite());
- // // Test requires ClientConnectionPoolDataSource.
- // suite.addTest(StatementPoolingTest.suite());
+ // Test uses JDBC 3.0 datasources, and javax.naming.Reference etc.
+ suite.addTest(DataSourceReferenceTest.suite());
+ suite.addTest(DataSourceSerializationTest.suite());
+
+ // Test uses DriverManager, Pooled and XADataSources, and
+ // an inner class implements ConnectionEventListener.
+ suite.addTest(J2EEDataSourceTest.suite());
+ // Test requires ClientConnectionPoolDataSource.
+ suite.addTest(ClientConnectionPoolDataSourceTest.suite());
+ // Test requires ClientConnectionPoolDataSource.
+ suite.addTest(StatementPoolingTest.suite());
- // //suite to test updatable reader for clob in embedded driver
- // suite.addTest (ClobUpdatableReaderTest.suite());
+ //suite to test updatable reader for clob in embedded driver
+ suite.addTest (ClobUpdatableReaderTest.suite());
- // //truncate test for clob
- // suite.addTest (ClobTruncateTest.suite());
+ //truncate test for clob
+ suite.addTest (ClobTruncateTest.suite());
- // //JSR169 does not support ParameterMetaData
- // suite.addTest(ParameterMetaDataJdbc30Test.suite());
- // suite.addTest(CacheSessionDataTest.suite());
-
- // // LDAPAuthentication and InvalidLDAPSrvAuth cannot run with JSR169
- // // implementation because of missing support for authentication
- // // functionality.
- // // Also, LDAPAuthentication needs properties passed in or is
- // // pointless (unless we can find a test LDAP Server)
- // String ldapServer=getSystemProperty("derbyTesting.ldapServer");
- // if (ldapServer == null || ldapServer.length() < 1)
- // suite.addTest(new BaseTestSuite(
- // "LDAPAuthenticationTest and XAJNDITest require " +
- // "derbyTesting.ldap* properties."));
- // else
- // {
- // suite.addTest(LDAPAuthenticationTest.suite());
- // suite.addTest(XAJNDITest.suite());
- // }
- // suite.addTest(InvalidLDAPServerAuthenticationTest.suite());
+ //JSR169 does not support ParameterMetaData
+ suite.addTest(ParameterMetaDataJdbc30Test.suite());
+ suite.addTest(CacheSessionDataTest.suite());
+
+ // LDAPAuthentication and InvalidLDAPSrvAuth cannot run with JSR169
+ // implementation because of missing support for authentication
+ // functionality.
+ // Also, LDAPAuthentication needs properties passed in or is
+ // pointless (unless we can find a test LDAP Server)
+ String ldapServer=getSystemProperty("derbyTesting.ldapServer");
+ if (ldapServer == null || ldapServer.length() < 1)
+ suite.addTest(new BaseTestSuite(
+ "LDAPAuthenticationTest and XAJNDITest require " +
+ "derbyTesting.ldap* properties."));
+ else
+ {
+ suite.addTest(LDAPAuthenticationTest.suite());
+ suite.addTest(XAJNDITest.suite());
+ }
+ suite.addTest(InvalidLDAPServerAuthenticationTest.suite());
- // // XA and ConnectionPool Datasource are not available with
- // // JSR169 so can't run InternationalConnectTest.
- // suite.addTest(InternationalConnectTest.suite());
+ // XA and ConnectionPool Datasource are not available with
+ // JSR169 so can't run InternationalConnectTest.
+ suite.addTest(InternationalConnectTest.suite());
- // // Test requires java.sql.DriverManager
+ // Test requires java.sql.DriverManager
suite.addTest(AutoloadTest.fullAutoloadSuite());
- // }
+ }
return suite;
}