You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sa...@apache.org on 2001/12/11 08:38:02 UTC
cvs commit: jakarta-commons/pool/src/test/org/apache/commons/pool/impl TestGenericKeyedObjectPool.java TestGenericObjectPool.java
sanders 01/12/10 23:38:02
Modified: pool build.xml
pool/src/test/org/apache/commons/pool/impl
TestGenericKeyedObjectPool.java
TestGenericObjectPool.java
Log:
Update to JUnit 3.7
Revision Changes Path
1.4 +4 -2 jakarta-commons/pool/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/04/30 18:22:24 1.3
+++ build.xml 2001/12/11 07:38:02 1.4
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.3 2001/04/30 18:22:24 craigmcc Exp $ -->
+<!-- $Id: build.xml,v 1.4 2001/12/11 07:38:02 sanders Exp $ -->
<project name="commons-pool" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -38,6 +38,8 @@
<property name="user-propfile" value="${user.home}/build.properties"/>
<property file="${user-propfile}"/>
+ <property name="commons-collections.jar" value="${basedir}/../collections/dist/commons-collections.jar"/>
+
<!-- command line classpath, if any -->
<property name="cp" value=""/>
@@ -232,4 +234,4 @@
<!-- ######################################################### -->
-</project>
\ No newline at end of file
+</project>
1.2 +23 -23 jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
Index: TestGenericKeyedObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestGenericKeyedObjectPool.java 2001/04/14 16:42:08 1.1
+++ TestGenericKeyedObjectPool.java 2001/12/11 07:38:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v 1.1 2001/04/14 16:42:08 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2001/04/14 16:42:08 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v 1.2 2001/12/11 07:38:02 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/11 07:38:02 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestGenericKeyedObjectPool.java,v 1.1 2001/04/14 16:42:08 rwaldhoff Exp $
+ * @version $Id: TestGenericKeyedObjectPool.java,v 1.2 2001/12/11 07:38:02 sanders Exp $
*/
public class TestGenericKeyedObjectPool extends TestCase {
public TestGenericKeyedObjectPool(String testName) {
@@ -258,15 +258,15 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assert("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
assertEquals("Should be zero idle, found " + pool.numIdle(""),0,pool.numIdle(""));
@@ -278,15 +278,15 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assert("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
assertEquals("Should be zero idle, found " + pool.numIdle(""),0,pool.numIdle(""));
}
@@ -310,25 +310,25 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assert("Should be less than 1000 idle, found " + pool.numIdle(),pool.numIdle() < 1000);
+ assertTrue("Should be less than 1000 idle, found " + pool.numIdle(),pool.numIdle() < 1000);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 900 idle, found " + pool.numIdle(),pool.numIdle() < 900);
+ assertTrue("Should be less than 900 idle, found " + pool.numIdle(),pool.numIdle() < 900);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 800 idle, found " + pool.numIdle(),pool.numIdle() < 800);
+ assertTrue("Should be less than 800 idle, found " + pool.numIdle(),pool.numIdle() < 800);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 700 idle, found " + pool.numIdle(),pool.numIdle() < 700);
+ assertTrue("Should be less than 700 idle, found " + pool.numIdle(),pool.numIdle() < 700);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 600 idle, found " + pool.numIdle(),pool.numIdle() < 600);
+ assertTrue("Should be less than 600 idle, found " + pool.numIdle(),pool.numIdle() < 600);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
assertEquals("Should be zero idle, found " + pool.numIdle(),0,pool.numIdle());
}
1.2 +13 -13 jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
Index: TestGenericObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestGenericObjectPool.java 2001/04/14 16:42:13 1.1
+++ TestGenericObjectPool.java 2001/12/11 07:38:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java,v 1.1 2001/04/14 16:42:13 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2001/04/14 16:42:13 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java,v 1.2 2001/12/11 07:38:02 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/11 07:38:02 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestGenericObjectPool.java,v 1.1 2001/04/14 16:42:13 rwaldhoff Exp $
+ * @version $Id: TestGenericObjectPool.java,v 1.2 2001/12/11 07:38:02 sanders Exp $
*/
public class TestGenericObjectPool extends TestCase {
public TestGenericObjectPool(String testName) {
@@ -209,15 +209,15 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assert("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
assertEquals("Should be zero idle, found " + pool.numIdle(),0,pool.numIdle());
@@ -229,15 +229,15 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assert("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assert("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
assertEquals("Should be zero idle, found " + pool.numIdle(),0,pool.numIdle());
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>