Well, again, here is the actual attachment.
myrna wrote:
Once this patch is committed, we can close derby 95.
Myrna
Index:
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
(revision 151743)
+++
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
(working copy)
@@ -527,7 +527,38 @@
conn4.close();
xac4.close();
+
+
+ // test jira-derby 95 - a NullPointerException was returned
when passing
+ // an incorrect database name (a url in this case) - should now
give error XCY00
+ Connection dmc95 = ij.startJBMS();
+ String sqls;
+ try {
+ testJira95ds( dmc95, "jdbc:derby:mydb" );
+ } catch (SQLException sqle) {
+ sqls = sqle.getSQLState();
+ if (sqls.equals("XCY00"))
+ System.out.println("; ok - expected exception:
" + sqls);
+ else
+ System.out.println("; wrong, unexpected
exception: " + sqls + " - " + sqle.toString());
+ } catch (Exception e) {
+ System.out.println("; wrong, unexpected
exception: " + e.toString());
+ }
+
+ try {
+ testJira95xads( dmc95, "jdbc:derby:wombat" );
+ } catch (SQLException sqle) {
+ sqls = sqle.getSQLState();
+ if (sqls.equals("XCY00"))
+ System.out.println("; ok - expected exception:
" + sqls + "\n");
+ else
+ System.out.println("; wrong - unexpected
exception: " + sqls + " - " + sqle.toString());
+ } catch (Exception e) {
+ System.out.println("; wrong, unexpected
exception: " + e.toString());
+ }
+
testDSRequestAuthentication();
+
}
protected void showXAException(String tag, XAException xae) {
@@ -1269,6 +1300,25 @@
}
+ public void testJira95ds(Connection conn, String dbName) throws
SQLException
+ {
+ System.out.print("\ntesting jira 95 for DataSource");
+ EmbeddedDataSource ds = new EmbeddedDataSource();
+ ds.setDatabaseName(dbName);
+ Connection conn1 = ds.getConnection();
+ conn1.close();
+ }
+
+ public void testJira95xads(Connection conn, String dbName) throws
SQLException
+ {
+ System.out.print("testing jira 95 for XADataSource");
+ EmbeddedXADataSource dxs = new EmbeddedXADataSource();
+ dxs.setDatabaseName(dbName);
+ Connection conn2 = dxs.getXAConnection().getConnection();
+ conn2.close();
+ }
+
+
}
class cdsXid implements Xid, Serializable
{
Index:
java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
(revision 151743)
+++
java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
(working copy)
@@ -426,6 +426,8 @@
acxs 2
autocommitxastart expected : XAException - null
acxs 3
+testing jira 95 for DataSource; ok - expected exception: XCY00
+testing jira 95 for XADataSource; ok - expected exception: XCY00
DataSource - EMPTY
getConnection() - XJ004:Database '' not found.
getConnection(null, null) - XJ004:Database '' not found.
