Author: myrnavl
Date: Tue Apr 17 15:38:38 2007
New Revision: 529797
URL: http://svn.apache.org/viewvc?view=rev&rev=529797
Log:
DERBY-2296 - reinstate test DataSourceReferenceTest into jdbcapi._Suite.java, after making
most of the test skip with jdk16 (with bug reference). Also removed stray comment left in
ClientBaseDataSource.
Modified:
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?view=diff&rev=529797&r1=529796&r2=529797
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Tue Apr
17 15:38:38 2007
@@ -677,7 +677,6 @@
new ClientMessageId(SQLState.INVALID_ATTRIBUTE_SYNTAX),
attributeString);
}
- //if (shutdownDatabase != null )
augmentedProperties.setProperty((v.substring(0, eqPos)).trim(), (v.substring(eqPos
+ 1)).trim());
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java?view=diff&rev=529797&r1=529796&r2=529797
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
Tue Apr 17 15:38:38 2007
@@ -187,6 +187,11 @@
Object recreatedDS =
factory.getObjectInstance(dsAsReference, null, null, null);
+ // DERBY-2559 - with jdk16, this recreatedDS will be null.
+ // bailing out
+ if (JDBC.vmSupportsJDBC4())
+ return;
+
println(" empty DataSource recreated using Reference as " +
recreatedDS.getClass().getName());
// empty DataSource recreated using Reference should not be
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?view=diff&rev=529797&r1=529796&r2=529797
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Tue Apr 17 15:38:38 2007
@@ -103,8 +103,7 @@
suite.addTest(XADSAuthenticationTest.suite());
// Test uses JDBC 3.0 datasources, and javax.naming.Reference etc.
- // Test hits nullPointerException with jdk16; commenting out until resolved
- //suite.addTest(DataSourceReferenceTest.suite());
+ suite.addTest(DataSourceReferenceTest.suite());
// Test uses DriverManager, Pooled and XADataSources, and
// an inner class implements ConnectionEventListener.
|