[infinispan-commits] Infinispan SVN: r2471 - in branches/4.2.x: client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry and 11 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Sat Oct 2 14:45:30 EDT 2010


Author: manik.surtani at jboss.com
Date: 2010-10-02 14:45:29 -0400 (Sat, 02 Oct 2010)
New Revision: 2471

Added:
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java
Modified:
   branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
   branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
   branches/4.2.x/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
   branches/4.2.x/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/TestingUtil.java
   branches/4.2.x/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
   branches/4.2.x/query/src/test/java/org/infinispan/query/backend/QueryHelperTest.java
Log:
Test harness improvements

Modified: branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
===================================================================
--- branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -26,7 +26,7 @@
 
    @BeforeMethod
    public void createBeforeMethod() throws Throwable {
-      if (cleanup == CleanupPhase.AFTER_METHOD) {
+      if (cleanupAfterMethod()) {
          hrServ2CacheManager.clear();
          addr2hrServer.clear();
       }

Modified: branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
===================================================================
--- branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -42,7 +42,7 @@
    @Override
    protected void createCacheManagers() throws Throwable {
 
-      assert cleanup == CleanupPhase.AFTER_METHOD;
+      assert cleanupAfterMethod();
 
 
       config = getCacheConfig();

Modified: branches/4.2.x/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -90,11 +90,11 @@
       return this;
    }
 
-   public void lock(K key) {
-      cache.lock(key);
+   public boolean lock(K key) {
+      return cache.lock(key);
    }
 
-   public void lock(Collection<? extends K> keys) {
-      cache.lock(keys);
+   public boolean lock(Collection<? extends K> keys) {
+      return cache.lock(keys);
    }
 }

Modified: branches/4.2.x/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -6,6 +6,7 @@
 import org.infinispan.context.InvocationContext;
 import org.infinispan.context.InvocationContextContainer;
 import org.infinispan.manager.CacheContainer;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.AbstractInfinispanTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
@@ -23,7 +24,7 @@
    private static final Log log = LogFactory.getLog(AtomicMapFunctionalTest.class);
    Cache<String, Object> cache;
    TransactionManager tm;
-   private CacheContainer cm;
+   private EmbeddedCacheManager cm;
 
    @BeforeMethod
    @SuppressWarnings("unchecked")

Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -32,7 +32,7 @@
 public class ComponentsJmxRegistrationTest extends AbstractInfinispanTest {
 
    private MBeanServer mBeanServer;
-   private List<CacheContainer> cacheContainers = new ArrayList<CacheContainer>();
+   private List<EmbeddedCacheManager> cacheContainers = new ArrayList<EmbeddedCacheManager>();
 
    @BeforeMethod
    public void setUp() {
@@ -43,9 +43,7 @@
    @AfterMethod
    public void tearDown() {
       MBeanServerFactory.releaseMBeanServer(mBeanServer);
-      for (CacheContainer cacheContainer : cacheContainers) {
-         TestingUtil.killCacheManagers(cacheContainer);
-      }
+      TestingUtil.killCacheManagers(cacheContainers);
       cacheContainers.clear();
    }
 

Modified: branches/4.2.x/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -2,6 +2,7 @@
 
 import org.infinispan.Cache;
 import org.infinispan.manager.CacheContainer;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
 import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
@@ -16,7 +17,7 @@
 @Test(groups = "functional", testName = "notifications.AsyncNotificationTest")
 public class AsyncNotificationTest extends AbstractInfinispanTest {
    Cache<String, String> c;
-   CacheContainer cm;
+   EmbeddedCacheManager cm;
 
    @BeforeMethod
    public void setUp() {

Modified: branches/4.2.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -125,7 +125,7 @@
 
    private void runDistributedTest() throws Exception {
       EmbeddedCacheManager cm = null;
-      List<CacheContainer> containers = new ArrayList<CacheContainer>();
+      List<EmbeddedCacheManager> containers = new ArrayList<EmbeddedCacheManager>();
       try {
          CountDownLatch startLatch = new CountDownLatch(1);
          List<ExecutorThread> executorThreads = new ArrayList<ExecutorThread>();

Modified: branches/4.2.x/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -4,6 +4,7 @@
 import org.infinispan.config.GlobalConfiguration;
 import org.infinispan.factories.GlobalComponentRegistry;
 import org.infinispan.manager.CacheContainer;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.remoting.transport.Transport;
 import org.infinispan.remoting.transport.jgroups.JGroupsChannelLookup;
 import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
@@ -22,7 +23,7 @@
 @Test(testName = "remoting.jgroups.ChannelLookupTest", groups = "functional")
 public class ChannelLookupTest extends AbstractInfinispanTest {
     public void channelLookupTest() {
-        CacheContainer cm = null;
+        EmbeddedCacheManager cm = null;
         try {
             GlobalConfiguration gc = GlobalConfiguration.getClusteredDefault();
             Properties p = new Properties();

Modified: branches/4.2.x/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/stress/PutIfAbsentStressTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -102,12 +102,12 @@
     * Adapter to run the test on any configuration
     */
    private void testConcurrentLockingOnMultipleManagers(Configuration cfg) throws IOException, InterruptedException {
-      List<CacheContainer> cacheContainers = new ArrayList<CacheContainer>(NODES_NUM);
+      List<EmbeddedCacheManager> cacheContainers = new ArrayList<EmbeddedCacheManager>(NODES_NUM);
       List<Cache<String, String>> caches = new ArrayList<Cache<String, String>>();
       List<ConcurrentMap<String, String>> maps = new ArrayList<ConcurrentMap<String, String>>(NODES_NUM
                * THREAD_PER_NODE);
       for (int nodeNum = 0; nodeNum < NODES_NUM; nodeNum++) {
-         CacheContainer cm = TestCacheManagerFactory.createClusteredCacheManager(cfg);
+         EmbeddedCacheManager cm = TestCacheManagerFactory.createClusteredCacheManager(cfg);
          cacheContainers.add(cm);
          Cache<String, String> cache = cm.getCache();
          caches.add(cache);
@@ -119,13 +119,7 @@
       try {
          testConcurrentLocking(maps);
       } finally {
-         for (CacheContainer cm : cacheContainers) {
-            try {
-               TestingUtil.killCacheManagers(cm);
-            } catch (Exception e) {
-               // try cleaning up the other cacheManagers too
-            }
-         }
+         TestingUtil.killCacheManagers(cacheContainers);
       }
    }
 

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/AbstractCacheTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/AbstractCacheTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -4,6 +4,8 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheContainer;
 import org.infinispan.manager.EmbeddedCacheManager;
+import org.infinispan.test.fwk.CleanupAfterMethod;
+import org.infinispan.test.fwk.CleanupAfterTest;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
@@ -26,6 +28,21 @@
 
    protected CleanupPhase cleanup = CleanupPhase.AFTER_TEST;
 
+   protected boolean cleanupAfterTest() {
+      return getClass().getAnnotation(CleanupAfterTest.class) != null || (
+              getClass().getAnnotation(CleanupAfterMethod.class) == null &&
+                      cleanup == CleanupPhase.AFTER_TEST
+      );
+   }
+
+   protected boolean cleanupAfterMethod() {
+      return getClass().getAnnotation(CleanupAfterMethod.class) != null || (
+              getClass().getAnnotation(CleanupAfterTest.class) == null &&
+                      cleanup == CleanupPhase.AFTER_METHOD
+      );
+   }
+
+
    /**
     * use TestingUtil.clearContent(cacheManager);
     */

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -54,7 +54,7 @@
 
    @BeforeClass (alwaysRun = true)
    public void createBeforeClass() throws Throwable {
-      if (cleanup == CleanupPhase.AFTER_TEST) callCreateCacheManagers();
+      if (cleanupAfterTest()) callCreateCacheManagers();
    }
 
    private void callCreateCacheManagers() throws Throwable {
@@ -69,19 +69,19 @@
 
    @BeforeMethod
    public void createBeforeMethod() throws Throwable {
-      if (cleanup == CleanupPhase.AFTER_METHOD) callCreateCacheManagers();
+      if (cleanupAfterMethod()) callCreateCacheManagers();
    }
 
    @AfterClass(alwaysRun = true)
    protected void destroy() {
-      if (cleanup == CleanupPhase.AFTER_TEST) TestingUtil.killCacheManagers(cacheManagers);
+      if (cleanupAfterTest()) TestingUtil.killCacheManagers(cacheManagers);
       cacheManagers.clear();
       listeners.clear();
    }
 
    @AfterMethod(alwaysRun=true)
    protected void clearContent() throws Throwable {
-      if (cleanup == CleanupPhase.AFTER_TEST) {
+      if (cleanupAfterTest()) {
 //         assertSupportedConfig();
          log.debug("*** Test method complete; clearing contents on all caches.");
          if (cacheManagers.isEmpty())
@@ -260,7 +260,7 @@
    /**
     * Returns the default cache from that manager.
     */
-   protected Cache cache(int index) {
+   protected <A, B> Cache<A, B> cache(int index) {
       return manager(index).getCache();
    }
 

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -41,7 +41,7 @@
    @BeforeClass()
    protected void createBeforeClass() throws Exception {
       try {
-         if (cleanup == CleanupPhase.AFTER_TEST) setup();
+         if (cleanupAfterTest()) setup();
       } catch (Exception e) {
          log.error("Unexpected!", e);
          throw e;
@@ -51,7 +51,7 @@
    @BeforeMethod
    protected void createBeforeMethod() throws Exception {
       try {
-         if (cleanup == CleanupPhase.AFTER_METHOD) setup();
+         if (cleanupAfterMethod()) setup();
       } catch (Exception e) {
          log.error("Unexpected!", e);
          throw e;
@@ -61,7 +61,7 @@
    @AfterClass(alwaysRun=true)
    protected void destroyAfterClass() {
       try {
-         if (cleanup == CleanupPhase.AFTER_TEST) teardown();
+         if (cleanupAfterTest()) teardown();
       } catch (Exception e) {
          log.error("Unexpected!", e);
       }
@@ -69,12 +69,12 @@
 
    @AfterMethod(alwaysRun=true)
    protected void destroyAfterMethod() {
-      if (cleanup == CleanupPhase.AFTER_METHOD) teardown();
+      if (cleanupAfterMethod()) teardown();
    }
 
    @AfterMethod(alwaysRun=true)
    protected void clearContent() {
-      if (cleanup == CleanupPhase.AFTER_TEST) TestingUtil.clearContent(cacheManager);
+      if (cleanupAfterTest()) TestingUtil.clearContent(cacheManager);
    }
 
    protected Configuration getDefaultStandaloneConfig(boolean transactional) {

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -415,16 +415,24 @@
    }
 
    public static void killCacheManagers(CacheContainer... cacheContainers) {
+      EmbeddedCacheManager[] ecms = new EmbeddedCacheManager[cacheContainers.length];
+      int i=0;
+      for (CacheContainer cc: cacheContainers) ecms[i++] = (EmbeddedCacheManager) cc;
+      killCacheManagers(ecms);
+   }
+
+   public static void killCacheManagers(EmbeddedCacheManager... cacheContainers) {
       if (cacheContainers != null) {
-         for (CacheContainer cm : cacheContainers) {
+         for (EmbeddedCacheManager cm : cacheContainers) {
+            clearContent(cm);
             if (cm != null) 
                cm.stop();
          }
       }
    }
 
-   public static void killCacheManagers(Collection<? extends CacheContainer> cacheManagers) {
-      killCacheManagers(cacheManagers.toArray(new CacheContainer[cacheManagers.size()]));
+   public static void killCacheManagers(Collection<? extends EmbeddedCacheManager> cacheManagers) {
+      killCacheManagers(cacheManagers.toArray(new EmbeddedCacheManager[cacheManagers.size()]));
    }
    
    public static void clearContent(EmbeddedCacheManager cacheContainer) {

Added: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java	                        (rev 0)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterMethod.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -0,0 +1,14 @@
+package org.infinispan.test.fwk;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Indicates that test cleanup happens after every test method.
+ *
+ * @author Manik Surtani
+ * @version 4.2
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface CleanupAfterMethod {
+}

Added: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java	                        (rev 0)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/CleanupAfterTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -0,0 +1,14 @@
+package org.infinispan.test.fwk;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Indicates that test cleanup happens after all test methods.
+ *
+ * @author Manik Surtani
+ * @version 4.2
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface CleanupAfterTest {
+}

Modified: branches/4.2.x/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -4,6 +4,7 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
 import org.infinispan.manager.CacheContainer;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.AbstractInfinispanTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
@@ -18,7 +19,7 @@
 @Test(groups = "functional", testName = "tx.OnePhaseXATest", description = "See ISPN-156 for details.", enabled = false)
 public class OnePhaseXATest extends AbstractInfinispanTest {
    private List<Cache> caches;
-   private List<CacheContainer> cacheContainers;
+   private List<EmbeddedCacheManager> cacheContainers;
    public static final int CACHES_NUM = 2;
 
    public void testMultipleCaches() throws Exception {
@@ -45,7 +46,7 @@
    @BeforeTest
    public void setUp() throws Exception {
       caches = new ArrayList<Cache>();
-      cacheContainers = new ArrayList<CacheContainer>();
+      cacheContainers = new ArrayList<EmbeddedCacheManager>();
       for (int i = 0; i < CACHES_NUM; i++) caches.add(getCache());
    }
 
@@ -64,7 +65,7 @@
       c.setLockAcquisitionTimeout(60000);
       c.setUseLockStriping(false);
       c.setSyncCommitPhase(true);
-      CacheContainer container = TestCacheManagerFactory.createCacheManager(gc, c, true);
+      EmbeddedCacheManager container = TestCacheManagerFactory.createCacheManager(gc, c, true);
       cacheContainers.add(container);
       return container.getCache("TestCache");
    }

Modified: branches/4.2.x/query/src/test/java/org/infinispan/query/backend/QueryHelperTest.java
===================================================================
--- branches/4.2.x/query/src/test/java/org/infinispan/query/backend/QueryHelperTest.java	2010-10-02 18:42:28 UTC (rev 2470)
+++ branches/4.2.x/query/src/test/java/org/infinispan/query/backend/QueryHelperTest.java	2010-10-02 18:45:29 UTC (rev 2471)
@@ -25,6 +25,7 @@
 import org.infinispan.CacheException;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheContainer;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.query.test.Person;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
@@ -45,7 +46,7 @@
 @Test(groups = "unit")
 public class QueryHelperTest {
    Configuration cfg;
-   List<CacheContainer> cacheContainers;
+   List<EmbeddedCacheManager> cacheContainers;
 
    @BeforeMethod
    public void setUp() {
@@ -53,7 +54,7 @@
       cfg.setIndexingEnabled(true);
       cfg.setIndexLocalOnly(true);
 
-      cacheContainers = new LinkedList<CacheContainer>();
+      cacheContainers = new LinkedList<EmbeddedCacheManager>();
    }
 
    @AfterMethod
@@ -62,7 +63,7 @@
    }
 
    private Cache<?, ?> createCache(Configuration c) {
-      CacheContainer cm = TestCacheManagerFactory.createCacheManager(c);
+      EmbeddedCacheManager cm = TestCacheManagerFactory.createCacheManager(c);
       cacheContainers.add(cm);
       return cm.getCache();
    }



More information about the infinispan-commits mailing list