[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/pojo/jmx ...

[Galder Zamarreno]

  User: gzamarreno
  Date: 07/07/17 18:16:48

  Modified:    tests/functional/org/jboss/cache/pojo/jmx 
                        LegacyConfigurationTest.java
  Log:
  [JBCACHE-1134] singleton store cache loader class configuration added and changed the way SSCL is configured in the XML. Also migrated push state logic to use java.util.concurrent package. Still missing, changing user guide for the updated configuration and an XML example in etc/
  
  Revision  Changes    Path
  1.4       +12 -7     JBossCache/tests/functional/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LegacyConfigurationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- LegacyConfigurationTest.java	14 Jun 2007 15:30:15 -0000	1.3
  +++ LegacyConfigurationTest.java	17 Jul 2007 22:16:48 -0000	1.4
  @@ -40,6 +40,7 @@
   import org.jboss.cache.eviction.MRUConfiguration;
   import org.jboss.cache.eviction.MRUPolicy;
   import org.jboss.cache.loader.FileCacheLoader;
  +import org.jboss.cache.loader.SingletonStoreCacheLoader;
   import org.jboss.cache.loader.jdbm.JdbmCacheLoader;
   import org.jboss.cache.lock.IsolationLevel;
   import org.jboss.cache.transaction.BatchModeTransactionManagerLookup;
  @@ -60,7 +61,7 @@
    * Test of the CacheLegacyJmxWrapper.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class LegacyConfigurationTest extends PojoCacheJmxWrapperTestBase
   {
  @@ -160,16 +161,16 @@
         assertEquals("CL0 fetch", true, iclc.isFetchPersistentState());
         assertEquals("CL0 ignore", true, iclc.isIgnoreModifications());
         assertEquals("CL0 purge", true, iclc.isPurgeOnStartup());
  -      assertEquals("CL0 push", true, iclc.isPushStateWhenCoordinator());
  -      assertEquals("CL0 singleton", true, iclc.isSingletonStore());
  +      assertEquals("CL0 singleton", true, iclc.getSingletonStoreConfig().isSingletonStoreEnabled());
  +      assertEquals("CL0 singleton class", SingletonStoreCacheLoader.class.getName(), iclc.getSingletonStoreConfig().getSingletonStoreClass());
         iclc = iclcs.get(1);
         assertEquals("CL1 class", JdbmCacheLoader.class.getName(), iclc.getClassName());
         assertEquals("CL1 async", true, iclc.isAsync());
         assertEquals("CL1 fetch", false, iclc.isFetchPersistentState());
         assertEquals("CL1 ignore", false, iclc.isIgnoreModifications());
         assertEquals("CL1 purge", false, iclc.isPurgeOnStartup());
  -      assertEquals("CL1 push", false, iclc.isPushStateWhenCoordinator());
  -      assertEquals("CL1 singleton", false, iclc.isSingletonStore());
  +      assertEquals("CL1 singleton", false, iclc.getSingletonStoreConfig().isSingletonStoreEnabled());
  +      assertEquals("CL1 singleton class", SingletonStoreCacheLoader.class.getName(), iclc.getSingletonStoreConfig().getSingletonStoreClass());
   
         assertEquals("EvictionPolicyConfig", getEvictionPolicyConfig().toString(), wrapper.getEvictionPolicyConfig().toString());
         EvictionConfig ec = c.getEvictionConfig();
  @@ -258,7 +259,9 @@
                      "<fetchPersistentState>true</fetchPersistentState>\n" +
                      "<ignoreModifications>true</ignoreModifications>\n" +
                      "<purgeOnStartup>true</purgeOnStartup>\n" +
  -                   "<singletonStore pushStateWhenCoordinator=\"true\">true</singletonStore>\n" +
  +                   "<singletonStore>" +
  +                   "<enabled>true</enabled>" +
  +                   "</singletonStore>" +
                      "</cacheloader>\n" +
                      "<cacheloader>\n" +
                      "<class>org.jboss.cache.loader.jdbm.JdbmCacheLoader</class>\n" +
  @@ -269,7 +272,9 @@
                      "<fetchPersistentState>false</fetchPersistentState>\n" +
                      "<ignoreModifications>false</ignoreModifications>\n" +
                      "<purgeOnStartup>false</purgeOnStartup>\n" +
  -                   "<singletonStore pushStateWhenCoordinator=\"false\">false</singletonStore>\n" +
  +                   "<singletonStore>" +
  +                   "<enabled>false</enabled>" +
  +                   "</singletonStore>" +
                      "</cacheloader>\n" +
                      "</config>";
         return XmlHelper.stringToElement(xml);