svn commit: r1459970 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java

[kkolinko]

Author: kkolinko
Date: Fri Mar 22 20:30:31 2013
New Revision: 1459970

URL: http://svn.apache.org/r1459970
Log:
Merged revision 1380376 from tomcat/trunk:
Clean-up
- unused code
- autoboxing

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1380376

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java?rev=1459970&r1=1459969&r2=1459970&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/EqualsHashCodeTest.java
 Fri Mar 22 20:30:31 2013
@@ -20,7 +20,6 @@ import java.sql.Connection;
 
 import javax.sql.PooledConnection;
 
-import org.apache.tomcat.jdbc.pool.ConnectionPool;
 import org.apache.tomcat.jdbc.test.driver.Driver;
 
 public class EqualsHashCodeTest extends DefaultTestCase{
@@ -42,7 +41,7 @@ public class EqualsHashCodeTest extends 
         this.datasource.setMaxIdle(datasource.getMaxActive());
         this.datasource.setUsername(username);
         this.datasource.getConnection().close();
-        ConnectionPool pool = datasource.createPool();
+        datasource.createPool();
     }
 
     public void testEquals() throws Exception {
@@ -67,7 +66,7 @@ public class EqualsHashCodeTest extends 
         assertEquals(con1.hashCode(), con1.hashCode());
         Connection con2 = datasource.getConnection();
         assertEquals(con2.hashCode(), con2.hashCode());
-        assertNotSame(con1.hashCode(), con2.hashCode());
+        assertTrue(con1.hashCode() != con2.hashCode());
         con2.close();
         assertEquals(con2.hashCode(), con2.hashCode());
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org