Return-Path: <dirkv@apache.org>
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 81312 invoked by uid 500); 20 Sep 2003 17:31:30 -0000
Received: (qmail 81309 invoked from network); 20 Sep 2003 17:31:30 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 20 Sep 2003 17:31:30 -0000
Received: (qmail 70680 invoked by uid 1340); 20 Sep 2003 17:31:38 -0000
Date: 20 Sep 2003 17:31:38 -0000
Message-ID: <20030920173138.70679.qmail@minotaur.apache.org>
From: dirkv@apache.org
To: jakarta-commons-cvs@apache.org
Subject: cvs commit: jakarta-commons/dbcp/src/test/org/apache/commons/dbcp
 TestBasicDataSource.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

dirkv       2003/09/20 10:31:38

  Modified:    dbcp/src/test/org/apache/commons/dbcp
                        TestBasicDataSource.java
  Log:
  Bugzilla Bug 23291:  impossible to turn off all validation tests when a validationQuery is present
  => junit test
  
  Revision  Changes    Path
  1.12      +38 -3     jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestBasicDataSource.java
  
  Index: TestBasicDataSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestBasicDataSource.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TestBasicDataSource.java	20 Sep 2003 16:59:41 -0000	1.11
  +++ TestBasicDataSource.java	20 Sep 2003 17:31:38 -0000	1.12
  @@ -217,6 +217,41 @@
               }
           }
       }
  +
  +    public void testSetValidationTestProperties() {
  +        // defaults
  +        assertEquals(true, ds.getTestOnBorrow());
  +        assertEquals(false, ds.getTestOnReturn());
  +        assertEquals(false, ds.getTestWhileIdle());
  +
  +        ds.setTestOnBorrow(true);
  +        ds.setTestOnReturn(true);
  +        ds.setTestWhileIdle(true);
  +        assertEquals(true, ds.getTestOnBorrow());
  +        assertEquals(true, ds.getTestOnReturn());
  +        assertEquals(true, ds.getTestWhileIdle());
  +
  +        ds.setTestOnBorrow(false);
  +        ds.setTestOnReturn(false);
  +        ds.setTestWhileIdle(false);
  +        assertEquals(false, ds.getTestOnBorrow());
  +        assertEquals(false, ds.getTestOnReturn());
  +        assertEquals(false, ds.getTestWhileIdle());
  +    }
  +
  +    public void testNoValidationQuery() throws Exception {
  +        ds.setTestOnBorrow(true);
  +        ds.setTestOnReturn(true);
  +        ds.setTestWhileIdle(true);
  +        ds.setValidationQuery("");
  +        
  +        Connection conn = ds.getConnection();
  +        conn.close();
  +
  +        assertEquals(false, ds.getTestOnBorrow());
  +        assertEquals(false, ds.getTestOnReturn());
  +        assertEquals(false, ds.getTestWhileIdle());
  +    }
       
       public void testDefaultCatalog() throws Exception {
           Connection[] c = new Connection[getMaxActive()];