[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/options ...
Manik Surtani
msurtani at jboss.com
Sat Dec 30 12:49:54 EST 2006
User: msurtani
Date: 06/12/30 12:49:54
Modified: tests/functional/org/jboss/cache/options
CacheModeLocalSimpleTest.java
SuppressLockingTest.java ExplicitVersionsTest.java
ExplicitVersionsReplTest.java FailSilentlyTest.java
Log:
Major changes to restructure cache and node object model
Revision Changes Path
1.6 +4 -4 JBossCache/tests/functional/org/jboss/cache/options/CacheModeLocalSimpleTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheModeLocalSimpleTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/CacheModeLocalSimpleTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CacheModeLocalSimpleTest.java 7 Sep 2006 15:42:16 -0000 1.5
+++ CacheModeLocalSimpleTest.java 30 Dec 2006 17:49:54 -0000 1.6
@@ -7,8 +7,8 @@
package org.jboss.cache.options;
import junit.framework.TestCase;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
@@ -19,18 +19,18 @@
*/
public class CacheModeLocalSimpleTest extends TestCase
{
- private TreeCache cache1, cache2;
+ private CacheImpl cache1, cache2;
private Option cacheModeLocal;
public void setUp() throws Exception
{
- cache1 = new TreeCache();
+ cache1 = new CacheImpl();
Configuration c = new Configuration();
cache1.setConfiguration(c);
c.setCacheMode("REPL_SYNC");
c.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
- cache2 = new TreeCache();
+ cache2 = new CacheImpl();
c = new Configuration();
cache2.setConfiguration(c);
c.setCacheMode("REPL_SYNC");
1.9 +26 -26 JBossCache/tests/functional/org/jboss/cache/options/SuppressLockingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SuppressLockingTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/SuppressLockingTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SuppressLockingTest.java 15 Dec 2006 15:28:37 -0000 1.8
+++ SuppressLockingTest.java 30 Dec 2006 17:49:54 -0000 1.9
@@ -7,9 +7,9 @@
package org.jboss.cache.options;
import junit.framework.TestCase;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.DummyTransactionManagerLookup;
import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCacheProxyImpl;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.DefaultCacheFactory;
@@ -27,7 +27,7 @@
private Fqn fqn = Fqn.fromString("/blah");
private Fqn fqn1 = Fqn.fromString("/blah/1");
- private TreeCacheProxyImpl cache;
+ private CacheImpl cache;
private TransactionManager m;
@@ -36,7 +36,7 @@
Configuration config = new Configuration();
config.setCacheMode(Configuration.CacheMode.LOCAL);
config.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
- cache = (TreeCacheProxyImpl) DefaultCacheFactory.createCache(config);
+ cache = (CacheImpl) DefaultCacheFactory.createCache(config);
m = cache.getTransactionManager();
}
@@ -59,9 +59,9 @@
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.put(fqn, "x", "1");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
cache.remove(fqn);
@@ -70,9 +70,9 @@
assertTrue(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.put(fqn, "x", "2");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
// test normal operation again
cache.remove(fqn);
@@ -81,9 +81,9 @@
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.put(fqn, "x", "3");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
}
/**
@@ -97,9 +97,9 @@
m.begin();
cache.put(fqn, "x", "1");
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
cache.remove(fqn);
@@ -108,9 +108,9 @@
cache.put(fqn, "x", "2");
cache.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
cache.put(fqn1, "y", "3");
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
Map map = new HashMap();
map.put("x", "1");
@@ -119,18 +119,18 @@
cache.put(fqn, map);
cache.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
cache.put(fqn1, map);
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
// test normal operation again
cache.remove(fqn);
m.begin();
cache.put(fqn, "x", "3");
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
}
public void testSuppressionOfReadLocks() throws Exception
@@ -141,18 +141,18 @@
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.get(fqn, "x");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
m.begin();
cache.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
assertTrue(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.get(fqn, "x");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
// test normal operation again
@@ -160,18 +160,18 @@
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
cache.get(fqn, "x");
assertFalse(cache.getInvocationContext().getOptionOverrides().isSuppressLocking());
- assertEquals(2, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(2, cache.getNumberOfLocksHeld());
m.commit();
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
+ assertEquals(0, cache.getNumberOfLocksHeld());
}
public void testNodeCreation()
{
- assertNull(cache.getChild(fqn));
+ assertNull(cache.getRoot().getChild(fqn));
cache.getInvocationContext().getOptionOverrides().setSuppressLocking(true);
cache.put(fqn, "x", "y");
- assertEquals(0, cache.treeCache.getNumberOfLocksHeld());
- assertEquals("y", cache.getChild(fqn).get("x"));
+ assertEquals(0, cache.getNumberOfLocksHeld());
+ assertEquals("y", cache.getRoot().getChild(fqn).get("x"));
}
}
1.9 +8 -8 JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExplicitVersionsTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ExplicitVersionsTest.java 12 Dec 2006 14:51:44 -0000 1.8
+++ ExplicitVersionsTest.java 30 Dec 2006 17:49:54 -0000 1.9
@@ -8,9 +8,9 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
-import org.jboss.cache.OptimisticTreeNode;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.NodeSPI;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.optimistic.DataVersion;
@@ -26,7 +26,7 @@
public class ExplicitVersionsTest extends TestCase
{
- private TreeCache cache;
+ private CacheImpl cache;
private Fqn fqn = Fqn.fromString("/a");
private String key = "key";
private Option option = new Option();
@@ -34,7 +34,7 @@
protected void setUp() throws Exception
{
if (cache != null) tearDown();
- cache = new TreeCache();
+ cache = new CacheImpl();
cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
cache.getConfiguration().setNodeLockingScheme("OPTIMISTIC");
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
@@ -60,7 +60,7 @@
Assert.assertEquals("value", cache.get(fqn, key));
// get a hold of the node
- OptimisticTreeNode node = (OptimisticTreeNode) cache.get(fqn);
+ NodeSPI node = (NodeSPI) cache.get(fqn);
DataVersion versionFromCache = node.getVersion();
Assert.assertEquals(TestVersion.class, versionFromCache.getClass());
@@ -115,14 +115,14 @@
public void testExplicitVersionOnLeaf() throws Exception
{
cache.put("/org/domain/Entity", null);
- assertEquals(1, ((DefaultDataVersion) ((OptimisticTreeNode) cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(1, ((DefaultDataVersion) ((NodeSPI) cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
TestVersion v = new TestVersion("Arse");
cache.getInvocationContext().getOptionOverrides().setDataVersion(v);
cache.put(Fqn.fromString("/org/domain/Entity/EntityInstance#1"), "k", "v");
- assertEquals(2, ((DefaultDataVersion) ((OptimisticTreeNode) cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
- assertEquals(v, ((OptimisticTreeNode) cache.get("/org/domain/Entity/EntityInstance#1")).getVersion());
+ assertEquals(2, ((DefaultDataVersion) ((NodeSPI) cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(v, ((NodeSPI) cache.get("/org/domain/Entity/EntityInstance#1")).getVersion());
}
}
1.6 +22 -22 JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExplicitVersionsReplTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ExplicitVersionsReplTest.java 12 Dec 2006 14:51:44 -0000 1.5
+++ ExplicitVersionsReplTest.java 30 Dec 2006 17:49:54 -0000 1.6
@@ -2,9 +2,9 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
-import org.jboss.cache.OptimisticTreeNode;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.NodeSPI;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.optimistic.DataVersion;
@@ -20,22 +20,22 @@
*/
public class ExplicitVersionsReplTest extends TestCase
{
- private TreeCache cache[];
+ private CacheImpl cache[];
private Fqn fqn = Fqn.fromString("/a");
private String key = "key";
protected void setUp() throws Exception
{
if (cache != null) tearDown();
- cache = new TreeCache[2];
+ cache = new CacheImpl[2];
cache[0] = createCache();
cache[1] = createCache();
TestingUtil.blockUntilViewsReceived(cache, 20000);
}
- private TreeCache createCache() throws Exception
+ private CacheImpl createCache() throws Exception
{
- TreeCache cache = new TreeCache();
+ CacheImpl cache = new CacheImpl();
Configuration c = cache.getConfiguration();
c.setCacheMode(Configuration.CacheMode.REPL_SYNC);
c.setNodeLockingScheme("OPTIMISTIC");
@@ -55,12 +55,12 @@
{
if (cache != null)
{
- for (TreeCache aCache : cache) destroyCache(aCache);
+ for (CacheImpl aCache : cache) destroyCache(aCache);
cache = null;
}
}
- private void destroyCache(TreeCache c)
+ private void destroyCache(CacheImpl c)
{
TransactionManager tm = c.getTransactionManager();
try
@@ -253,16 +253,16 @@
assertEquals("value", cache[0].get(fqn, key));
assertEquals("value", cache[1].get(fqn, key));
- assertEquals(expected, ((OptimisticTreeNode) cache[0].get(fqn)).getVersion());
- assertEquals(expected, ((OptimisticTreeNode) cache[1].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[0].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[1].get(fqn)).getVersion());
cache[1].put(fqn, key, "value2");
expected = (DefaultDataVersion) expected.increment();
assertEquals("value2", cache[0].get(fqn, key));
assertEquals("value2", cache[1].get(fqn, key));
- assertEquals(expected, ((OptimisticTreeNode) cache[0].get(fqn)).getVersion());
- assertEquals(expected, ((OptimisticTreeNode) cache[1].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[0].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[1].get(fqn)).getVersion());
}
public void testPropagationOfCustomVersions() throws Exception
@@ -273,8 +273,8 @@
assertEquals("value", cache[0].get(fqn, key));
assertEquals("value", cache[1].get(fqn, key));
- assertEquals(expected, ((OptimisticTreeNode) cache[0].get(fqn)).getVersion());
- assertEquals(expected, ((OptimisticTreeNode) cache[1].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[0].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[1].get(fqn)).getVersion());
expected = new TestVersion("200");
cache[1].getInvocationContext().getOptionOverrides().setDataVersion(expected);
@@ -282,8 +282,8 @@
assertEquals("value2", cache[0].get(fqn, key));
assertEquals("value2", cache[1].get(fqn, key));
- assertEquals(expected, ((OptimisticTreeNode) cache[0].get(fqn)).getVersion());
- assertEquals(expected, ((OptimisticTreeNode) cache[1].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[0].get(fqn)).getVersion());
+ assertEquals(expected, ((NodeSPI) cache[1].get(fqn)).getVersion());
}
public void testExplicitVersionOnRoot() throws Exception
@@ -301,18 +301,18 @@
public void testExplicitVersionOnLeaf() throws Exception
{
cache[0].put("/org/domain/Entity", null);
- assertEquals(1, ((DefaultDataVersion) ((OptimisticTreeNode) cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
- assertEquals(1, ((DefaultDataVersion) ((OptimisticTreeNode) cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(1, ((DefaultDataVersion) ((NodeSPI) cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(1, ((DefaultDataVersion) ((NodeSPI) cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
TestVersion v = new TestVersion("Arse");
cache[0].getInvocationContext().getOptionOverrides().setDataVersion(v);
cache[0].put(Fqn.fromString("/org/domain/Entity/EntityInstance#1"), "k", "v");
- assertEquals(2, ((DefaultDataVersion) ((OptimisticTreeNode) cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
- assertEquals(v, ((OptimisticTreeNode) cache[0].get("/org/domain/Entity/EntityInstance#1")).getVersion());
- assertEquals(2, ((DefaultDataVersion) ((OptimisticTreeNode) cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
- assertEquals(v, ((OptimisticTreeNode) cache[1].get("/org/domain/Entity/EntityInstance#1")).getVersion());
+ assertEquals(2, ((DefaultDataVersion) ((NodeSPI) cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(v, ((NodeSPI) cache[0].get("/org/domain/Entity/EntityInstance#1")).getVersion());
+ assertEquals(2, ((DefaultDataVersion) ((NodeSPI) cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
+ assertEquals(v, ((NodeSPI) cache[1].get("/org/domain/Entity/EntityInstance#1")).getVersion());
}
1.7 +3 -3 JBossCache/tests/functional/org/jboss/cache/options/FailSilentlyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FailSilentlyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/FailSilentlyTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- FailSilentlyTest.java 13 Dec 2006 18:15:52 -0000 1.6
+++ FailSilentlyTest.java 30 Dec 2006 17:49:54 -0000 1.7
@@ -7,8 +7,8 @@
package org.jboss.cache.options;
import junit.framework.TestCase;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
import org.jboss.cache.config.Configuration;
import javax.transaction.Transaction;
@@ -23,7 +23,7 @@
*/
public class FailSilentlyTest extends TestCase
{
- private TreeCache cache;
+ private CacheImpl cache;
private TransactionManager manager;
private Transaction tx;
private Fqn fqn = Fqn.fromString("/a");
@@ -32,7 +32,7 @@
protected void setUp() throws Exception
{
if (cache != null) tearDown();
- cache = new TreeCache();
+ cache = new CacheImpl();
// very short acquisition timeout
cache.getConfiguration().setLockAcquisitionTimeout(100);
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
More information about the jboss-cvs-commits
mailing list