I attached a simple patch to be applied to jakarta-commons-sandbox/cache
module. It replaces all deprecated JUnit calls to assert(boolean) and
assert(String,boolean) with assertTrue(boolean) and assertTrue(String,
boolean).
Tim O'Brien
[EMAIL PROTECTED]
(847) 863-7045
Index: src/test/org/apache/commons/cache/TestFileCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileCache.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestFileCache.java
--- src/test/org/apache/commons/cache/TestFileCache.java 18 May 2001 19:33:10
-0000 1.1.1.1
+++ src/test/org/apache/commons/cache/TestFileCache.java 6 Feb 2002 19:08:13
+-0000
@@ -65,8 +65,8 @@
}
for(int i=0;i<1500;i++) {
String key = "this is the key " + i;
- assert("object " + i + " should be storeable",cache.store(key,buf,new
Long(System.currentTimeMillis()+600000L),null));
- assert("object " + i + " should be in the cache",cache.contains(key));
+ assertTrue("object " + i + " should be storeable",cache.store(key,buf,new
+Long(System.currentTimeMillis()+600000L),null));
+ assertTrue("object " + i + " should be in the cache",cache.contains(key));
}
System.out.println("NUM_RETRIEVE_FOUND: " +
cache.getStat(CacheStat.NUM_RETRIEVE_FOUND));
System.out.println("NUM_RETRIEVE_NOT_FOUND: " +
cache.getStat(CacheStat.NUM_RETRIEVE_NOT_FOUND));
@@ -102,22 +102,22 @@
Serializable key3 = "key 3";
Serializable value3 = "value 3";
- assert(!cache.contains(key1));
- assert(cache.store(key1,value1,null,null));
- assert(cache.contains(key1));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.store(key1,value1,null,null));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
- assert(!cache.contains(key2));
- assert(cache.store(key2,value2,null,null));
- assert(cache.contains(key2));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.store(key2,value2,null,null));
+ assertTrue(cache.contains(key2));
assertEquals(value2,cache.retrieve(key2));
- assert(!cache.contains(key3));
- assert(cache.store(key3,value3,null,null));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key3));
+ assertTrue(cache.store(key3,value3,null,null));
+ assertTrue(cache.contains(key3));
assertEquals(value3,cache.retrieve(key3));
- assert(cache.contains(key1));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
}
@@ -129,34 +129,34 @@
Serializable key3 = "key 3";
Serializable value3 = "value 3";
- assert(!cache.contains(key1));
- assert(cache.store(key1,value1,null,null));
- assert(cache.contains(key1));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.store(key1,value1,null,null));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
- assert(!cache.contains(key2));
- assert(cache.store(key2,value2,null,null));
- assert(cache.contains(key2));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.store(key2,value2,null,null));
+ assertTrue(cache.contains(key2));
assertEquals(value2,cache.retrieve(key2));
- assert(!cache.contains(key3));
- assert(cache.store(key3,value3,null,null));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key3));
+ assertTrue(cache.store(key3,value3,null,null));
+ assertTrue(cache.contains(key3));
assertEquals(value3,cache.retrieve(key3));
cache.clear(key1);
- assert(!cache.contains(key1));
- assert(cache.contains(key2));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.contains(key2));
+ assertTrue(cache.contains(key3));
cache.clear(key2);
- assert(!cache.contains(key1));
- assert(!cache.contains(key2));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.contains(key3));
cache.clear(key3);
- assert(!cache.contains(key1));
- assert(!cache.contains(key2));
- assert(!cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(!cache.contains(key2));
+ assertTrue(!cache.contains(key3));
}
}
Index: src/test/org/apache/commons/cache/TestFileDelete.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileDelete.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestFileDelete.java
--- src/test/org/apache/commons/cache/TestFileDelete.java 18 May 2001 19:33:10
-0000 1.1.1.1
+++ src/test/org/apache/commons/cache/TestFileDelete.java 6 Feb 2002 19:08:13
+-0000
@@ -55,8 +55,8 @@
}
for(int i=0;i<500;i++) {
String key = "this is the key " + i;
- assert("object " + i + " should be storeable",cache.store(key,buf,new
Long(System.currentTimeMillis()+600000L),null));
- assert("object " + i + " should be in the cache",cache.contains(key));
+ assertTrue("object " + i + " should be storeable",cache.store(key,buf,new
+Long(System.currentTimeMillis()+600000L),null));
+ assertTrue("object " + i + " should be in the cache",cache.contains(key));
}
}
}
Index: src/test/org/apache/commons/cache/TestShareableFileStash.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestShareableFileStash.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestShareableFileStash.java
--- src/test/org/apache/commons/cache/TestShareableFileStash.java 18 May 2001
19:33:11 -0000 1.1.1.1
+++ src/test/org/apache/commons/cache/TestShareableFileStash.java 6 Feb 2002
+19:08:13 -0000
@@ -65,8 +65,8 @@
}
for(int i=0;i<1500;i++) {
String key = "this is the key " + i;
- assert("object " + i + " should be storeable",cache.store(key,buf,new
Long(System.currentTimeMillis()+600000L),null));
- assert("object " + i + " should be in the cache",cache.contains(key));
+ assertTrue("object " + i + " should be storeable",cache.store(key,buf,new
+Long(System.currentTimeMillis()+600000L),null));
+ assertTrue("object " + i + " should be in the cache",cache.contains(key));
}
System.out.println("NUM_RETRIEVE_FOUND: " +
cache.getStat(CacheStat.NUM_RETRIEVE_FOUND));
System.out.println("NUM_RETRIEVE_NOT_FOUND: " +
cache.getStat(CacheStat.NUM_RETRIEVE_NOT_FOUND));
Index: src/test/org/apache/commons/cache/TestSimpleMemoryCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestSimpleMemoryCache.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestSimpleMemoryCache.java
--- src/test/org/apache/commons/cache/TestSimpleMemoryCache.java 18 May 2001
19:33:11 -0000 1.1.1.1
+++ src/test/org/apache/commons/cache/TestSimpleMemoryCache.java 6 Feb 2002
+19:08:14 -0000
@@ -44,22 +44,22 @@
Serializable key3 = "key 3";
Serializable value3 = "value 3";
- assert(!cache.contains(key1));
- assert(cache.store(key1,value1,null,null));
- assert(cache.contains(key1));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.store(key1,value1,null,null));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
- assert(!cache.contains(key2));
- assert(cache.store(key2,value2,null,null));
- assert(cache.contains(key2));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.store(key2,value2,null,null));
+ assertTrue(cache.contains(key2));
assertEquals(value2,cache.retrieve(key2));
- assert(!cache.contains(key3));
- assert(cache.store(key3,value3,null,null));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key3));
+ assertTrue(cache.store(key3,value3,null,null));
+ assertTrue(cache.contains(key3));
assertEquals(value3,cache.retrieve(key3));
- assert(cache.contains(key1));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
}
@@ -71,34 +71,34 @@
Serializable key3 = "key 3";
Serializable value3 = "value 3";
- assert(!cache.contains(key1));
- assert(cache.store(key1,value1,null,null));
- assert(cache.contains(key1));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.store(key1,value1,null,null));
+ assertTrue(cache.contains(key1));
assertEquals(value1,cache.retrieve(key1));
- assert(!cache.contains(key2));
- assert(cache.store(key2,value2,null,null));
- assert(cache.contains(key2));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.store(key2,value2,null,null));
+ assertTrue(cache.contains(key2));
assertEquals(value2,cache.retrieve(key2));
- assert(!cache.contains(key3));
- assert(cache.store(key3,value3,null,null));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key3));
+ assertTrue(cache.store(key3,value3,null,null));
+ assertTrue(cache.contains(key3));
assertEquals(value3,cache.retrieve(key3));
cache.clear(key1);
- assert(!cache.contains(key1));
- assert(cache.contains(key2));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(cache.contains(key2));
+ assertTrue(cache.contains(key3));
cache.clear(key2);
- assert(!cache.contains(key1));
- assert(!cache.contains(key2));
- assert(cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(!cache.contains(key2));
+ assertTrue(cache.contains(key3));
cache.clear(key3);
- assert(!cache.contains(key1));
- assert(!cache.contains(key2));
- assert(!cache.contains(key3));
+ assertTrue(!cache.contains(key1));
+ assertTrue(!cache.contains(key2));
+ assertTrue(!cache.contains(key3));
}
}
Index: src/test/org/apache/commons/cache/adt/TestListableObject.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestListableObject.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestListableObject.java
--- src/test/org/apache/commons/cache/adt/TestListableObject.java 18 May 2001
19:33:13 -0000 1.1.1.1
+++ src/test/org/apache/commons/cache/adt/TestListableObject.java 6 Feb 2002
+19:08:14 -0000
@@ -33,14 +33,14 @@
ListableObject b = new ListableObject("beta");
ListableObject a = new ListableObject("alpha",b);
- assert(a.hasNext());
- assert(!b.hasNext());
+ assertTrue(a.hasNext());
+ assertTrue(!b.hasNext());
assertSame(b,a.getNext());
a.setNext(null);
- assert(!a.hasNext());
- assert(null == a.getNext());
+ assertTrue(!a.hasNext());
+ assertTrue(null == a.getNext());
b.setNext(a);
- assert(b.hasNext());
+ assertTrue(b.hasNext());
assertSame(a,b.getNext());
}
@@ -67,7 +67,7 @@
ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(hold.toByteArray()));
Object obj = in.readObject();
- assert(obj instanceof ListableObject);
+ assertTrue(obj instanceof ListableObject);
ListableObject cur2 = (ListableObject)obj;
for(int i=0;i<1000;i++) {
Index: src/test/org/apache/commons/cache/adt/TestWListableObject.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestWListableObject.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TestWListableObject.java
--- src/test/org/apache/commons/cache/adt/TestWListableObject.java 18 May 2001
19:33:13 -0000 1.1.1.1
+++ src/test/org/apache/commons/cache/adt/TestWListableObject.java 6 Feb 2002
+19:08:14 -0000
@@ -33,20 +33,20 @@
WListableObject a = new WListableObject("alpha",null,b);
b.setPrev(a);
- assert(a.hasNext());
- assert(!b.hasNext());
- assert(!a.hasPrev());
- assert(b.hasPrev());
+ assertTrue(a.hasNext());
+ assertTrue(!b.hasNext());
+ assertTrue(!a.hasPrev());
+ assertTrue(b.hasPrev());
assertSame(b,a.getNext());
assertSame(a,b.getPrev());
a.setNext(null);
- assert(!a.hasNext());
- assert(null == a.getNext());
+ assertTrue(!a.hasNext());
+ assertTrue(null == a.getNext());
b.setPrev(null);
- assert(!b.hasPrev());
- assert(null == b.getNext());
+ assertTrue(!b.hasPrev());
+ assertTrue(null == b.getNext());
}
public void testValue() {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
