Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestQueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestQueryTimeoutInterceptor.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestQueryTimeoutInterceptor.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestQueryTimeoutInterceptor.java Fri Mar 22 20:41:46 2013 @@ -14,40 +14,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.tomcat.jdbc.test; import java.sql.Connection; import java.sql.Statement; +import org.junit.Assert; +import org.junit.Test; + import org.apache.tomcat.jdbc.pool.interceptor.QueryTimeoutInterceptor; import org.apache.tomcat.jdbc.test.driver.Driver; - public class TestQueryTimeoutInterceptor extends DefaultTestCase { - public TestQueryTimeoutInterceptor(String name) { - super(name); - } - + @Test public void testTimeout() throws Exception { int timeout = 10; int withoutuser =10; int withuser = withoutuser; - this.init(); this.datasource.setMaxActive(withuser+withoutuser); this.datasource.setJdbcInterceptors(QueryTimeoutInterceptor.class.getName()+"(queryTimeout="+timeout+")"); this.datasource.setDriverClassName(Driver.class.getName()); this.datasource.setUrl("jdbc:tomcat:test"); Connection con = this.datasource.getConnection(); Statement st = con.createStatement(); - assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); + Assert.assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); st.close(); st = con.prepareStatement(""); - assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); + Assert.assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); st.close(); st = con.prepareCall(""); - assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); + Assert.assertEquals(st.getClass().getName(),timeout,st.getQueryTimeout()); st.close(); con.close(); }
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java Fri Mar 22 20:41:46 2013 @@ -19,24 +19,20 @@ package org.apache.tomcat.jdbc.test; import java.sql.Connection; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import org.apache.tomcat.jdbc.pool.DataSource; import org.apache.tomcat.jdbc.pool.PoolConfiguration; import org.apache.tomcat.jdbc.test.driver.Driver; + /** - * - * @author Jeremy Norris * https://issues.apache.org/bugzilla/show_bug.cgi?id=50613 - * */ -public class TestSizePreservation extends TestCase { +public class TestSizePreservation { protected volatile DataSource ds = null; - public TestSizePreservation() { - } - private void initSimplePoolProperties() { PoolConfiguration p = new DefaultProperties(); ds = new org.apache.tomcat.jdbc.pool.DataSource(); @@ -71,6 +67,7 @@ public class TestSizePreservation extend ds.getPoolProperties().setRemoveAbandonedTimeout(1); } + @Test public void testSimple() throws Exception { initSimplePoolProperties(); common(); @@ -78,6 +75,7 @@ public class TestSizePreservation extend Driver.reset(); } + @Test public void testEvicting() throws Exception { initEvictingPool(); common(); @@ -122,7 +120,7 @@ public class TestSizePreservation extend threads[i].join(); } System.out.println("Pool size:"+ds.getPool().getSize()); - assertTrue("Size validity check: ", ds.getPool().getSize() >= 0); + Assert.assertTrue("Size validity check: ", ds.getPool().getSize() >= 0); } } Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java Fri Mar 22 20:41:46 2013 @@ -29,16 +29,16 @@ import javax.management.AttributeChangeN import javax.management.Notification; import javax.management.NotificationListener; +import org.junit.Assert; +import org.junit.Test; + import org.apache.tomcat.jdbc.pool.ConnectionPool; import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport; import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx; public class TestSlowQueryReport extends DefaultTestCase { - public TestSlowQueryReport(String name) { - super(name); - } - + @Test public void testSlowSql() throws Exception { int count = 3; this.init(); @@ -53,8 +53,8 @@ public class TestSlowQueryReport extends st.close(); } Map<String,SlowQueryReport.QueryStats> map = SlowQueryReport.getPoolStats(datasource.getPool().getName()); - assertNotNull(map); - assertEquals(1,map.size()); + Assert.assertNotNull(map); + Assert.assertEquals(1,map.size()); String key = map.keySet().iterator().next(); SlowQueryReport.QueryStats stats = map.get(key); System.out.println("Stats:"+stats); @@ -78,9 +78,10 @@ public class TestSlowQueryReport extends con.close(); tearDown(); //make sure we actually did clean up when the pool closed - assertNull(SlowQueryReport.getPoolStats(pool.getName())); + Assert.assertNull(SlowQueryReport.getPoolStats(pool.getName())); } + @Test public void testSlowSqlJmx() throws Exception { int count = 1; this.init(); @@ -95,8 +96,8 @@ public class TestSlowQueryReport extends st.close(); } Map<String,SlowQueryReport.QueryStats> map = SlowQueryReport.getPoolStats(datasource.getPool().getName()); - assertNotNull(map); - assertEquals(1,map.size()); + Assert.assertNotNull(map); + Assert.assertEquals(1,map.size()); String key = map.keySet().iterator().next(); SlowQueryReport.QueryStats stats = map.get(key); System.out.println("Stats:"+stats); @@ -123,14 +124,14 @@ public class TestSlowQueryReport extends st.close(); } System.out.println("Stats:"+stats); - assertEquals("Expecting to have received "+(2*count)+" notifications.",2*count, listener.notificationCount.get()); + Assert.assertEquals("Expecting to have received "+(2*count)+" notifications.",2*count, listener.notificationCount.get()); con.close(); tearDown(); //make sure we actually did clean up when the pool closed - assertNull(SlowQueryReport.getPoolStats(pool.getName())); + Assert.assertNull(SlowQueryReport.getPoolStats(pool.getName())); } - + @Test public void testFastSql() throws Exception { int count = 3; this.init(); @@ -145,14 +146,15 @@ public class TestSlowQueryReport extends st.close(); } Map<String,SlowQueryReport.QueryStats> map = SlowQueryReport.getPoolStats(datasource.getPool().getName()); - assertNotNull(map); - assertEquals(0,map.size()); + Assert.assertNotNull(map); + Assert.assertEquals(0,map.size()); ConnectionPool pool = datasource.getPool(); con.close(); tearDown(); - assertNull(SlowQueryReport.getPoolStats(pool.getName())); + Assert.assertNull(SlowQueryReport.getPoolStats(pool.getName())); } + @Test public void testFailedSql() throws Exception { int count = 3; this.init(); @@ -172,15 +174,15 @@ public class TestSlowQueryReport extends } Map<String,SlowQueryReport.QueryStats> map = SlowQueryReport.getPoolStats(datasource.getPool().getName()); - assertNotNull(map); - assertEquals(1,map.size()); + Assert.assertNotNull(map); + Assert.assertEquals(1,map.size()); ConnectionPool pool = datasource.getPool(); String key = map.keySet().iterator().next(); SlowQueryReport.QueryStats stats = map.get(key); System.out.println("Stats:"+stats); con.close(); tearDown(); - assertNull(SlowQueryReport.getPoolStats(pool.getName())); + Assert.assertNull(SlowQueryReport.getPoolStats(pool.getName())); } Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java Fri Mar 22 20:41:46 2013 @@ -19,20 +19,20 @@ package org.apache.tomcat.jdbc.test; import java.sql.Connection; import java.sql.PreparedStatement; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + import org.apache.tomcat.jdbc.pool.interceptor.StatementCache; public class TestStatementCache extends DefaultTestCase { - - public TestStatementCache(String name) { - super(name); - } - private static volatile TestStatementCacheInterceptor interceptor = null; @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { interceptor = null; super.tearDown(); } @@ -43,72 +43,71 @@ public class TestStatementCache extends "(prepared="+cachePrepared+",callable="+cacheCallable+",max="+max+")"); } + @Test public void testIsCacheEnabled() throws Exception { - init(); config(true,true,50); datasource.getConnection().close(); - assertNotNull("Interceptor was not created.", interceptor); + Assert.assertNotNull("Interceptor was not created.", interceptor); } + @Test public void testCacheProperties() throws Exception { - init(); config(true,true,50); datasource.getConnection().close(); - assertEquals(true, interceptor.isCacheCallable()); - assertEquals(true, interceptor.isCachePrepared()); - assertEquals(50,interceptor.getMaxCacheSize()); + Assert.assertTrue(interceptor.isCacheCallable()); + Assert.assertTrue(interceptor.isCachePrepared()); + Assert.assertEquals(50,interceptor.getMaxCacheSize()); } + @Test public void testCacheProperties2() throws Exception { - init(); config(false,false,100); datasource.getConnection().close(); - assertEquals(false, interceptor.isCacheCallable()); - assertEquals(false, interceptor.isCachePrepared()); - assertEquals(100,interceptor.getMaxCacheSize()); + Assert.assertFalse(interceptor.isCacheCallable()); + Assert.assertFalse(interceptor.isCachePrepared()); + Assert.assertEquals(100,interceptor.getMaxCacheSize()); } + @Test public void testPreparedStatementCache() throws Exception { - init(); config(true,false,100); Connection con = datasource.getConnection(); PreparedStatement ps1 = con.prepareStatement("select 1"); PreparedStatement ps2 = con.prepareStatement("select 1"); - assertEquals(0,interceptor.getCacheSize().get()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); ps1.close(); - assertTrue(ps1.isClosed()); - assertEquals(1,interceptor.getCacheSize().get()); + Assert.assertTrue(ps1.isClosed()); + Assert.assertEquals(1,interceptor.getCacheSize().get()); PreparedStatement ps3 = con.prepareStatement("select 1"); - assertEquals(0,interceptor.getCacheSize().get()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); ps2.close(); - assertTrue(ps2.isClosed()); + Assert.assertTrue(ps2.isClosed()); ps3.close(); - assertTrue(ps3.isClosed()); - assertEquals(1,interceptor.getCacheSize().get()); + Assert.assertTrue(ps3.isClosed()); + Assert.assertEquals(1,interceptor.getCacheSize().get()); } + @Test public void testPreparedStatementCache2() throws Exception { init(); config(false,false,100); Connection con = datasource.getConnection(); PreparedStatement ps1 = con.prepareStatement("select 1"); PreparedStatement ps2 = con.prepareStatement("select 1"); - assertEquals(0,interceptor.getCacheSize().get()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); ps1.close(); - assertTrue(ps1.isClosed()); - assertEquals(0,interceptor.getCacheSize().get()); + Assert.assertTrue(ps1.isClosed()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); PreparedStatement ps3 = con.prepareStatement("select 1"); - assertEquals(0,interceptor.getCacheSize().get()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); ps2.close(); - assertTrue(ps2.isClosed()); + Assert.assertTrue(ps2.isClosed()); ps3.close(); - assertTrue(ps3.isClosed()); - assertEquals(0,interceptor.getCacheSize().get()); - } - - public void testCallableStatementCache() throws Exception { + Assert.assertTrue(ps3.isClosed()); + Assert.assertEquals(0,interceptor.getCacheSize().get()); } + @Test public void testMaxCacheSize() throws Exception { init(); config(true,false,100); @@ -119,7 +118,7 @@ public class TestStatementCache extends PreparedStatement ps = con.prepareStatement("select "+i); ps.close(); } - assertEquals(100,interceptor.getCacheSize().get()); + Assert.assertEquals(100,interceptor.getCacheSize().get()); } @@ -128,5 +127,4 @@ public class TestStatementCache extends TestStatementCache.interceptor = this; } } - } Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java Fri Mar 22 20:41:46 2013 @@ -14,22 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.tomcat.jdbc.test; import java.sql.Connection; -import org.apache.tomcat.jdbc.pool.PooledConnection; +import org.junit.Assert; +import org.junit.Test; +import org.apache.tomcat.jdbc.pool.PooledConnection; public class TestSuspectTimeout extends DefaultTestCase { - public TestSuspectTimeout(String name) { - super(name); - } - + @Test public void testSuspect() throws Exception { - this.init(); this.datasource.setMaxActive(100); this.datasource.setMaxIdle(100); this.datasource.setInitialSize(0); @@ -40,10 +37,10 @@ public class TestSuspectTimeout extends this.datasource.getPoolProperties().setSuspectTimeout(1); this.datasource.getPoolProperties().setLogAbandoned(true); Connection con = datasource.getConnection(); - assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive()); + Assert.assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive()); Thread.sleep(3000); PooledConnection pcon = con.unwrap(PooledConnection.class); - assertTrue("Connection should be marked suspect",pcon.isSuspect()); + Assert.assertTrue("Connection should be marked suspect",pcon.isSuspect()); con.close(); } } Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java Fri Mar 22 20:41:46 2013 @@ -18,20 +18,16 @@ package org.apache.tomcat.jdbc.test; import java.util.concurrent.atomic.AtomicInteger; -/** - * @author Filip Hanik - * @version 1.0 - */ +import org.junit.Assert; +import org.junit.Test; + public class TestTimeout extends DefaultTestCase { - public TestTimeout(String name) { - super(name); - } AtomicInteger counter = new AtomicInteger(0); + @Test public void testCheckoutTimeout() throws Exception { try { - init(); this.datasource.getPoolProperties().setTestWhileIdle(true); this.datasource.getPoolProperties().setTestOnBorrow(false); this.datasource.getPoolProperties().setTestOnReturn(false); @@ -50,18 +46,17 @@ public class TestTimeout extends Default long delta = System.currentTimeMillis()-now; System.out.println("Got connection #"+i+" in "+delta+" ms."); } - assertTrue(false); + Assert.assertTrue(false); } catch ( Exception x ) { - assertTrue(true); + Assert.assertTrue(true); }finally { Thread.sleep(2000); - tearDown(); } } + @Test public void testCheckoutTimeoutFair() throws Exception { try { - init(); this.datasource.getPoolProperties().setFairQueue(true); this.datasource.getPoolProperties().setTestWhileIdle(true); this.datasource.getPoolProperties().setTestOnBorrow(false); @@ -81,13 +76,11 @@ public class TestTimeout extends Default long delta = System.currentTimeMillis()-now; System.out.println("Got connection #"+i+" in "+delta+" ms."); } - assertTrue(false); + Assert.assertTrue(false); } catch ( Exception x ) { - assertTrue(true); + Assert.assertTrue(true); }finally { Thread.sleep(2000); - tearDown(); } } - } Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java?rev=1459975&r1=1459974&r2=1459975&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java Fri Mar 22 20:41:46 2013 @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.tomcat.jdbc.test; import java.sql.Connection; -public class TwoDataSources extends DefaultTestCase { +import org.junit.Assert; +import org.junit.Test; - public TwoDataSources(String name) { - super(name); - } +public class TwoDataSources extends DefaultTestCase { + @Test public void testTwoDataSources() throws Exception { org.apache.tomcat.jdbc.pool.DataSource d1 = this.createDefaultDataSource(); org.apache.tomcat.jdbc.pool.DataSource d2 = this.createDefaultDataSource(); @@ -37,29 +36,26 @@ public class TwoDataSources extends Defa Thread.sleep(5000); try { c1.createStatement(); - assertTrue("Connection should have been abandoned.",false); + Assert.assertTrue("Connection should have been abandoned.",false); }catch (Exception x) { - assertTrue("This is correct, c1 is abandoned",true); + Assert.assertTrue("This is correct, c1 is abandoned",true); } try { c2.createStatement(); - assertTrue("Connection should not have been abandoned.",true); + Assert.assertTrue("Connection should not have been abandoned.",true); }catch (Exception x) { - assertTrue("Connection c2 should be working",false); + Assert.assertTrue("Connection c2 should be working",false); } try { - assertTrue("Connection should have been closed.",c1.isClosed()); + Assert.assertTrue("Connection should have been closed.",c1.isClosed()); }catch (Exception x) { - assertTrue("This is correct, c1 is closed",true); + Assert.assertTrue("This is correct, c1 is closed",true); } try { - assertFalse("Connection c2 should not have been closed.",c2.isClosed()); + Assert.assertFalse("Connection c2 should not have been closed.",c2.isClosed()); }catch (Exception x) { - assertTrue("Connection c2 should be working",false); + Assert.assertTrue("Connection c2 should be working",false); } - - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
