[infinispan-commits] Infinispan SVN: r2332 - branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-09-07 06:45:33 -0400 (Tue, 07 Sep 2010)
New Revision: 2332

Modified:
   branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java
   branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
Log:
better test cleanup

Modified: branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java
===================================================================
--- branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java	2010-09-06 22:39:58 UTC (rev 2331)
+++ branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreFunctionalTest.java	2010-09-07 10:45:33 UTC (rev 2332)
@@ -6,7 +6,10 @@
 import org.infinispan.manager.CacheContainer;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.server.hotrod.HotRodServer;
+import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.Test;
 
@@ -35,10 +38,10 @@
       return remoteCacheStoreConfig;
    }
 
-   @AfterTest
+   @AfterMethod(alwaysRun = true)
    public void tearDown() {
       hrServer.stop();
-      localCacheManager.stop();
+      TestingUtil.killCacheManagers(localCacheManager);
    }
 
    @Override

Modified: branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
===================================================================
--- branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java	2010-09-06 22:39:58 UTC (rev 2331)
+++ branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java	2010-09-07 10:45:33 UTC (rev 2332)
@@ -9,6 +9,7 @@
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.server.hotrod.HotRodServer;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.Test;
 
@@ -45,7 +46,7 @@
       return remoteCacheStore;
    }
 
-   @AfterTest(alwaysRun = true)
+   @AfterMethod(alwaysRun = true)
    public void tearDown() {
       hrServer.stop();
       localCacheManager.stop();