svn commit: r907290 - in /commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources: TestPerUserPoolDataSource.java TestSharedPoolDataSource.java

[psteitz]

Author: psteitz
Date: Sat Feb  6 19:50:23 2010
New Revision: 907290

URL: http://svn.apache.org/viewvc?rev=907290&view=rev
Log:
Eliminated possibility that close() causes exception when getConnection 
succeeds in testChangePassword.

Modified:
    
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
    
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java

Modified: 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java?rev=907290&r1=907289&r2=907290&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
 Sat Feb  6 19:50:23 2010
@@ -534,7 +534,7 @@
             assertEquals("Should be one idle connection in the pool", 
                     1, ((PerUserPoolDataSource) ds).getNumIdle("foo", "bay"));
             try {
-                ds.getConnection("foo", "bar").close(); // old password
+                ds.getConnection("foo", "bar"); // old password
                 fail("Should have generated SQLException"); 
             } catch (SQLException expected) {
             }

Modified: 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java?rev=907290&r1=907289&r2=907290&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java
 Sat Feb  6 19:50:23 2010
@@ -554,7 +554,7 @@
     // See DBCP-8
     public void testChangePassword() throws Exception {
         try {
-            ds.getConnection("foo", "bay").close();
+            ds.getConnection("foo", "bay");
             fail("Should have generated SQLException");
         } catch (SQLException expected) {
         }