[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/loader ...
Manik Surtani
msurtani at jboss.com
Tue Jan 2 12:15:30 EST 2007
User: msurtani
Date: 07/01/02 12:15:30
Modified: tests/functional/org/jboss/cache/loader
CacheLoaderMethodCallCounterTest.java
ChainingCacheLoaderFullTest.java
CacheLoaderWithReplicationTest.java
ClusteredCacheLoaderTest.java
CacheLoaderTestsBase.java
CacheLoaderPurgingTest.java
SingletonStoreCacheLoaderTest.java
AsyncFileCacheLoaderTest.java
DataSourceIntegrationTest.java
Log:
some api changes
Revision Changes Path
1.13 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderMethodCallCounterTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CacheLoaderMethodCallCounterTest.java 30 Dec 2006 17:49:57 -0000 1.12
+++ CacheLoaderMethodCallCounterTest.java 2 Jan 2007 17:15:29 -0000 1.13
@@ -30,7 +30,7 @@
cache = new CacheImpl();
cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, false));
cache.start();
- dummyLoader = (DummyCacheLoader) cache.getCacheLoader();
+ dummyLoader = (DummyCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
}
protected void tearDown()
1.10 +3 -3 JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoaderFullTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ChainingCacheLoaderFullTest.java 30 Dec 2006 17:49:57 -0000 1.9
+++ ChainingCacheLoaderFullTest.java 2 Jan 2007 17:15:29 -0000 1.10
@@ -55,9 +55,9 @@
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache.start();
- chainingCacheLoader = (ChainingCacheLoader) cache.getCacheLoader();
- loader1 = (CacheLoader) chainingCacheLoader.getCacheLoaders().get(0);
- loader2 = (CacheLoader) chainingCacheLoader.getCacheLoaders().get(1);
+ chainingCacheLoader = (ChainingCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
+ loader1 = chainingCacheLoader.getCacheLoaders().get(0);
+ loader2 = chainingCacheLoader.getCacheLoaders().get(1);
}
protected void cleanup() throws Exception
1.26 +10 -10 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderWithReplicationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CacheLoaderWithReplicationTest.java 30 Dec 2006 17:49:57 -0000 1.25
+++ CacheLoaderWithReplicationTest.java 2 Jan 2007 17:15:29 -0000 1.26
@@ -68,7 +68,7 @@
try
{
cache1.remove(fqn);
- cache1.getCacheLoader().remove(fqn);
+ cache1.getCacheLoaderManager().getCacheLoader().remove(fqn);
cache1.stop();
}
finally
@@ -82,7 +82,7 @@
try
{
cache2.remove(fqn);
- cache2.getCacheLoader().remove(fqn);
+ cache2.getCacheLoaderManager().getCacheLoader().remove(fqn);
cache2.stop();
}
finally
@@ -121,8 +121,8 @@
Assert.assertNull(cache2.get(fqn, key));
- CacheLoader loader1 = cache1.getCacheLoader();
- CacheLoader loader2 = cache2.getCacheLoader();
+ CacheLoader loader1 = cache1.getCacheLoaderManager().getCacheLoader();
+ CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
TransactionManager mgr = cache1.getTransactionManager();
mgr.begin();
@@ -166,8 +166,8 @@
cache1.start();
cache2.start();
- CacheLoader loader1 = cache1.getCacheLoader();
- CacheLoader loader2 = cache2.getCacheLoader();
+ CacheLoader loader1 = cache1.getCacheLoaderManager().getCacheLoader();
+ CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
// make sure everything is empty...
Assert.assertNull(loader1.get(fqn));
@@ -226,8 +226,8 @@
cache1.start();
cache2.start();
- CacheLoader loader1 = cache1.getCacheLoader();
- CacheLoader loader2 = cache2.getCacheLoader();
+ CacheLoader loader1 = cache1.getCacheLoaderManager().getCacheLoader();
+ CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
TransactionManager mgr = cache1.getTransactionManager();
mgr.begin();
@@ -280,8 +280,8 @@
cache1.start();
cache2.start();
- CacheLoader loader1 = cache1.getCacheLoader();
- CacheLoader loader2 = cache2.getCacheLoader();
+ CacheLoader loader1 = cache1.getCacheLoaderManager().getCacheLoader();
+ CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
TransactionManager mgr = cache1.getTransactionManager();
mgr.begin();
1.12 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClusteredCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ClusteredCacheLoaderTest.java 30 Dec 2006 17:49:57 -0000 1.11
+++ ClusteredCacheLoaderTest.java 2 Jan 2007 17:15:29 -0000 1.12
@@ -48,8 +48,8 @@
cache1.start();
cache2.start();
- loader1 = cache1.getCacheLoader();
- loader2 = cache2.getCacheLoader();
+ loader1 = cache1.getCacheLoaderManager().getCacheLoader();
+ loader2 = cache2.getCacheLoaderManager().getCacheLoader();
}
protected void tearDown()
1.41 +29 -20 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.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- CacheLoaderTestsBase.java 2 Jan 2007 13:30:29 -0000 1.40
+++ CacheLoaderTestsBase.java 2 Jan 2007 17:15:29 -0000 1.41
@@ -29,7 +29,7 @@
* Commons tests for all CacheLoaders
*
* @author Bela Ban
- * @version $Id: CacheLoaderTestsBase.java,v 1.40 2007/01/02 13:30:29 msurtani Exp $
+ * @version $Id: CacheLoaderTestsBase.java,v 1.41 2007/01/02 17:15:29 msurtani Exp $
*/
abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
{
@@ -69,7 +69,7 @@
c.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
configureCache();
cache.start();
- loader = cache.getCacheLoader();
+ loader = cache.getCacheLoaderManager().getCacheLoader();
}
abstract protected void configureCache() throws Exception;
@@ -217,19 +217,20 @@
addDelay();
- assertEquals(valueA, cache.getCacheLoader().get(a).get(key));
- assertEquals(valueB, cache.getCacheLoader().get(b).get(key));
- assertTrue(cache.getCacheLoader().getChildrenNames(Fqn.ROOT).contains("a"));
- assertTrue(cache.getCacheLoader().getChildrenNames(Fqn.ROOT).contains("b"));
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
+ assertEquals(valueA, loader.get(a).get(key));
+ assertEquals(valueB, loader.get(b).get(key));
+ assertTrue(loader.getChildrenNames(Fqn.ROOT).contains("a"));
+ assertTrue(loader.getChildrenNames(Fqn.ROOT).contains("b"));
// now move
cache.move(b, a);
addDelay();
- assertEquals(valueA, cache.getCacheLoader().get(a).get(key));
- assertNull(cache.getCacheLoader().get(b));
- assertEquals(valueB, cache.getCacheLoader().get(a_b).get(key));
+ assertEquals(valueA, loader.get(a).get(key));
+ assertNull(loader.get(b));
+ assertEquals(valueB, loader.get(a_b).get(key));
}
@@ -250,20 +251,20 @@
addDelay();
- assertEquals(valueA, cache.getCacheLoader().get(a).get(key));
- assertEquals(valueB, cache.getCacheLoader().get(b).get(key));
- assertEquals(valueC, cache.getCacheLoader().get(b_c).get(key));
+ assertEquals(valueA, cache.getCacheLoaderManager().getCacheLoader().get(a).get(key));
+ assertEquals(valueB, cache.getCacheLoaderManager().getCacheLoader().get(b).get(key));
+ assertEquals(valueC, cache.getCacheLoaderManager().getCacheLoader().get(b_c).get(key));
// now move
cache.move(b, a);
addDelay();
- assertEquals(valueA, cache.getCacheLoader().get(a).get(key));
- assertNull(cache.getCacheLoader().get(b));
- assertEquals(valueB, cache.getCacheLoader().get(a_b).get(key));
- assertNull(cache.getCacheLoader().get(b_c));
- assertEquals(valueC, cache.getCacheLoader().get(a_b_c).get(key));
+ assertEquals(valueA, cache.getCacheLoaderManager().getCacheLoader().get(a).get(key));
+ assertNull(cache.getCacheLoaderManager().getCacheLoader().get(b));
+ assertEquals(valueB, cache.getCacheLoaderManager().getCacheLoader().get(a_b).get(key));
+ assertNull(cache.getCacheLoaderManager().getCacheLoader().get(b_c));
+ assertEquals(valueC, cache.getCacheLoaderManager().getCacheLoader().get(a_b_c).get(key));
}
@@ -791,6 +792,14 @@
}
}
+ public void testLoaderGetChildrenNames() throws Exception
+ {
+ Fqn f = Fqn.fromString("/a");
+ cache.put(f, "k", "v");
+ assertEquals("v", loader.get(f).get("k"));
+ assertNull(loader.getChildrenNames(f));
+ }
+
public void testRemoveData()
{
@@ -1837,7 +1846,7 @@
String key = "key";
String value = "value";
cache.put(fqn, key, value);
- loader = cache.getCacheLoader();
+ loader = cache.getCacheLoaderManager().getCacheLoader();
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader.get(fqn).get(key));
@@ -1863,7 +1872,7 @@
String value = "value";
cache.put(fqn, key, value);
- loader = cache.getCacheLoader();
+ loader = cache.getCacheLoaderManager().getCacheLoader();
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader.get(fqn).get(key));
@@ -1889,7 +1898,7 @@
String value = "value";
cache.put(fqn, key, value);
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader.get(fqn).get(key));
1.8 +3 -3 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderPurgingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderPurgingTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderPurgingTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- CacheLoaderPurgingTest.java 30 Dec 2006 17:49:57 -0000 1.7
+++ CacheLoaderPurgingTest.java 2 Jan 2007 17:15:30 -0000 1.8
@@ -43,7 +43,7 @@
cache.put(fqn, key, value);
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader.get(fqn).get(key));
@@ -67,7 +67,7 @@
cache.put(fqn, key, value);
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader.get(fqn).get(key));
@@ -119,7 +119,7 @@
cache.put(fqn, key, value);
- CacheLoader loader[] = (CacheLoader[]) ((ChainingCacheLoader) cache.getCacheLoader()).getCacheLoaders().toArray(new CacheLoader[]{});
+ CacheLoader loader[] = ((ChainingCacheLoader) cache.getCacheLoaderManager().getCacheLoader()).getCacheLoaders().toArray(new CacheLoader[]{});
assertEquals(value, cache.get(fqn, key));
assertEquals(value, loader[0].get(fqn).get(key));
1.5 +3 -3 JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SingletonStoreCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SingletonStoreCacheLoaderTest.java 30 Dec 2006 17:49:57 -0000 1.4
+++ SingletonStoreCacheLoaderTest.java 2 Jan 2007 17:15:30 -0000 1.5
@@ -138,7 +138,7 @@
stopCache1();
Thread.sleep(1000);
- SingletonStoreCacheLoader scl2 = (SingletonStoreCacheLoader) cache2.getCacheLoader();
+ SingletonStoreCacheLoader scl2 = (SingletonStoreCacheLoader) cache2.getCacheLoaderManager().getCacheLoader();
joinPushThread(scl2.getPushStateThread());
assertTrue(cl2.get(fqn("/a")).containsKey("a-key"));
@@ -170,7 +170,7 @@
stopCache2();
Thread.sleep(1000);
- SingletonStoreCacheLoader scl3 = (SingletonStoreCacheLoader) cache3.getCacheLoader();
+ SingletonStoreCacheLoader scl3 = (SingletonStoreCacheLoader) cache3.getCacheLoaderManager().getCacheLoader();
joinPushThread(scl3.getPushStateThread());
assertTrue(cl3.get(fqn("/a")).containsKey("a-key"));
@@ -269,7 +269,7 @@
private CacheLoader getDelegatingCacheLoader(CacheSPI cache)
{
- AbstractDelegatingCacheLoader acl = (AbstractDelegatingCacheLoader) cache.getCacheLoader();
+ AbstractDelegatingCacheLoader acl = (AbstractDelegatingCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
return acl.getCacheLoader();
}
1.18 +5 -5 JBossCache/tests/functional/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AsyncFileCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- AsyncFileCacheLoaderTest.java 30 Dec 2006 17:49:57 -0000 1.17
+++ AsyncFileCacheLoaderTest.java 2 Jan 2007 17:15:30 -0000 1.18
@@ -54,7 +54,7 @@
public void testRestrictionOnAddingToQueue() throws Exception
{
configureCache();
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
loader.remove(Fqn.fromString("/blah"));
loader.put(Fqn.fromString("/blah"), "one", "two");
@@ -85,7 +85,7 @@
"cache.async.put=false\n" +
"cache.async.pollWait=10000\n" +
"");
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
Fqn fqn = Fqn.fromString("/a/b/c/d");
HashMap map = new HashMap();
map.put("c", "d");
@@ -104,7 +104,7 @@
"cache.async.queueSize=1\n" +
"cache.async.pollWait=10\n" +
"");
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
Fqn fqn = Fqn.fromString("/bound");
loader.remove(fqn);
// You can't really see it block though :-/
@@ -123,7 +123,7 @@
"cache.async.returnOld=false\n" +
"cache.async.pollWait=10\n" +
"");
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
System.out.println("Loader " + loader);
cache.put(Fqn.ROOT, "key1", "value1");
Thread.sleep(100);
@@ -136,7 +136,7 @@
{
configureCache();
Fqn X = Fqn.fromString("/x");
- CacheLoader loader = cache.getCacheLoader();
+ CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
loader.remove(X);
cache.put(X, "key1", "value1");
Thread.sleep(1000);
1.11 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/DataSourceIntegrationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataSourceIntegrationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/DataSourceIntegrationTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- DataSourceIntegrationTest.java 30 Dec 2006 17:49:57 -0000 1.10
+++ DataSourceIntegrationTest.java 2 Jan 2007 17:15:30 -0000 1.11
@@ -70,7 +70,7 @@
assertNotNull(JNDI_NAME + " bound", context.lookup(JNDI_NAME));
cache.start();
- assertNotNull("Cache has a cache loader", cache.getCacheLoader());
+ assertNotNull("Cache has a cache loader", cache.getCacheLoaderManager().getCacheLoader());
}
protected void tearDown() throws Exception
More information about the jboss-cvs-commits
mailing list