[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/api ...
Manik Surtani
msurtani at jboss.com
Thu Jan 11 08:49:05 EST 2007
User: msurtani
Date: 07/01/11 08:49:05
Modified: tests/functional/org/jboss/cache/api
NodeAPITest.java NodeMoveAPITest.java
NodeSPITest.java SyncReplTest.java
SyncReplTxTest.java CacheAPITest.java
CacheSPITest.java NodeReplicatedMoveTest.java
Log:
Changed CacheImpl ctor to be protected, and changed cache factories accordingly
Revision Changes Path
1.14 +1 -1 JBossCache/tests/functional/org/jboss/cache/api/NodeAPITest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeAPITest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/NodeAPITest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NodeAPITest.java 4 Jan 2007 05:35:37 -0000 1.13
+++ NodeAPITest.java 11 Jan 2007 13:49:05 -0000 1.14
@@ -2,10 +2,10 @@
import junit.framework.TestCase;
import org.jboss.cache.CacheImpl;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.factories.DefaultCacheFactory;
import javax.transaction.TransactionManager;
import java.util.Map;
1.20 +18 -18 JBossCache/tests/functional/org/jboss/cache/api/NodeMoveAPITest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeMoveAPITest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/NodeMoveAPITest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NodeMoveAPITest.java 2 Jan 2007 18:26:05 -0000 1.19
+++ NodeMoveAPITest.java 11 Jan 2007 13:49:05 -0000 1.20
@@ -2,11 +2,11 @@
import EDU.oswego.cs.dl.util.concurrent.Latch;
import org.jboss.cache.CacheImpl;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeNotExistsException;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.factories.DefaultCacheFactory;
import org.jboss.cache.loader.AbstractCacheLoaderTestBase;
import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
@@ -324,20 +324,20 @@
if (useTx) tm.begin();
cache.move(nodeC.getFqn(), nodeB.getFqn());
-// Fqn[] fqns = {A, B, new Fqn(B, C), new Fqn(new Fqn(B, C), D), new Fqn(new Fqn(new Fqn(B, C), D), E)};
-// System.out.println("*** LOADER BEFORE COMMIT ");
-// for (Fqn f: fqns)
-// {
-// System.out.println(" Fqn: " + f);
-// System.out.println(" Contents in loader: " + loader.get(f));
-// }
+ // Fqn[] fqns = {A, B, new Fqn(B, C), new Fqn(new Fqn(B, C), D), new Fqn(new Fqn(new Fqn(B, C), D), E)};
+ // System.out.println("*** LOADER BEFORE COMMIT ");
+ // for (Fqn f: fqns)
+ // {
+ // System.out.println(" Fqn: " + f);
+ // System.out.println(" Contents in loader: " + loader.get(f));
+ // }
if (useTx) tm.commit();
-// System.out.println("*** LOADER AFTER COMMIT ");
-// for (Fqn f: fqns)
-// {
-// System.out.println(" Fqn: " + f);
-// System.out.println(" Contents in loader: " + loader.get(f));
-// }
+ // System.out.println("*** LOADER AFTER COMMIT ");
+ // for (Fqn f: fqns)
+ // {
+ // System.out.println(" Fqn: " + f);
+ // System.out.println(" Contents in loader: " + loader.get(f));
+ // }
log.info("Post commit tree is " + cache.printDetails());
@@ -406,7 +406,7 @@
tm.begin();
cache.move(nodeC.getFqn(), nodeB.getFqn());
-// nodeC should have a RL, nodeA should have a RL, nodeB should have a WL, nodeD should have a WL
+ // nodeC should have a RL, nodeA should have a RL, nodeB should have a WL, nodeD should have a WL
System.out.println("LOCKS: " + cache.printLockInfo());
@@ -428,7 +428,7 @@
cache.move(nodeC.getFqn(), nodeB.getFqn());
-// nodeC should have a RL, nodeA should have a RL, nodeB should have a WL
+ // nodeC should have a RL, nodeA should have a RL, nodeB should have a WL
System.out.println("LOCKS: " + cache.printLockInfo());
@@ -446,8 +446,8 @@
// TODO: investigate intermittent failure when in optimistic mode.
if (optimistic) return;
- final int N = 3; // number of threads
- final int loops = 1 << 6; // number of loops
+ final int N = 3;// number of threads
+ final int loops = 1 << 6;// number of loops
// tests a tree structure as such:
// /a
// /b
1.2 +1 -1 JBossCache/tests/functional/org/jboss/cache/api/NodeSPITest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeSPITest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/NodeSPITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NodeSPITest.java 10 Jan 2007 02:03:00 -0000 1.1
+++ NodeSPITest.java 11 Jan 2007 13:49:05 -0000 1.2
@@ -2,9 +2,9 @@
import junit.framework.TestCase;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.factories.DefaultCacheFactory;
import java.util.Map;
import java.util.Set;
1.10 +2 -2 JBossCache/tests/functional/org/jboss/cache/api/SyncReplTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SyncReplTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/SyncReplTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SyncReplTest.java 10 Jan 2007 15:29:10 -0000 1.9
+++ SyncReplTest.java 11 Jan 2007 13:49:05 -0000 1.10
@@ -10,12 +10,12 @@
import junit.framework.TestCase;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
-import org.jboss.cache.config.Option;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.DefaultCacheFactory;
+import org.jboss.cache.config.Option;
import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.misc.TestingUtil;
1.8 +2 -2 JBossCache/tests/functional/org/jboss/cache/api/SyncReplTxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SyncReplTxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/SyncReplTxTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- SyncReplTxTest.java 10 Jan 2007 15:29:10 -0000 1.7
+++ SyncReplTxTest.java 11 Jan 2007 13:49:05 -0000 1.8
@@ -10,12 +10,12 @@
import junit.framework.TestCase;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
-import org.jboss.cache.config.Option;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.DefaultCacheFactory;
+import org.jboss.cache.config.Option;
import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.transaction.DummyTransactionManager;
1.10 +1 -1 JBossCache/tests/functional/org/jboss/cache/api/CacheAPITest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheAPITest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/CacheAPITest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CacheAPITest.java 3 Jan 2007 23:45:56 -0000 1.9
+++ CacheAPITest.java 11 Jan 2007 13:49:05 -0000 1.10
@@ -5,13 +5,13 @@
import org.jboss.cache.Cache;
import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheListener;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.DummyTransactionManagerLookup;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.Region;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.ConfigurationException;
-import org.jboss.cache.factories.DefaultCacheFactory;
import java.util.ArrayList;
import java.util.HashMap;
1.9 +2 -2 JBossCache/tests/functional/org/jboss/cache/api/CacheSPITest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheSPITest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/CacheSPITest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- CacheSPITest.java 10 Jan 2007 15:29:10 -0000 1.8
+++ CacheSPITest.java 11 Jan 2007 13:49:05 -0000 1.9
@@ -2,9 +2,9 @@
import junit.framework.TestCase;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.DefaultCacheFactory;
import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.factories.XmlConfigurationParser;
1.11 +2 -2 JBossCache/tests/functional/org/jboss/cache/api/NodeReplicatedMoveTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeReplicatedMoveTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/api/NodeReplicatedMoveTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NodeReplicatedMoveTest.java 10 Jan 2007 15:29:10 -0000 1.10
+++ NodeReplicatedMoveTest.java 11 Jan 2007 13:49:05 -0000 1.11
@@ -8,11 +8,11 @@
import junit.framework.TestCase;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.DefaultCacheFactory;
import org.jboss.cache.factories.UnitTestCacheFactory;
import javax.transaction.TransactionManager;
@@ -115,7 +115,7 @@
try
{
- cache[0].move(cache[0].getRoot().getChild(B).getFqn(), cache[0].getRoot().getChild(A).getFqn()); // should throw an NPE
+ cache[0].move(cache[0].getRoot().getChild(B).getFqn(), cache[0].getRoot().getChild(A).getFqn());// should throw an NPE
fail("Expecting an exception");
}
catch (Exception e)
More information about the jboss-cvs-commits
mailing list