[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/optimistic ...
Elias Ross
genman at noderunner.net
Sun Nov 19 22:53:57 EST 2006
User: genman
Date: 06/11/19 22:53:57
Modified: tests/functional/org/jboss/cache/optimistic
AsyncFullStackInterceptorTest.java
FullStackInterceptorTest.java
NodeInterceptorRemoveNodeTest.java
OpLockingInterceptorTest.java
Log:
JBCACHE-867, Move methods from the ProxyImpl to Node, refactor Node classes as well
Revision Changes Path
1.6 +21 -21 JBossCache/tests/functional/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AsyncFullStackInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AsyncFullStackInterceptorTest.java 20 Jul 2006 09:03:54 -0000 1.5
+++ AsyncFullStackInterceptorTest.java 20 Nov 2006 03:53:56 -0000 1.6
@@ -97,12 +97,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -165,11 +165,11 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -208,11 +208,11 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -229,9 +229,9 @@
assertTrue(cache2.exists(Fqn.fromString("/one/two")));
assertNotNull(cache2.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache2.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache2.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
@@ -270,12 +270,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -292,9 +292,9 @@
assertTrue(cache2.exists(Fqn.fromString("/one/two")));
assertNotNull(cache2.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache2.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache2.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
@@ -382,9 +382,9 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock().isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
1.19 +26 -26 JBossCache/tests/functional/org/jboss/cache/optimistic/FullStackInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FullStackInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/FullStackInterceptorTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- FullStackInterceptorTest.java 20 Jul 2006 10:54:01 -0000 1.18
+++ FullStackInterceptorTest.java 20 Nov 2006 03:53:56 -0000 1.19
@@ -84,12 +84,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -129,12 +129,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
destroyCache(cache);
@@ -209,12 +209,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -277,11 +277,11 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -320,11 +320,11 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -338,9 +338,9 @@
assertTrue(cache2.exists(Fqn.fromString("/one/two")));
assertNotNull(cache2.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache2.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache2.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
@@ -379,12 +379,12 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock()
.isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock()
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock()
.isLocked());
assertEquals(false, cache.get(Fqn.fromString("/one/two"))
- .getLock().isLocked());
+ .getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
@@ -398,8 +398,8 @@
assertTrue(cache2.exists(Fqn.fromString("/one/two")));
assertNotNull(cache2.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache2.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache2.get(Fqn.fromString("/one")).getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache2.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
assertEquals(false, cache2.get(Fqn.fromString("/one/two")).getLock().isLocked());
assertNotNull(cache2.get(Fqn.fromString("/one")).getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
@@ -482,9 +482,9 @@
assertTrue(cache.exists(Fqn.fromString("/one/two")));
assertNotNull(cache.get(Fqn.fromString("/")).getChild("one"));
- assertEquals(false, cache.get(Fqn.fromString("/")).getLock().isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one")).getLock().isLocked());
- assertEquals(false, cache.get(Fqn.fromString("/one/two")).getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one")).getNodeSPI().getLock().isLocked());
+ assertEquals(false, cache.get(Fqn.fromString("/one/two")).getNodeSPI().getLock().isLocked());
assertNotNull(cache.get(Fqn.fromString("/one")).getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
1.13 +5 -4 JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeInterceptorRemoveNodeTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NodeInterceptorRemoveNodeTest.java 6 Sep 2006 15:30:58 -0000 1.12
+++ NodeInterceptorRemoveNodeTest.java 20 Nov 2006 03:53:56 -0000 1.13
@@ -8,6 +8,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.GlobalTransaction;
+import org.jboss.cache.Node;
import org.jboss.cache.OptimisticTransactionEntry;
import org.jboss.cache.TransactionTable;
import org.jboss.cache.TreeCache;
@@ -335,8 +336,8 @@
TransactionWorkspace workspace = entry.getTransactionWorkSpace();
- TreeNode one = workspace.getNode(Fqn.fromString("/one"));
- TreeNode two = workspace.getNode(Fqn.fromString("/one/two"));
+ Node one = workspace.getNode(Fqn.fromString("/one"));
+ Node two = workspace.getNode(Fqn.fromString("/one/two"));
cache.remove("/one");
@@ -421,8 +422,8 @@
TransactionWorkspace workspace = entry.getTransactionWorkSpace();
- TreeNode one = workspace.getNode(Fqn.fromString("/one"));
- TreeNode two = workspace.getNode(Fqn.fromString("/one/two"));
+ Node one = workspace.getNode(Fqn.fromString("/one"));
+ Node two = workspace.getNode(Fqn.fromString("/one/two"));
cache.remove("/one");
1.16 +11 -10 JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OpLockingInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- OpLockingInterceptorTest.java 6 Sep 2006 15:30:58 -0000 1.15
+++ OpLockingInterceptorTest.java 20 Nov 2006 03:53:56 -0000 1.16
@@ -9,6 +9,7 @@
import org.jboss.cache.DataNode;
import org.jboss.cache.Fqn;
import org.jboss.cache.GlobalTransaction;
+import org.jboss.cache.Node;
import org.jboss.cache.OptimisticTransactionEntry;
import org.jboss.cache.TransactionTable;
import org.jboss.cache.TreeCache;
@@ -17,7 +18,7 @@
import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
import org.jboss.cache.loader.SamplePojo;
-import org.jboss.cache.lock.IdentityLock;
+import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -120,7 +121,7 @@
assertEquals(3, entry.getLocks().size());
for (Iterator it = entry.getLocks().iterator(); it.hasNext();)
{
- IdentityLock lock = (IdentityLock) it.next();
+ NodeLock lock = (NodeLock) it.next();
assertTrue(lock.isWriteLocked());
assertEquals(gtx, lock.getWriterOwner());
}
@@ -211,7 +212,7 @@
assertEquals(3, entry.getLocks().size());
for (Iterator it = entry.getLocks().iterator(); it.hasNext();)
{
- IdentityLock lock = (IdentityLock) it.next();
+ NodeLock lock = (NodeLock) it.next();
assertTrue(lock.isWriteLocked());
assertEquals(gtx, lock.getWriterOwner());
}
@@ -233,7 +234,7 @@
assertEquals(3, entry.getLocks().size());
for (Iterator it = entry.getLocks().iterator(); it.hasNext();)
{
- IdentityLock lock = (IdentityLock) it.next();
+ NodeLock lock = (NodeLock) it.next();
assertEquals(false, lock.isLocked());
}
@@ -241,8 +242,8 @@
int i = 0;
for (Iterator it = workspace.getNodes().values().iterator(); it.hasNext();)
{
- DataNode node = ((WorkspaceNode) it.next()).getNode();
- assertEquals(node.getLock(), entry.getLocks().get(i));
+ Node node = ((WorkspaceNode) it.next()).getNode();
+ assertEquals(node.getNodeSPI().getLock(), entry.getLocks().get(i));
i++;
}
assertEquals(MethodDeclarations.commitMethod, dummy.getCalled());
@@ -328,7 +329,7 @@
assertEquals(3, entry.getLocks().size());
for (Iterator it = entry.getLocks().iterator(); it.hasNext();)
{
- IdentityLock lock = (IdentityLock) it.next();
+ NodeLock lock = (NodeLock) it.next();
assertTrue(lock.isWriteLocked());
assertEquals(gtx, lock.getWriterOwner());
}
@@ -349,7 +350,7 @@
assertEquals(3, entry.getLocks().size());
for (Iterator it = entry.getLocks().iterator(); it.hasNext();)
{
- IdentityLock lock = (IdentityLock) it.next();
+ NodeLock lock = (NodeLock) it.next();
assertEquals(false, lock.isLocked());
}
@@ -357,8 +358,8 @@
int i = 0;
for (Iterator it = workspace.getNodes().values().iterator(); it.hasNext();)
{
- DataNode node = ((WorkspaceNode) it.next()).getNode();
- assertEquals(node.getLock(), entry.getLocks().get(i));
+ Node node = ((WorkspaceNode) it.next()).getNode();
+ assertEquals(node.getNodeSPI().getLock(), entry.getLocks().get(i));
i++;
}
assertEquals(MethodDeclarations.rollbackMethod, dummy.getCalled());
More information about the jboss-cvs-commits
mailing list