[jboss-cvs] JBossAS SVN: r107235 - projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-07-30 09:32:09 -0400 (Fri, 30 Jul 2010)
New Revision: 107235

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerFactoryTest.java
Log:
Use AtomicMapFactory facade.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerFactoryTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerFactoryTest.java	2010-07-30 13:30:01 UTC (rev 107234)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/web/tomcat/service/session/distributedcache/impl/DistributedCacheManagerFactoryTest.java	2010-07-30 13:32:09 UTC (rev 107235)
@@ -21,19 +21,8 @@
  */
 package org.jboss.ha.web.tomcat.service.session.distributedcache.impl;
 
-import java.util.Collections;
-
-import javax.naming.Context;
-
 import org.easymock.EasyMock;
-import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.manager.CacheContainer;
-import org.jboss.ha.ispn.CacheContainerConfiguration;
-import org.jboss.ha.ispn.CacheContainerFactory;
-import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
-import org.jboss.ha.ispn.config.CacheContainerRegistryConfiguration;
-import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationEntry;
-import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationSource;
+import org.jboss.ha.ispn.atomic.AtomicMapFactory;
 import org.jboss.ha.ispn.invoker.CacheInvoker;
 import org.jboss.metadata.web.jboss.ReplicationConfig;
 import org.jboss.metadata.web.jboss.ReplicationGranularity;
@@ -56,93 +45,36 @@
    @SuppressWarnings("unchecked")
    private final SessionAttributeStorage<OutgoingDistributableSessionData> storage = EasyMock.createStrictMock(SessionAttributeStorage.class);
    private final SessionAttributeMarshaller marshaller = EasyMock.createStrictMock(SessionAttributeMarshaller.class);
+   private final AtomicMapFactory atomicMapFactory = EasyMock.createStrictMock(AtomicMapFactory.class);
    
    @Test
    public void test() throws Exception
    {
-      CacheContainerFactory containerFactory = EasyMock.createStrictMock(CacheContainerFactory.class);
-      CacheContainerRegistryConfigurationSource source = EasyMock.createStrictMock(CacheContainerRegistryConfigurationSource.class);
-      Context context = EasyMock.createNiceMock(Context.class);
-      CacheContainer container = EasyMock.createStrictMock(CacheContainer.class);
+      DistributedCacheManagerFactoryImpl factory = new DistributedCacheManagerFactoryImpl();
       
-      // First need to populate registry
-      DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(containerFactory, source, context);
+      factory.setAtomicMapFactory(atomicMapFactory);
+      factory.setSessionAttributeStorageFactory(this.storageFactory);
+      factory.setSessionAttributeMarshallerFactory(this.marshallerFactory);
+      factory.setCacheInvoker(this.invoker);
+      factory.setAtomicMapFactory(this.atomicMapFactory);
       
-      InfinispanConfiguration infinispanConfig = InfinispanConfiguration.newInfinispanConfiguration("config-samples/minimal.xml");
-      CacheContainerRegistryConfigurationEntry entry = new CacheContainerRegistryConfigurationEntry();
-      entry.setId("default");
-      entry.setConfiguration(infinispanConfig);
-      CacheContainerRegistryConfiguration registryConfig = new CacheContainerRegistryConfiguration();
-      registryConfig.setEntries(Collections.singletonList(entry));
+      ReplicationConfig config = new ReplicationConfig();
+      ReplicationGranularity granularity = ReplicationGranularity.SESSION;
+      config.setReplicationGranularity(granularity);
       
-      EasyMock.expect(source.getRegistryConfiguration()).andReturn(registryConfig);
+      EasyMock.expect(this.marshallerFactory.createMarshaller(this.manager)).andReturn(this.marshaller);
+      EasyMock.expect(this.manager.getReplicationConfig()).andReturn(config);
+      EasyMock.expect(this.storageFactory.createStorage(granularity, this.marshaller)).andReturn(this.storage);
       
-      EasyMock.expect(containerFactory.createCacheContainer(EasyMock.isA(CacheContainerConfiguration.class), EasyMock.eq(Collections.<String, String>emptyMap()))).andReturn(container);
-      EasyMock.expect(context.composeName("default", "java:CacheManager")).andReturn("java:CacheManager/default");
+      EasyMock.replay(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller, this.atomicMapFactory);
       
-      context.bind("java:CacheManager/default", container);
+      DistributedCacheManager<?> result = factory.getDistributedCacheManager(this.manager);
       
-      EasyMock.replay(containerFactory, source, context, container);
+      EasyMock.verify(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller, this.atomicMapFactory);
       
-      registry.start();
-
-      EasyMock.verify(containerFactory, source, context, container);
+      Assert.assertNotNull(result);
+      Assert.assertTrue(result instanceof DistributedCacheManagerImpl);
       
-      // Verify that a static registry exists
-      Assert.assertNotNull(DefaultCacheContainerRegistry.getInstance());
-      
-      EasyMock.reset(containerFactory, source, context, container);
-      
-      try
-      {
-         DistributedCacheManagerFactoryImpl factory = new DistributedCacheManagerFactoryImpl();
-         factory.setSessionAttributeStorageFactory(this.storageFactory);
-         factory.setSessionAttributeMarshallerFactory(this.marshallerFactory);
-         factory.setCacheInvoker(this.invoker);
-         
-         ReplicationConfig config = new ReplicationConfig();
-         ReplicationGranularity granularity = ReplicationGranularity.SESSION;
-         config.setReplicationGranularity(granularity);
-         
-         EasyMock.expect(this.marshallerFactory.createMarshaller(this.manager)).andReturn(this.marshaller);
-         EasyMock.expect(this.manager.getReplicationConfig()).andReturn(config);
-         EasyMock.expect(this.storageFactory.createStorage(granularity, this.marshaller)).andReturn(this.storage);
-         
-         EasyMock.replay(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller);
-         
-         DistributedCacheManager<?> result = factory.getDistributedCacheManager(this.manager);
-         
-         EasyMock.verify(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller);
-         
-         Assert.assertNotNull(result);
-         Assert.assertTrue(result instanceof DistributedCacheManagerImpl);
-         
-         EasyMock.reset(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller);
-      }
-      finally
-      {
-         container.stop();
-         context.unbind("java:CacheManager/default");
-         
-         EasyMock.replay(containerFactory, source, context, container);
-         
-         registry.stop();
-         
-         EasyMock.verify(containerFactory, source, context, container);
-
-         IllegalStateException exception = null;
-         try
-         {
-            DefaultCacheContainerRegistry.getInstance();
-         }
-         catch (IllegalStateException e)
-         {
-            exception = e;
-         }
-         
-         Assert.assertNotNull(exception);
-
-         EasyMock.reset(containerFactory, source, context, container);
-      }
+      EasyMock.reset(this.storageFactory, this.marshallerFactory, this.invoker, this.manager, this.storage, this.marshaller, this.atomicMapFactory);
    }
 }