[infinispan-commits] Infinispan SVN: r2335 - branches/4.2.x/core/src/test/java/org/infinispan/config.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-09-07 08:33:43 -0400 (Tue, 07 Sep 2010)
New Revision: 2335

Modified:
   branches/4.2.x/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
Log:
[ISPN-608] (Make replication queue implementation pluggable)

Modified: branches/4.2.x/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java	2010-09-07 11:35:10 UTC (rev 2334)
+++ branches/4.2.x/core/src/test/java/org/infinispan/config/ConfigurationValidationTest.java	2010-09-07 12:33:43 UTC (rev 2335)
@@ -22,7 +22,9 @@
 package org.infinispan.config;
 
 import org.infinispan.manager.EmbeddedCacheManager;
+import org.infinispan.test.AbstractInfinispanTest;
 import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
@@ -31,25 +33,36 @@
 
 /**
  * ConfigurationValidationTest.
- * 
+ *
  * @author Sanne Grinovero
  * @since 4.0
  */
 @Test(groups = "functional", testName = "config.ConfigurationValidationTest")
-public class ConfigurationValidationTest extends SingleCacheManagerTest {
-   
-   @Test (expectedExceptions=ConfigurationException.class)
-   public void testWrongCacheModeConfiguration() {
-      cacheManager.getCache().put("key", "value");
+public class ConfigurationValidationTest extends AbstractInfinispanTest {
+
+   @Test(expectedExceptions = ConfigurationException.class)
+   public void testWrongCacheModeConfiguration() throws Exception {
+      EmbeddedCacheManager cacheManager = null;
+      try {
+         cacheManager = createCacheManager();
+         cacheManager.getCache().put("key", "value");
+      } finally {
+         TestingUtil.killCacheManagers(cacheManager);
+      }
    }
 
-   public void testCacheModeConfiguration() {
-      cacheManager.getCache("local").put("key", "value");
+   public void testCacheModeConfiguration() throws Exception {
+      EmbeddedCacheManager cacheManager = null;
+      try {
+         cacheManager = createCacheManager();
+         cacheManager.getCache("local").put("key", "value");
+      } finally {
+         TestingUtil.killCacheManagers(cacheManager);
+      }
    }
 
 
-   @Override
-   protected EmbeddedCacheManager createCacheManager() throws Exception {
+   private EmbeddedCacheManager createCacheManager() throws Exception {
       GlobalConfiguration gc = GlobalConfiguration.getNonClusteredDefault();
       Configuration config = new Configuration();
       config.setCacheMode(REPL_ASYNC);