[infinispan-commits] Infinispan SVN: r927 - in trunk/core/src/test/java/org/infinispan: jmx and 5 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Oct 8 16:28:08 EDT 2009
Author: vblagojevic at jboss.com
Date: 2009-10-08 16:28:08 -0400 (Thu, 08 Oct 2009)
New Revision: 927
Modified:
trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
trunk/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java
trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java
Log:
[ISPN-220] - Test suite has memory leaks
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -28,26 +28,18 @@
@Test(groups = "functional", testName = "api.mvcc.PutForExternalReadTest")
public class PutForExternalReadTest extends MultipleCacheManagersTest {
- final String key = "k", value = "v", value2 = "v2";
- Cache cache1, cache2;
- TransactionManager tm1, tm2;
- ReplListener replListener1, replListener2;
+ final String key = "k", value = "v", value2 = "v2";
protected void createCacheManagers() throws Throwable {
Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
createClusteredCaches(2, "replSync", c);
-
- cache1 = cache(0, "replSync");
- cache2 = cache(1, "replSync");
-
- tm1 = TestingUtil.getTransactionManager(cache1);
- tm2 = TestingUtil.getTransactionManager(cache2);
-
- replListener1 = replListener(cache1);
- replListener2 = replListener(cache2);
}
public void testNoOpWhenKeyPresent() {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+ ReplListener replListener1 = replListener(cache1);
+ ReplListener replListener2 = replListener(cache2);
replListener2.expect(PutKeyValueCommand.class);
cache1.putForExternalRead(key, value);
replListener2.waitForRpc();
@@ -86,6 +78,9 @@
}
public void testAsyncForce() throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+
Transport mockTransport = createNiceMock(Transport.class);
RpcManagerImpl rpcManager = (RpcManagerImpl) TestingUtil.extractComponent(cache1, RpcManager.class);
Transport originalTransport = TestingUtil.extractComponent(cache1, Transport.class);
@@ -117,6 +112,12 @@
}
public void testTxSuspension() throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+ TransactionManager tm1 = TestingUtil.getTransactionManager(cache1);
+ TransactionManager tm2 = TestingUtil.getTransactionManager(cache2);
+ ReplListener replListener1 = replListener(cache1);
+ ReplListener replListener2 = replListener(cache2);
replListener2.expect(PutKeyValueCommand.class);
cache1.put(key + "0", value);
replListener2.waitForRpc();
@@ -140,6 +141,8 @@
}
public void testExceptionSuppression() throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
Transport mockTransport = createNiceMock(Transport.class);
RpcManagerImpl rpcManager = (RpcManagerImpl) TestingUtil.extractComponent(cache1, RpcManager.class);
Transport originalTransport = TestingUtil.extractComponent(cache1, Transport.class);
@@ -188,8 +191,12 @@
}
public void testBasicPropagation() throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+
assert !cache1.containsKey(key);
assert !cache2.containsKey(key);
+ ReplListener replListener2 = replListener(cache2);
replListener2.expect(PutKeyValueCommand.class);
cache1.putForExternalRead(key, value);
@@ -229,6 +236,12 @@
* Tests that suspended transactions do not leak. See JBCACHE-1246.
*/
public void testMemLeakOnSuspendedTransactions() throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+ TransactionManager tm1 = TestingUtil.getTransactionManager(cache1);
+ TransactionManager tm2 = TestingUtil.getTransactionManager(cache2);
+ ReplListener replListener2 = replListener(cache2);
+
replListener2.expect(PutKeyValueCommand.class);
tm1.begin();
cache1.putForExternalRead(key, value);
@@ -288,6 +301,10 @@
* @throws Exception
*/
private void cacheModeLocalTest(boolean transactional) throws Exception {
+ Cache cache1 = cache(0, "replSync");
+ Cache cache2 = cache(1, "replSync");
+ TransactionManager tm1 = TestingUtil.getTransactionManager(cache1);
+ TransactionManager tm2 = TestingUtil.getTransactionManager(cache2);
RpcManager rpcManager = EasyMock.createMock(RpcManager.class);
RpcManager originalRpcManager = TestingUtil.replaceComponent(cache1.getCacheManager(), RpcManager.class, rpcManager, true);
try {
@@ -310,6 +327,7 @@
// cleanup
TestingUtil.replaceComponent(cache1.getCacheManager(), RpcManager.class, originalRpcManager, true);
cache1.remove(key);
+ cache2.remove(key);
}
}
}
Modified: trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -27,15 +27,9 @@
*/
@Test(groups = "functional", testName = "jmx.RpcManagerMBeanTest")
public class RpcManagerMBeanTest extends MultipleCacheManagersTest {
+ private final String cachename = "repl_sync_cache";
+ public static final String JMX_DOMAIN = RpcManagerMBeanTest.class.getSimpleName();
- private MBeanServer mBeanServer;
- public static final String JMX_DOMAIN = RpcManagerMBeanTest.class.getSimpleName();
- private Cache cache1;
- private Cache cache2;
- private ObjectName rpcManager1;
- private ObjectName rpcManager2;
-
-
protected void createCacheManagers() throws Throwable {
GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
globalConfiguration.setExposeGlobalJmxStatistics(true);
@@ -56,17 +50,16 @@
registerCacheManager(cacheManager1, cacheManager2);
Configuration config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
- config.setExposeJmxStatistics(true);
- String cachename = "repl_sync_cache";
- defineConfigurationOnAllManagers(cachename, config);
- cache1 = manager(0).getCache(cachename);
- cache2 = manager(1).getCache(cachename);
- mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
- rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
- rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ config.setExposeJmxStatistics(true);
+ defineConfigurationOnAllManagers(cachename, config);
}
public void testEnableJmxStats() throws Exception {
+ Cache cache1 = manager(0).getCache(cachename);
+ Cache cache2 = manager(1).getCache(cachename);
+ MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
assert mBeanServer.isRegistered(rpcManager1);
assert mBeanServer.isRegistered(rpcManager2);
@@ -98,6 +91,12 @@
@Test(dependsOnMethods = "testEnableJmxStats")
public void testSuccessRatio() throws Exception {
+ Cache cache1 = manager(0).getCache(cachename);
+ Cache cache2 = manager(1).getCache(cachename);
+ MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+
assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals("0");
assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals("0");
assert mBeanServer.getAttribute(rpcManager1, "SuccessRatio").equals("N/A");
@@ -135,6 +134,9 @@
@Test(dependsOnMethods = "testSuccessRatio")
public void testAddressInformation() throws Exception {
+ MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
String cm1Address = manager(0).getAddress().toString();
String cm2Address = "N/A";
assert mBeanServer.getAttribute(rpcManager1, "Address").equals(cm1Address);
Modified: trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -123,6 +123,7 @@
}
public void stop() {
+ stores.remove(config.getStore());
}
public static class Cfg extends AbstractCacheStoreConfig {
Modified: trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -28,6 +28,7 @@
@AfterMethod(alwaysRun = true)
public void tearDown() {
TestingUtil.killCacheManagers(cm);
+ cm = null;
}
public void testForceSharedComponents() throws NamedCacheNotFoundException {
Modified: trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -43,6 +43,7 @@
@AfterMethod
public void tearDown() {
TestingUtil.killCacheManagers(cm);
+ cm = null;
}
public void testLoadingAndStoring() {
Modified: trunk/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/remoting/SingleClusterMemberTransportInvokeTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -40,17 +40,17 @@
@Test(groups = "functional", testName = "remoting.SingleClusterMemberTransportInvokeTest")
public class SingleClusterMemberTransportInvokeTest extends MultipleCacheManagersTest {
final String key = "k", value = "v", value2 = "v2";
- Cache cache1;
-
+
@Override
protected void createCacheManagers() throws Throwable {
Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
createClusteredCaches(1, "replSync", c);
- cache1 = cache(0, "replSync");
+
}
public void testInvokeRemotelyWhenSingleMember() throws Exception {
+ Cache cache1 = cache(0, "replSync");
Transport mockTransport = createMock(Transport.class);
RpcManagerImpl rpcManager = (RpcManagerImpl) TestingUtil.extractComponent(cache1, RpcManager.class);
Transport originalTransport = TestingUtil.extractComponent(cache1, Transport.class);
Modified: trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java 2009-10-08 19:28:14 UTC (rev 926)
+++ trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java 2009-10-08 20:28:08 UTC (rev 927)
@@ -25,11 +25,7 @@
* @author Mircea.Markus at jboss.com
*/
@Test(groups = "functional", testName = "tx.AsyncDeadlockDetectionTest")
-public class AsyncDeadlockDetectionTest extends MultipleCacheManagersTest {
- private Cache cache0;
- private Cache cache1;
- private DeadlockDetectingLockManager ddLm0;
- private DeadlockDetectingLockManager ddLm1;
+public class AsyncDeadlockDetectionTest extends MultipleCacheManagersTest {
private PerCacheExecutorThread t0;
private PerCacheExecutorThread t1;
private RemoteReplicationInterceptor remoteReplicationInterceptor;
@@ -45,9 +41,10 @@
createClusteredCaches(2, "test", config);
assert config.isEnableDeadlockDetection();
- cache0 = cache(0, "test");
- cache1 = cache(1, "test");
+
remoteReplicationInterceptor = new RemoteReplicationInterceptor();
+ Cache cache0 = cache(0, "test");
+ Cache cache1 = cache(1, "test");
cache1.getAdvancedCache().addInterceptor(remoteReplicationInterceptor, 0);
assert cache0.getConfiguration().isEnableDeadlockDetection();
assert cache1.getConfiguration().isEnableDeadlockDetection();
@@ -56,27 +53,33 @@
((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache0)).setExposeJmxStats(true);
((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache1)).setExposeJmxStats(true);
-
- ddLm0 = (DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache0);
- ddLm1 = (DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache1);
}
@BeforeMethod
public void beforeMethod() {
+ Cache cache0 = cache(0, "test");
+ Cache cache1 = cache(1, "test");
t0 = new PerCacheExecutorThread(cache0, 0);
t1 = new PerCacheExecutorThread(cache1, 1);
}
@AfterMethod
public void afterMethod() {
+ Cache cache0 = cache(0, "test");
+ Cache cache1 = cache(1, "test");
t0.stopThread();
t1.stopThread();
((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache0)).resetStatistics();
((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache1)).resetStatistics();
remoteReplicationInterceptor.executionResponse = null;
+ remoteReplicationInterceptor = null;
+ t0 = null;
+ t1 = null;
}
public void testRemoteTxVsLocal() throws Exception {
+ Cache cache0 = cache(0, "test");
+ Cache cache1 = cache(1, "test");
assertEquals(PerCacheExecutorThread.OperationsResult.BEGGIN_TX_OK, t0.execute(PerCacheExecutorThread.Operations.BEGGIN_TX));
t0.setKeyValue("k1", "v1_t0");
assertEquals(PerCacheExecutorThread.OperationsResult.PUT_KEY_VALUE_OK, t0.execute(PerCacheExecutorThread.Operations.PUT_KEY_VALUE));
@@ -114,6 +117,9 @@
replListener(cache0).waitForRpc();
}
+ DeadlockDetectingLockManager ddLm0 = (DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache0);
+ DeadlockDetectingLockManager ddLm1 = (DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache1);
+
assertFalse(ddLm0.isLocked("k1"));
assertFalse(ddLm1.isLocked("k1"));
assertFalse(ddLm0.isLocked("k2"));
More information about the infinispan-commits
mailing list