[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/mgmt ...
Manik Surtani
manik at jboss.org
Mon Jul 16 20:00:39 EDT 2007
User: msurtani
Date: 07/07/16 20:00:39
Modified: tests/functional/org/jboss/cache/mgmt CacheLoaderTest.java
Log:
Updated to reflect changes in JBCACHE-1133
Revision Changes Path
1.13 +47 -37 JBossCache/tests/functional/org/jboss/cache/mgmt/CacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/CacheLoaderTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CacheLoaderTest.java 11 Jan 2007 13:49:05 -0000 1.12
+++ CacheLoaderTest.java 17 Jul 2007 00:00:39 -0000 1.13
@@ -12,6 +12,7 @@
import org.jboss.cache.interceptors.CacheLoaderInterceptor;
import org.jboss.cache.interceptors.CacheStoreInterceptor;
import org.jboss.cache.loader.CacheLoader;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -22,7 +23,7 @@
* Simple functional tests for CacheLoaderInterceptor and CacheStoreInterceptor statistics
*
* @author Jerry Gauthier
- * @version $Id: CacheLoaderTest.java,v 1.12 2007/01/11 13:49:05 msurtani Exp $
+ * @version $Id: CacheLoaderTest.java,v 1.13 2007/07/17 00:00:39 msurtani Exp $
*/
public class CacheLoaderTest extends TestCase
{
@@ -57,6 +58,9 @@
{
assertNotNull("Cache is null.", cache);
+// loader.resetStatistics();
+// store.resetStatistics();
+
// note -it's essential to flush any existing test data from the cache loader
// otherwise the loads and misses counts will be incorrect
CacheLoader cl = cache.getCacheLoader();
@@ -76,11 +80,11 @@
// verify cache loader statistics for entries loaded into cache
int miss = 0;
- int load = 0;
+ int load = 2;
int stores = 11;
- assertEquals("CacheLoaderLoads count error: ", new Long(0), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// now try retrieving a valid attribute and an invalid attribute
Fqn key = Fqn.fromString("Europe/Austria");
@@ -88,10 +92,9 @@
assertNull("Retrieval error: did not expect to retrieve " + AREA + " for " + key, cache.get(key, AREA));
// verify statistics after retrieving entries - misses should still be same since nodes were already loaded
- load++;
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// now try retrieving an attribute for an invalid node
key = Fqn.fromString("Europe/Poland");
@@ -99,9 +102,9 @@
// verify statistics for after retrieving entries - misses should now be +1 after attempt to load Poland
miss++;
- assertEquals("CacheLoaderLoads count error: ", new Long(1), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// now evict Austria and confirm that it's no longer in cache
key = Fqn.fromString("Europe/Austria");
@@ -114,9 +117,9 @@
// verify statistics after retrieving evicted entry - loads should now be +1
load++;
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// now remove Austria and confirm that it's not in cache or loader
cache.remove(key);
@@ -124,9 +127,9 @@
assertFalse("Retrieval error: did not expect to find node " + key + " in loader", cl.exists(key));
// verify statistics after removing entry - should be unchanged
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// now try retrieving attributes again - each attempt should fail and cause a miss since node is now removed
assertNull("Retrieval error: did not expect to retrieve " + CAPITAL + " for " + key, cache.get(key, CAPITAL));
@@ -134,53 +137,60 @@
// verify statistics after trying to retrieve removed node's attributes - should be two more misses
miss += 2;
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// add a new node - this should cause a store
stores++;
cache.put("Europe/Poland", new HashMap());
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// add two attributes - this should cause two stores
+ // plus one load as we're doing put(k, v)
stores += 2;
+ load++;
cache.put("Europe/Poland", CAPITAL, "Warsaw");
cache.put("Europe/Poland", CURRENCY, "Zloty");
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// evict Poland and then try to retrieve an invalid attribute - this will cause a load as the node is restored
load++;
key = Fqn.fromString("Europe/Poland");
cache.evict(key);
assertNull("Retrieval error: did not expect to retrieve " + AREA + " for " + key, cache.get(key, AREA));
- assertEquals("CacheLoaderLoads count error: ", new Long(load), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error: ", new Long(miss), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error: ", new Long(stores), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error: ", load, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error: ", miss, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error: ", stores, store.getCacheLoaderStores());
// reset statistics
loader.resetStatistics();
store.resetStatistics();
// check the statistics again
- assertEquals("CacheLoaderLoads count error after reset: ", new Long(0), new Long(loader.getCacheLoaderLoads()));
- assertEquals("CacheLoaderMisses count error after reset: ", new Long(0), new Long(loader.getCacheLoaderMisses()));
- assertEquals("CacheLoaderStores count error after reset: ", new Long(0), new Long(store.getCacheLoaderStores()));
+ assertEquals("CacheLoaderLoads count error after reset: ", 0, loader.getCacheLoaderLoads());
+ assertEquals("CacheLoaderMisses count error after reset: ", 0, loader.getCacheLoaderMisses());
+ assertEquals("CacheLoaderStores count error after reset: ", 0, store.getCacheLoaderStores());
}
+ /**
+ * Should trigger 2 cache load events
+ */
private void loadCache(CacheImpl cache) throws Exception
{
cache.put(EUROPE_NODE, new HashMap());
cache.put("Europe/Austria", new HashMap());
+ // should cause a cache load
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
cache.put("Europe/Austria", POPULATION, 8184691);
cache.put("Europe/England", new HashMap());
+ // should cause a cache load
cache.put("Europe/England", CAPITAL, "London");
cache.put("Europe/England", CURRENCY, "British Pound");
cache.put("Europe/England", POPULATION, 60441457);
@@ -205,7 +215,7 @@
{
CacheImpl cache = (CacheImpl) DefaultCacheFactory.getInstance().createCache(false);
cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
- cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig("location=" + getTempDir()));
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig());
cache.getConfiguration().setExposeManagementStatistics(true);
cache.create();
cache.start();
@@ -250,15 +260,15 @@
return null;
}
- private CacheLoaderConfig getCacheLoaderConfig(String properties) throws Exception
+ private CacheLoaderConfig getCacheLoaderConfig() throws Exception
{
String xml = "<config>\n" +
"<passivation>false</passivation>\n" +
"<preload></preload>\n" +
"<shared>false</shared>\n" +
"<cacheloader>\n" +
- "<class>org.jboss.cache.loader.FileCacheLoader</class>\n" +
- "<properties>" + properties + "</properties>\n" +
+ "<class>" + DummyInMemoryCacheLoader.class.getName() + "</class>\n" +
+ "<properties>debug=true</properties>\n" +
"<async>false</async>\n" +
"<fetchPersistentState>false</fetchPersistentState>\n" +
"<ignoreModifications>false</ignoreModifications>\n" +
More information about the jboss-cvs-commits
mailing list