[jbosscache-commits] JBoss Cache SVN: r5178 - core/trunk/src/test/java/org/jboss/cache/factories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-01-21 20:11:44 -0500 (Mon, 21 Jan 2008)
New Revision: 5178

Modified:
   core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java
Log:
Fixed broken test (to go with InterceptorChainFactory optimisation)

Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java	2008-01-22 01:08:04 UTC (rev 5177)
+++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java	2008-01-22 01:11:44 UTC (rev 5178)
@@ -197,7 +197,6 @@
 
    public void testOptimisticChain() throws Exception
    {
-      CacheSPI cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
 
@@ -223,7 +222,6 @@
 
    public void testOptimisticReplicatedChain() throws Exception
    {
-      CacheSPI cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheMode("REPL_SYNC");
@@ -251,7 +249,6 @@
 
    public void testOptimisticCacheLoaderChain() throws Exception
    {
-      CacheSPI cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(false, false));
@@ -267,8 +264,8 @@
       assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
       assertEquals(TxInterceptor.class, interceptors.next().getClass());
       assertEquals(NotificationInterceptor.class, interceptors.next().getClass());
-      assertEquals(CacheStoreInterceptor.class, interceptors.next().getClass());
       assertEquals(CacheLoaderInterceptor.class, interceptors.next().getClass());
+      assertEquals(CacheStoreInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
@@ -280,7 +277,6 @@
 
    public void testOptimisticPassivationCacheLoaderChain() throws Exception
    {
-      CacheSPI cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(true, false));
@@ -296,8 +292,8 @@
       assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
       assertEquals(TxInterceptor.class, interceptors.next().getClass());
       assertEquals(NotificationInterceptor.class, interceptors.next().getClass());
-      assertEquals(PassivationInterceptor.class, interceptors.next().getClass());
       assertEquals(ActivationInterceptor.class, interceptors.next().getClass());
+      assertEquals(PassivationInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
       assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
@@ -309,7 +305,6 @@
 
    public void testInvalidationInterceptorChain() throws Exception
    {
-      CacheSPI cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setCacheMode("REPL_ASYNC");
 
@@ -332,7 +327,6 @@
       // ok, my replication chain looks good.
 
       // now for my invalidation chain.
-      cache = (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setCacheMode("INVALIDATION_ASYNC");
       chain = getInterceptorChainFactory(cache).buildInterceptorChain();