[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/invalidation ...
Manik Surtani
msurtani at jboss.com
Wed Sep 6 11:30:57 EDT 2006
User: msurtani
Date: 06/09/06 11:30:57
Modified: tests/functional/org/jboss/cache/invalidation
InvalidationInterceptorTest.java
Log:
Removed TreeCache dependency on ServiceMBeanSupport
Revision Changes Path
1.17 +613 -613 JBossCache/tests/functional/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvalidationInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/invalidation/InvalidationInterceptorTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- InvalidationInterceptorTest.java 9 Aug 2006 14:50:00 -0000 1.16
+++ InvalidationInterceptorTest.java 6 Sep 2006 15:30:57 -0000 1.17
@@ -60,8 +60,8 @@
Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
@@ -91,23 +91,22 @@
assertNull(cache1.get(fqn1, "hello"));
assertNull(cache1.get(fqn2, "hello"));
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
-
public void testPessimisticNonTransactionalAsync() throws Exception
{
- TreeCache cache1 = createUnstartedCache( false );
- TreeCache cache2 = createUnstartedCache( false );
+ TreeCache cache1 = createUnstartedCache(false);
+ TreeCache cache2 = createUnstartedCache(false);
cache1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
cache2.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
- cache1.startService();
- cache2.startService();
+ cache1.start();
+ cache2.start();
Fqn fqn = Fqn.fromString("/a/b");
cache1.put(fqn, "key", "value");
@@ -131,8 +130,8 @@
Assert.assertNull("Should have been invalidated!", cache2.get(fqn));
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
@@ -190,8 +189,8 @@
Assert.assertNull("Should not have committed", cache2.get(fqn));
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
@@ -242,8 +241,8 @@
Assert.assertTrue("Ought to have failed!", true);
}
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
@@ -292,8 +291,8 @@
Assert.assertTrue("Ought to have succeeded!", false);
}
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
@@ -304,8 +303,8 @@
TreeCache cache2 = createUnstartedCache(false);
cache1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
cache2.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
- cache1.startService();
- cache2.startService();
+ cache1.start();
+ cache2.start();
Fqn fqn = Fqn.fromString("/a/b");
@@ -346,8 +345,8 @@
Assert.assertTrue("Ought to have succeeded!", false);
}
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
}
@@ -414,8 +413,8 @@
Assert.assertNull("Should not have committed", cache2.get(fqn));
// clean up.
- cache1.stopService();
- cache2.stopService();
+ cache1.stop();
+ cache2.stop();
cache1 = null;
cache2 = null;
@@ -444,10 +443,10 @@
Assert.assertEquals("value", caches[1].get(fqn, "key"));
// clean up.
- caches[0].remove( fqn );
- caches[1].remove( fqn );
- caches[0].stopService();
- caches[1].stopService();
+ caches[0].remove(fqn);
+ caches[1].remove(fqn);
+ caches[0].stop();
+ caches[1].stop();
caches[0] = null;
caches[1] = null;
}
@@ -479,8 +478,8 @@
// clean up.
caches[0].remove(fqn);
caches[1].remove(fqn);
- caches[0].stopService();
- caches[1].stopService();
+ caches[0].stop();
+ caches[1].stop();
caches[0] = null;
caches[1] = null;
}
@@ -514,8 +513,8 @@
// clean up.
caches[0].remove(fqn);
caches[1].remove(fqn);
- caches[0].stopService();
- caches[1].stopService();
+ caches[0].stop();
+ caches[1].stop();
caches[0] = null;
caches[1] = null;
}
@@ -545,8 +544,8 @@
caches[1].getConfiguration().setNodeLockingScheme("OPTIMISTIC");
}
- caches[0].startService();
- caches[1].startService();
+ caches[0].start();
+ caches[1].start();
TestingUtil.blockUntilViewsReceived(caches, 5000);
@@ -567,8 +566,8 @@
// clean up.
caches[0].remove(fqn);
caches[1].remove(fqn);
- caches[0].stopService();
- caches[1].stopService();
+ caches[0].stop();
+ caches[1].stop();
caches[0] = null;
caches[1] = null;
}
@@ -583,10 +582,11 @@
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
return cache;
}
+
protected TreeCache createCache(boolean optimistic) throws Exception
{
TreeCache cache = createUnstartedCache(optimistic);
- cache.startService();
+ cache.start();
return cache;
}
@@ -599,8 +599,8 @@
caches[0].getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig());
caches[1].getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig());
- caches[0].startService();
- caches[1].startService();
+ caches[0].start();
+ caches[1].start();
return caches;
}
More information about the jboss-cvs-commits
mailing list