[jboss-cvs] JBossAS SVN: r106473 - in projects/cluster/ha-server-cache-ispn/trunk/src: test/java/org/jboss/ha/infinispan/config and 1 other directory.

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

Author: pferraro
Date: 2010-07-06 16:25:06 -0400 (Tue, 06 Jul 2010)
New Revision: 106473

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSource.java
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSourceTest.java
Log:
Simplify constructor.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSource.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSource.java	2010-07-06 20:24:50 UTC (rev 106472)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSource.java	2010-07-06 20:25:06 UTC (rev 106473)
@@ -32,21 +32,32 @@
  */
 public class SingleCacheManagerRegistryConfigurationSource implements CacheManagerRegistryConfigurationSource
 {
-   private final String id;
-   private final String jndiName;
+   public static final String DEFAULT_ID = "default";
+   
    private final String resource;
    
+   private String id = DEFAULT_ID;
+   private String jndiName;
+   
    /**
     * Creates a new SingleCacheManagerRegistryConfigurationSource
     * @param id the identifier of the singleton cache manager
     * @param jndiName the jndi name for the cache manager
     * @param resource the classpath resource containing the infinispan cache manager configuration.
     */
-   public SingleCacheManagerRegistryConfigurationSource(String id, String jndiName, String resource)
+   public SingleCacheManagerRegistryConfigurationSource(String resource)
    {
+      this.resource = resource;
+   }
+
+   public void setId(String id)
+   {
       this.id = id;
+   }
+   
+   public void setJndiName(String jndiName)
+   {
       this.jndiName = jndiName;
-      this.resource = resource;
    }
    
    /**

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSourceTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSourceTest.java	2010-07-06 20:24:50 UTC (rev 106472)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/config/SingleCacheManagerRegistryConfigurationSourceTest.java	2010-07-06 20:25:06 UTC (rev 106473)
@@ -10,7 +10,7 @@
    @Test
    public void testDefault() throws Exception
    {
-      CacheManagerRegistryConfigurationSource source = new SingleCacheManagerRegistryConfigurationSource("default", "java:SingleCacheManager", "config-samples/minimal.xml");
+      CacheManagerRegistryConfigurationSource source = new SingleCacheManagerRegistryConfigurationSource("config-samples/minimal.xml");
       
       CacheManagerRegistryConfiguration configuration = source.getRegistryConfiguration();
       
@@ -25,6 +25,31 @@
       Assert.assertSame(entry, configuration.getDefaultEntry());
       
       Assert.assertEquals("default", entry.getId());
+      Assert.assertNull(entry.getJndiName());
+      Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+   }
+   
+   @Test
+   public void testCustom() throws Exception
+   {
+      SingleCacheManagerRegistryConfigurationSource source = new SingleCacheManagerRegistryConfigurationSource("config-samples/minimal.xml");
+
+      source.setId("custom");
+      source.setJndiName("java:SingleCacheManager");
+      
+      CacheManagerRegistryConfiguration configuration = source.getRegistryConfiguration();
+      
+      Assert.assertEquals("java:CacheManager", configuration.getBaseJndiName());
+      
+      List<CacheManagerRegistryConfigurationEntry> entries = configuration.getEntries();
+      
+      Assert.assertEquals(1, entries.size());
+      
+      CacheManagerRegistryConfigurationEntry entry = entries.get(0);
+      
+      Assert.assertSame(entry, configuration.getDefaultEntry());
+      
+      Assert.assertEquals("custom", entry.getId());
       Assert.assertEquals("java:SingleCacheManager", entry.getJndiName());
       Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
    }