[infinispan-commits] Infinispan SVN: r1164 - in trunk/core/src: test/java/org/infinispan/config/parsing and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-13 07:34:47 -0500 (Fri, 13 Nov 2009)
New Revision: 1164

Modified:
   trunk/core/src/main/resources/config-samples/all.xml
   trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
   trunk/core/src/test/resources/configs/named-cache-test.xml
Log:
Updated test breakages

Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml	2009-11-13 12:06:26 UTC (rev 1163)
+++ trunk/core/src/main/resources/config-samples/all.xml	2009-11-13 12:34:47 UTC (rev 1164)
@@ -165,7 +165,7 @@
                <property name="location" value="${java.io.tmpdir}"/>
             </properties>
             <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
-            <async enabled="true" mapLockTimeout="15000" threadPoolSize="5"/>
+            <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/>
          </loader>
       </loaders>
 

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-11-13 12:06:26 UTC (rev 1163)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-11-13 12:34:47 UTC (rev 1164)
@@ -1,17 +1,12 @@
 package org.infinispan.config.parsing;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
 import org.infinispan.Version;
 import org.infinispan.config.CacheLoaderManagerConfig;
 import org.infinispan.config.Configuration;
 import org.infinispan.config.ConfigurationValidatingVisitor;
 import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior;
 import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior;
 import org.infinispan.distribution.DefaultConsistentHash;
 import org.infinispan.eviction.EvictionStrategy;
 import org.infinispan.loaders.file.FileCacheStoreConfig;
@@ -20,6 +15,11 @@
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
 @Test(groups = "unit", testName = "config.parsing.XmlFileParsingTest")
 public class XmlFileParsingTest extends AbstractInfinispanTest {
 
@@ -292,7 +292,7 @@
       assert csConf.isPurgeOnStartup();
       assert csConf.getLocation().equals("/tmp/FileCacheStore-Location");
       assert csConf.getSingletonStoreConfig().getPushStateTimeout() == 254L;
-      assert csConf.getSingletonStoreConfig().isPushStateWhenCoordinator() == true;
+      assert csConf.getSingletonStoreConfig().isPushStateWhenCoordinator();
       assert csConf.getAsyncStoreConfig().getThreadPoolSize() == 7;
       assert csConf.getAsyncStoreConfig().getFlushLockTimeout() == 15000;
       assert csConf.getAsyncStoreConfig().isEnabled();

Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml	2009-11-13 12:06:26 UTC (rev 1163)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml	2009-11-13 12:34:47 UTC (rev 1164)
@@ -106,7 +106,7 @@
                <property name="location" value="/tmp/FileCacheStore-Location"/>
             </properties>
             <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
-            <async enabled="true" mapLockTimeout="15000" threadPoolSize="5"/>
+            <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/>
          </loader>
       </loaders>
    </namedCache>
@@ -158,7 +158,7 @@
              <property name="location" value="${java.io.tmpdir}"/>
             </properties>
            <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/> 
-            <async enabled="true" threadPoolSize="10" mapLockTimeout="10000"/> 
+            <async enabled="true" threadPoolSize="10" flushLockTimeout="10000"/> 
        </loader>
      </loaders>   
    </namedCache>
@@ -171,7 +171,7 @@
       Here we use existing class so we can actually load it
       -->   
       <customInterceptors>
-         <interceptor position="FIRST" class="org.infinispan.interceptors.CallInterceptor"></interceptor>
+         <interceptor position="FIRST" class="org.infinispan.interceptors.CallInterceptor" />
          <interceptor position="LAST" class="org.infinispan.interceptors.CallInterceptor"/>
          <interceptor index="3" class="org.infinispan.interceptors.CallInterceptor"/>
          <interceptor before="org.infinispan.interceptors.CallInterceptor" class="org.infinispan.interceptors.CallInterceptor"/>