[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/loader ...
Manik Surtani
msurtani at jboss.com
Fri Dec 15 12:30:31 EST 2006
User: msurtani
Date: 06/12/15 12:30:31
Modified: tests/functional/org/jboss/cache/loader
CacheLoaderTestsBase.java
Log:
refactored
Revision Changes Path
1.38 +88 -91 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTestsBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- CacheLoaderTestsBase.java 20 Nov 2006 18:04:09 -0000 1.37
+++ CacheLoaderTestsBase.java 15 Dec 2006 17:30:31 -0000 1.38
@@ -14,7 +14,6 @@
import org.jboss.util.stream.MarshalledValueInputStream;
import org.jboss.util.stream.MarshalledValueOutputStream;
-import javax.transaction.NotSupportedException;
import javax.transaction.Transaction;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -22,7 +21,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -31,7 +29,7 @@
* Commons tests for all CacheLoaders
*
* @author Bela Ban
- * @version $Id: CacheLoaderTestsBase.java,v 1.37 2006/11/20 18:04:09 genman Exp $
+ * @version $Id: CacheLoaderTestsBase.java,v 1.38 2006/12/15 17:30:31 msurtani Exp $
*/
abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
{
@@ -39,15 +37,15 @@
private static final Log log = LogFactory.getLog(CacheLoaderTestsBase.class);
TreeCache cache;
CacheLoader loader = null;
- Transaction tx = null;
+ private Transaction tx = null;
static final Fqn FQN = new Fqn("key");
- static final Fqn SUBTREE_FQN = new Fqn(FQN, "subtree");
+ private static final Fqn SUBTREE_FQN = new Fqn(FQN, "subtree");
- static final Fqn BUDDY_BASE = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, "test");
+ private static final Fqn BUDDY_BASE = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, "test");
- static final Fqn BUDDY_PLUS_FQN = new Fqn(BUDDY_BASE, FQN);
+ private static final Fqn BUDDY_PLUS_FQN = new Fqn(BUDDY_BASE, FQN);
- static final Fqn BUDDY_PLUS_SUBTREE_FQN = new Fqn(BUDDY_BASE, SUBTREE_FQN);
+ private static final Fqn BUDDY_PLUS_SUBTREE_FQN = new Fqn(BUDDY_BASE, SUBTREE_FQN);
public CacheLoaderTestsBase(String name)
@@ -99,23 +97,23 @@
protected void addDelay()
{
- ;// returns immediately in this case. Subclasses may override where a delay is needed.
+ // returns immediately in this case. Subclasses may override where a delay is needed.
}
- protected void clean(File dir)
+ private void clean(File dir)
{
File[] files = dir.listFiles();
if (files != null)
{
- for (int i = 0; i < files.length; i++)
+ for (File file : files)
{
- if (files[i].isDirectory())
+ if (file.isDirectory())
{
- clean(files[i]);
+ clean(file);
}
else
{
- if (!files[i].delete()) files[i].deleteOnExit();
+ if (!file.delete()) file.deleteOnExit();
}
}
}
@@ -126,7 +124,7 @@
{
final Fqn NODE = Fqn.fromString("/test");
final String KEY = "key";
- cache.put(NODE, KEY, new Integer(10));
+ cache.put(NODE, KEY, 10);
cache.evict(NODE);
addDelay();
String ret = cache.print(NODE);
@@ -137,19 +135,19 @@
{
final String NODE = "/test";
final String KEY = "key";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
addDelay();
- retval = cache.put(NODE, KEY, new Integer(10));
+ retval = cache.put(NODE, KEY, 10);
assertEquals(null, retval);
- retval = cache.put(NODE, KEY, new Integer(20));
+ retval = cache.put(NODE, KEY, 20);
addDelay();
- assertEquals(new Integer(10), retval);
+ assertEquals(10, retval);
cache.evict(Fqn.fromString(NODE));// evicts from memory, but *not* from store
addDelay();
log.debug("put 30, expect 20 back");
- retval = cache.put(NODE, KEY, new Integer(30));
- assertEquals(new Integer(20), retval);
+ retval = cache.put(NODE, KEY, 30);
+ assertEquals(20, retval);
}
public void testPut2() throws Exception
@@ -157,22 +155,22 @@
final String NODE = "/a/b/c";
assertNull(loader.get(Fqn.fromString(NODE)));
final String KEY = "key";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
assertNull(loader.get(Fqn.fromString(NODE)));
addDelay();
- retval = cache.put(NODE, KEY, new Integer(10));
+ retval = cache.put(NODE, KEY, 10);
assertNull(retval);
addDelay();
- retval = cache.put(NODE, KEY, new Integer(20));
- assertEquals(new Integer(10), retval);
+ retval = cache.put(NODE, KEY, 20);
+ assertEquals(10, retval);
cache.evict(Fqn.fromString(NODE));// evicts from memory, but *not* from store
cache.evict(Fqn.fromString("/a/b"));
cache.evict(Fqn.fromString("/a"));
addDelay();
log.debug("replace KEY with 30, expect 20");
- retval = cache.put(NODE, KEY, new Integer(30));
- assertEquals(new Integer(20), retval);
+ retval = cache.put(NODE, KEY, 30);
+ assertEquals(20, retval);
}
/**
@@ -301,29 +299,29 @@
public void testGet() throws CacheException
{
final String NODE = "/a/b/c";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
addDelay();
- retval = cache.put(NODE, "1", new Integer(10));
+ retval = cache.put(NODE, "1", 10);
assertNull(retval);
addDelay();
- retval = cache.put(NODE, "2", new Integer(20));
+ cache.put(NODE, "2", 20);
cache.evict(Fqn.fromString("/a/b/c"));
assertTrue("DataNode should not exisit ", !cache.exists("/a/b/c"));
addDelay();
retval = cache.get(NODE, "1");
- assertEquals(new Integer(10), retval);
+ assertEquals(10, retval);
retval = cache.get(NODE, "2");
- assertEquals(new Integer(20), retval);
+ assertEquals(20, retval);
}
public void testGetNode() throws CacheException
{
final String NODE = "/a/b/c";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
addDelay();
- cache.put(NODE, "1", new Integer(10));
+ cache.put(NODE, "1", 10);
cache.evict(Fqn.fromString(NODE));
assertTrue("DataNode should not exisit ", !cache.exists("/a/b/c"));
addDelay();
@@ -332,7 +330,7 @@
assertNotNull("Should not be null", retval);
DataNode node = (DataNode) retval;
- assertEquals(new Integer(10), node.get("1"));
+ assertEquals(10, node.get("1"));
}
@@ -342,12 +340,12 @@
pojo.getHobbies().add("Running");
pojo.getHobbies().add("Beerathlon");
pojo.getHobbies().add("Triathlon");
- cache.put("/mypojo", new Integer(322649), pojo);
+ cache.put("/mypojo", 322649, pojo);
addDelay();
- assertNotNull(cache.get("/mypojo", new Integer(322649)));
+ assertNotNull(cache.get("/mypojo", 322649));
cache.evict(Fqn.fromString("/mypojo"));
assertFalse(cache.exists("/mypojo"));
- SamplePojo pojo2 = (SamplePojo) cache.get("/mypojo", new Integer(322649));// should fetch from CacheLoader
+ SamplePojo pojo2 = (SamplePojo) cache.get("/mypojo", 322649);// should fetch from CacheLoader
assertNotNull(pojo2);
assertEquals(39, pojo2.getAge());
assertEquals("Bela", pojo2.getName());
@@ -431,7 +429,7 @@
}
- public void testExists() throws Exception
+ public void testExists()
{
cache.put("/eins/zwei/drei", "key1", "val1");
assertTrue(cache.exists("/eins/zwei/drei"));
@@ -616,7 +614,7 @@
}
}
- public void testGetChildren8() throws Exception
+ public void testGetChildren8()
{
cache.put("/a/1", null);
cache.put("/a/2", null);
@@ -794,7 +792,7 @@
}
- public void testRemoveData() throws Exception
+ public void testRemoveData()
{
String key = "/x/y/z/";
cache.put(key, "keyA", "valA");
@@ -810,7 +808,7 @@
}
- public void testRemoveData2() throws Exception
+ public void testRemoveData2()
{
Set keys;
Fqn key = Fqn.fromString("/x/y/z/");
@@ -828,7 +826,7 @@
assertEquals(0, keys.size());
}
- public void testRemoveData3() throws Exception
+ public void testRemoveData3()
{
Set keys;
Fqn key = Fqn.fromString("/x/y/z/");
@@ -843,7 +841,7 @@
assertEquals("no more keys", 0, keys.size());
}
- public void testRemoveKey() throws Exception
+ public void testRemoveKey()
{
String key = "/x/y/z/";
cache.put(key, "keyA", "valA");
@@ -859,13 +857,13 @@
{
final String NODE = "/test";
final String KEY = "key";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
- retval = cache.put(NODE, KEY, new Integer(10));
+ retval = cache.put(NODE, KEY, 10);
assertNull(retval);
addDelay();
retval = cache.remove(NODE, KEY);
- assertEquals(new Integer(10), retval);
+ assertEquals(10, retval);
addDelay();
retval = cache.remove(NODE, KEY);
assertNull(retval);
@@ -875,15 +873,15 @@
{
final String NODE = "/test";
final String KEY = "key";
- Object retval = null;
+ Object retval;
cache.remove(NODE);
- retval = cache.put(NODE, KEY, new Integer(10));
+ retval = cache.put(NODE, KEY, 10);
assertNull(retval);
cache.evict(Fqn.fromString(NODE));// evicts from memory, but *not* from store
addDelay();
retval = cache.remove(NODE, KEY);
- assertEquals(new Integer(10), retval);
+ assertEquals(10, retval);
cache.evict(Fqn.fromString(NODE));// evicts from memory, but *not* from store
addDelay();
@@ -892,7 +890,7 @@
}
- public void testRemove() throws Exception
+ public void testRemove()
{
String key = "/x/y/z/";
cache.put(key, "keyA", "valA");
@@ -907,7 +905,7 @@
}
- public void testRemoveRoot() throws Exception
+ public void testRemoveRoot()
{
assertEquals(0, cache.getKeys("/").size());
cache.put("/1/2/3/4/5", null);
@@ -920,7 +918,7 @@
}
- public void testEvictionWithCacheLoader() throws Exception
+ public void testEvictionWithCacheLoader()
{
cache.put("/first/second", "key1", "val1");// stored in cache loader
cache.put("/first/second/third", "key2", "val2");// stored in cache loader
@@ -937,7 +935,7 @@
}
- public void testEvictionWithCacheLoader2() throws Exception
+ public void testEvictionWithCacheLoader2()
{
cache.put("/first/second/third", "key1", "val1");// stored in cache loader
cache.evict(Fqn.fromString("/first/second/third"));// removes node, because there are no children
@@ -980,13 +978,13 @@
System.out.println("lock info " + cache.printLockInfo());
- assertEquals(4, cache.getNumberOfLocksHeld());
+ assertEquals(5, cache.getNumberOfLocksHeld());
tx.commit();
}
- public void testTxPutCommit() throws Exception, NotSupportedException
+ public void testTxPutCommit() throws Exception
{
DummyTransactionManager mgr = DummyTransactionManager.getInstance();
mgr.begin();
@@ -1004,7 +1002,7 @@
cache.remove("/");
}
- public void testTxPutRollback() throws Exception, NotSupportedException
+ public void testTxPutRollback() throws Exception
{
DummyTransactionManager mgr = DummyTransactionManager.getInstance();
@@ -1520,7 +1518,7 @@
public void testTransactionRollback() throws Exception
{
loader.remove(Fqn.fromString("/"));
- int num = 0;
+ int num;
try
{
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
@@ -1626,9 +1624,8 @@
break;
case PUT_DATA:
Map map = mod.getData();
- for (Iterator iter = map.keySet().iterator(); iter.hasNext();)
+ for (Object key : map.keySet())
{
- Object key = iter.next();
assertEquals(map.get(key), loader.get(fqn).get(key));
}
break;
@@ -1735,15 +1732,15 @@
Complex c2 = new Complex(c1);
// Add objects
- loader.put(FQN, new Integer(1), c1);
- loader.put(FQN, new Integer(2), c2);
+ loader.put(FQN, 1, c1);
+ loader.put(FQN, 2, c2);
addDelay();
- assertEquals(c1, loader.get(FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(FQN).get(1));
+ assertEquals(c2, loader.get(FQN).get(2));
assertEquals(2, loader.get(FQN).size());
// Save state
- byte[] state = new byte[0];
+ byte[] state;
ByteArrayOutputStream baos = null;
MarshalledValueOutputStream os = null;
try
@@ -1782,8 +1779,8 @@
}
addDelay();
- assertEquals(c1, loader.get(FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(FQN).get(1));
+ assertEquals(c2, loader.get(FQN).get(2));
assertEquals(2, loader.get(FQN).size());
}
@@ -1931,16 +1928,16 @@
Complex c4 = new Complex(c3);
/* Add objects. */
- loader.put(FQN, new Integer(1), c1);
- loader.put(FQN, new Integer(2), c2);
- loader.put(SUBTREE_FQN, new Integer(1), c3);
- loader.put(SUBTREE_FQN, new Integer(2), c4);
+ loader.put(FQN, 1, c1);
+ loader.put(FQN, 2, c2);
+ loader.put(SUBTREE_FQN, 1, c3);
+ loader.put(SUBTREE_FQN, 2, c4);
addDelay();
- assertEquals(c1, loader.get(FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(FQN).get(1));
+ assertEquals(c2, loader.get(FQN).get(2));
assertEquals(2, loader.get(FQN).size());
- assertEquals(c3, loader.get(SUBTREE_FQN).get(new Integer(1)));
- assertEquals(c4, loader.get(SUBTREE_FQN).get(new Integer(2)));
+ assertEquals(c3, loader.get(SUBTREE_FQN).get(1));
+ assertEquals(c4, loader.get(SUBTREE_FQN).get(2));
assertEquals(2, loader.get(SUBTREE_FQN).size());
/* Save state. */
@@ -1959,11 +1956,11 @@
loader.storeState(SUBTREE_FQN, is);
is.close();
addDelay();
- assertEquals(c1, loader.get(FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(FQN).get(1));
+ assertEquals(c2, loader.get(FQN).get(2));
assertEquals(2, loader.get(FQN).size());
- assertEquals(c3, loader.get(SUBTREE_FQN).get(new Integer(1)));
- assertEquals(c4, loader.get(SUBTREE_FQN).get(new Integer(2)));
+ assertEquals(c3, loader.get(SUBTREE_FQN).get(1));
+ assertEquals(c4, loader.get(SUBTREE_FQN).get(2));
assertEquals(2, loader.get(SUBTREE_FQN).size());
}
@@ -1979,16 +1976,16 @@
Complex c4 = new Complex(c3);
/* Add objects. */
- loader.put(FQN, new Integer(1), c1);
- loader.put(FQN, new Integer(2), c2);
- loader.put(SUBTREE_FQN, new Integer(1), c3);
- loader.put(SUBTREE_FQN, new Integer(2), c4);
+ loader.put(FQN, 1, c1);
+ loader.put(FQN, 2, c2);
+ loader.put(SUBTREE_FQN, 1, c3);
+ loader.put(SUBTREE_FQN, 2, c4);
addDelay();
- assertEquals(c1, loader.get(FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(FQN).get(1));
+ assertEquals(c2, loader.get(FQN).get(2));
assertEquals(2, loader.get(FQN).size());
- assertEquals(c3, loader.get(SUBTREE_FQN).get(new Integer(1)));
- assertEquals(c4, loader.get(SUBTREE_FQN).get(new Integer(2)));
+ assertEquals(c3, loader.get(SUBTREE_FQN).get(1));
+ assertEquals(c4, loader.get(SUBTREE_FQN).get(2));
assertEquals(2, loader.get(SUBTREE_FQN).size());
/* Save state. */
@@ -2005,11 +2002,11 @@
loader.storeState(BUDDY_BASE, is);
is.close();
addDelay();
- assertEquals(c1, loader.get(BUDDY_PLUS_FQN).get(new Integer(1)));
- assertEquals(c2, loader.get(BUDDY_PLUS_FQN).get(new Integer(2)));
+ assertEquals(c1, loader.get(BUDDY_PLUS_FQN).get(1));
+ assertEquals(c2, loader.get(BUDDY_PLUS_FQN).get(2));
assertEquals(2, loader.get(BUDDY_PLUS_FQN).size());
- assertEquals(c3, loader.get(BUDDY_PLUS_SUBTREE_FQN).get(new Integer(1)));
- assertEquals(c4, loader.get(BUDDY_PLUS_SUBTREE_FQN).get(new Integer(2)));
+ assertEquals(c3, loader.get(BUDDY_PLUS_SUBTREE_FQN).get(1));
+ assertEquals(c4, loader.get(BUDDY_PLUS_SUBTREE_FQN).get(2));
assertEquals(2, loader.get(BUDDY_PLUS_SUBTREE_FQN).size());
}
More information about the jboss-cvs-commits
mailing list