[infinispan-commits] Infinispan SVN: r921 - in trunk/core/src/test/java/org/infinispan: test and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-10-07 17:41:27 -0400 (Wed, 07 Oct 2009)
New Revision: 921

Modified:
   trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
   trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
Log:
[JGRP-220] - Test suite has memory leaks

Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-07 13:04:39 UTC (rev 920)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-07 21:41:27 UTC (rev 921)
@@ -14,6 +14,7 @@
 import org.infinispan.test.TestingUtil;
 import org.infinispan.util.Util;
 import org.infinispan.util.concurrent.IsolationLevel;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 import javax.transaction.TransactionManager;
@@ -62,6 +63,13 @@
       RehashWaiter.waitForInitRehashToComplete(c1, c2, c3, c4);
 
    }
+   
+   @AfterClass(alwaysRun=true)
+   protected void destroy() {
+      super.destroy();     
+      caches.clear();
+      c1 = null;c2=null;c3=null;c4=null;
+   }
 
    /**
     * This is a separate class because some tools try and run this method as a test 

Modified: trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2009-10-07 13:04:39 UTC (rev 920)
+++ trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2009-10-07 21:41:27 UTC (rev 921)
@@ -68,8 +68,9 @@
    }
 
    @AfterClass(alwaysRun=true)
-   protected void destroy() {
+   protected void destroy() {     
       if (cleanup == CleanupPhase.AFTER_TEST) TestingUtil.killCacheManagers(cacheManagers);
+      cacheManagers.clear();  
    }
 
    @AfterMethod(alwaysRun=true)

Modified: trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-10-07 13:04:39 UTC (rev 920)
+++ trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-10-07 21:41:27 UTC (rev 921)
@@ -47,8 +47,10 @@
    }
 
    @AfterClass(alwaysRun=true)
-   protected void destroyAfterClass() {
+   protected void destroyAfterClass() {      
       if (cleanup == CleanupPhase.AFTER_TEST) TestingUtil.killCacheManagers(cacheManager);
+      cacheManager = null;
+      cache = null;
    }
 
    @AfterMethod(alwaysRun=true)