cvs commit: jakarta-commons/dbcp/src/test/org/apache/commons/dbcp TestManual.java

[rwaldhoff]

rwaldhoff    02/04/03 04:41:56

  Modified:    dbcp/src/test/org/apache/commons/dbcp TestManual.java
  Log:
  better test in testPooling, we don't care what order the pooled Connections are 
returned
  
  Revision  Changes    Path
  1.5       +8 -8      
jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestManual.java
  
  Index: TestManual.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestManual.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestManual.java   3 Apr 2002 12:33:02 -0000       1.4
  +++ TestManual.java   3 Apr 2002 12:41:56 -0000       1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestManual.java,v 1.4 
2002/04/03 12:33:02 rwaldhoff Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/03 12:33:02 $
  + * $Header: 
/home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestManual.java,v 1.5 
2002/04/03 12:41:56 rwaldhoff Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/03 12:41:56 $
    *
    * ====================================================================
    *
  @@ -68,7 +68,7 @@
   
   /**
    * @author Rodney Waldhoff
  - * @version $Id: TestManual.java,v 1.4 2002/04/03 12:33:02 rwaldhoff Exp $
  + * @version $Id: TestManual.java,v 1.5 2002/04/03 12:41:56 rwaldhoff Exp $
    */
   public class TestManual extends TestCase {
       public TestManual(String testName) {
  @@ -150,8 +150,8 @@
               conn.createStatement();
               fail("Can't use closed connections");
           } catch(SQLException e) {
  -            ; // expected
  -        }
  +            ;testSimpleve // expected
  +        }testSimpleve
   
           conn = DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
           assertTrue(null != conn);
  @@ -185,7 +185,7 @@
           assertTrue(conn != conn2);
           conn2.close();
           conn.close();
  -        conn2 = DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
  -        assertSame(conn,conn2);
  +        Connection conn3 = 
DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
  +        assertTrue( conn3 == conn || conn3 == conn2 );
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>