dirkv 2003/11/16 09:42:21 Modified: cache/src/test/org/apache/commons/cache TestFileCache.java TestFileDelete.java TestShareableFileStash.java TestSimpleMemoryCache.java cache/src/test/org/apache/commons/cache/adt TestListableObject.java TestWListableObject.java Log: assert => assertTrue import cleanup Revision Changes Path 1.2 +37 -34 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileCache.java Index: TestFileCache.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileCache.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestFileCache.java 18 May 2001 19:33:10 -0000 1.1 +++ TestFileCache.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,10 +12,13 @@ package org.apache.commons.cache; -import junit.framework.*; import java.io.File; import java.io.Serializable; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class TestFileCache extends TestCase { public TestFileCache(String testName) { super(testName); @@ -65,8 +68,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 +105,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 +132,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)); } } 1.2 +9 -7 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileDelete.java Index: TestFileDelete.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestFileDelete.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestFileDelete.java 18 May 2001 19:33:10 -0000 1.1 +++ TestFileDelete.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,9 +12,11 @@ package org.apache.commons.cache; -import junit.framework.*; import java.io.File; -import java.io.Serializable; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class TestFileDelete extends TestCase { public TestFileDelete(String testName) { @@ -55,8 +57,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)); } } } 1.2 +11 -9 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestShareableFileStash.java Index: TestShareableFileStash.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestShareableFileStash.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestShareableFileStash.java 18 May 2001 19:33:11 -0000 1.1 +++ TestShareableFileStash.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,9 +12,11 @@ package org.apache.commons.cache; -import junit.framework.*; import java.io.File; -import java.io.Serializable; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class TestShareableFileStash extends TestCase { public TestShareableFileStash(String testName) { @@ -65,8 +67,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)); @@ -94,8 +96,8 @@ System.out.println("CUR_CAPACITY: " + cache.getStat(CacheStat.CUR_CAPACITY)); cache.clear(); - Thread.currentThread().yield(); - Thread.currentThread().sleep(2000L); + Thread.yield(); + Thread.sleep(2000L); { found = 0; for(int i=0;i<1500;i++) { 1.2 +35 -32 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestSimpleMemoryCache.java Index: TestSimpleMemoryCache.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/TestSimpleMemoryCache.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestSimpleMemoryCache.java 18 May 2001 19:33:11 -0000 1.1 +++ TestSimpleMemoryCache.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,10 +12,13 @@ package org.apache.commons.cache; -import junit.framework.*; import java.io.File; import java.io.Serializable; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class TestSimpleMemoryCache extends TestCase { public TestSimpleMemoryCache(String testName) { super(testName); @@ -44,22 +47,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 +74,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)); } } 1.2 +13 -13 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestListableObject.java Index: TestListableObject.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestListableObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestListableObject.java 18 May 2001 19:33:13 -0000 1.1 +++ TestListableObject.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,9 +12,9 @@ package org.apache.commons.cache.adt; -import junit.framework.*; -import java.util.*; -import java.io.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * @author Rodney Waldhoff @@ -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++) { 1.2 +15 -14 jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestWListableObject.java Index: TestWListableObject.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/cache/src/test/org/apache/commons/cache/adt/TestWListableObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestWListableObject.java 18 May 2001 19:33:13 -0000 1.1 +++ TestWListableObject.java 16 Nov 2003 17:42:21 -0000 1.2 @@ -12,8 +12,9 @@ package org.apache.commons.cache.adt; -import junit.framework.*; -import java.util.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * @author Rodney Waldhoff @@ -33,20 +34,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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]