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

[Manik Surtani]

  User: msurtani
  Date: 06/08/30 14:32:17

  Modified:    tests/functional/org/jboss/cache/optimistic  
                        AbstractOptimisticTestCase.java TestListener.java
  Log:
  Fixed some failing tests
  
  Revision  Changes    Path
  1.36      +262 -262  JBossCache/tests/functional/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractOptimisticTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- AbstractOptimisticTestCase.java	16 Aug 2006 10:52:51 -0000	1.35
  +++ AbstractOptimisticTestCase.java	30 Aug 2006 18:32:17 -0000	1.36
  @@ -4,12 +4,12 @@
   package org.jboss.cache.optimistic;
   
   import junit.framework.TestCase;
  +import org.jboss.cache.CacheListener;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.CacheListener;
   import org.jboss.cache.config.Configuration;
  -import org.jboss.cache.misc.TestingUtil;
   import org.jboss.cache.lock.IsolationLevel;
  +import org.jboss.cache.misc.TestingUtil;
   import org.jboss.cache.xml.XmlHelper;
   import org.w3c.dom.Element;
   
  @@ -76,9 +76,9 @@
       protected TreeCache createCacheWithListener(CacheListener listener) throws Exception
       {
           TreeCache cache = createCacheUnstarted();
  -        cache.getNotifier().addCacheListener(listener);
           cache.createService();
           cache.startService();
  +      cache.getNotifier().addCacheListener(listener);
           return cache;
       }
   
  @@ -98,7 +98,7 @@
           String xml = "            <config>\n" +
                   "                <passivation>" + passivation + "</passivation>\n" +
                   "                <preload></preload>\n" +
  -                "                <shared>"+shared+"</shared>\n" +
  +              "                <shared>" + shared + "</shared>\n" +
                   "                <cacheloader>\n" +
                   "                    <class>org.jboss.cache.loader.FileCacheLoader</class>\n" +
                   "                    <properties>\n" +
  @@ -205,7 +205,7 @@
           Configuration c = new Configuration();
           cache.setConfiguration(c);
   
  -        c.setClusterName( name );
  +      c.setClusterName(name);
           c.setInitialStateRetrievalTimeout(5000);
           c.setClusterConfig(getDefaultProperties());
           c.setCacheMode(mode);
  
  
  
  1.10      +27 -24    JBossCache/tests/functional/org/jboss/cache/optimistic/TestListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/TestListener.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TestListener.java	18 Jul 2006 10:50:47 -0000	1.9
  +++ TestListener.java	30 Aug 2006 18:32:17 -0000	1.10
  @@ -25,10 +25,13 @@
         */
       public synchronized void nodeCreated(Fqn fqn, boolean pre, boolean local)
       {
  -
  +      if (pre)
  +      {
           nodesAdded++;
           log.info("DataNode created " + fqn);
       }
  +   }
  +
       /**
        * @return Returns the nodesAdded.
        */