[infinispan-commits] Infinispan SVN: r725 - in trunk/core/src/test/java/org/infinispan: notifications/cachelistener and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-24 14:15:27 -0400 (Mon, 24 Aug 2009)
New Revision: 725

Modified:
   trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
Fixed regressions

Modified: trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java	2009-08-24 16:47:32 UTC (rev 724)
+++ trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java	2009-08-24 18:15:27 UTC (rev 725)
@@ -12,7 +12,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -40,11 +39,10 @@
    @BeforeTest
    public void setUp() {
       cfg = new Configuration();
-      cfg.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       CacheLoaderManagerConfig clmc = new CacheLoaderManagerConfig();
       clmc.addCacheLoaderConfig(new DummyInMemoryCacheStore.Cfg());
       cfg.setCacheLoaderManagerConfig(clmc);
-      cm = TestCacheManagerFactory.createCacheManager(cfg);
+      cm = TestCacheManagerFactory.createCacheManager(cfg, true);
       cache = cm.getCache();
       store = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
       tm = TestingUtil.getTransactionManager(cache);

Modified: trunk/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java	2009-08-24 16:47:32 UTC (rev 724)
+++ trunk/core/src/test/java/org/infinispan/loaders/PassivationFunctionalTest.java	2009-08-24 18:15:27 UTC (rev 725)
@@ -8,7 +8,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -37,12 +36,11 @@
    @BeforeTest
    public void setUp() {
       cfg = new Configuration();
-      cfg.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       CacheLoaderManagerConfig clmc = new CacheLoaderManagerConfig();
       clmc.setPassivation(true);
       clmc.addCacheLoaderConfig(new DummyInMemoryCacheStore.Cfg());
       cfg.setCacheLoaderManagerConfig(clmc);
-      cm = TestCacheManagerFactory.createCacheManager(cfg);
+      cm = TestCacheManagerFactory.createCacheManager(cfg, true);
       cache = cm.getCache();
       store = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
       tm = TestingUtil.getTransactionManager(cache);

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java	2009-08-24 16:47:32 UTC (rev 724)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java	2009-08-24 18:15:27 UTC (rev 725)
@@ -7,7 +7,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.transaction.xa.GlobalTransaction;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.testng.annotations.AfterMethod;
@@ -32,10 +31,8 @@
       Configuration c = new Configuration();
       c.setCacheMode(Configuration.CacheMode.LOCAL);
       c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(c, true);
 
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
-
       cache = cm.getCache();
       tm = TestingUtil.getTransactionManager(cache);
       mockNotifier = createMock(CacheNotifier.class);

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-24 16:47:32 UTC (rev 724)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-24 18:15:27 UTC (rev 725)
@@ -6,6 +6,8 @@
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 
 import java.util.Properties;
 
@@ -18,6 +20,7 @@
 public class TestCacheManagerFactory {
 
    public static final String MARSHALLER = System.getProperties().getProperty("infinispan.marshaller.class");
+   private static Log log = LogFactory.getLog(TestCacheManagerFactory.class);
 
    /**
     * Creates an cache manager that does not support clustering or transactions.
@@ -85,6 +88,9 @@
     * tests in parallel.  This is a non-transactional cache manager.
     */
    public static CacheManager createCacheManager(Configuration defaultCacheConfig) {
+      if (defaultCacheConfig.getTransactionManagerLookup() != null || defaultCacheConfig.getTransactionManagerLookupClass() != null) {
+         log.error("You have passed in a default configuration which has transactional elements set.  If you wish to use transactions, use the TestCacheManagerFactory.createCacheManager(Configuration defaultCacheConfig, boolean transactional) method.");
+      }
       defaultCacheConfig.setTransactionManagerLookup(null);
       defaultCacheConfig.setTransactionManagerLookupClass(null);
       return createCacheManager(defaultCacheConfig, false);