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

[Manik Surtani]

  User: msurtani
  Date: 07/06/28 12:53:38

  Modified:    tests/functional/org/jboss/cache/jmx  NotificationTest.java
  Log:
  Notification changes
  
  Revision  Changes    Path
  1.6       +1 -8      JBossCache/tests/functional/org/jboss/cache/jmx/NotificationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NotificationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/jmx/NotificationTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- NotificationTest.java	15 Jun 2007 12:37:56 -0000	1.5
  +++ NotificationTest.java	28 Jun 2007 16:53:38 -0000	1.6
  @@ -11,7 +11,6 @@
   import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
   import org.jboss.cache.factories.XmlConfigurationParser;
   import org.jboss.cache.loader.CacheLoader;
  -import org.jboss.cache.misc.TestingUtil;
   import org.jboss.cache.xml.XmlHelper;
   import org.w3c.dom.Element;
   
  @@ -27,7 +26,7 @@
    * Functional tests for CacheJmxWrapper broadcast of cache event notifications
    *
    * @author Jerry Gauthier
  - * @version $Id: NotificationTest.java,v 1.5 2007/06/15 12:37:56 msurtani Exp $
  + * @version $Id: NotificationTest.java,v 1.6 2007/06/28 16:53:38 msurtani Exp $
    */
   public class NotificationTest extends TestCase
   {
  @@ -37,7 +36,6 @@
      protected static final String CURRENCY = "currency";
      protected static final String POPULATION = "population";
      protected static final String EUROPE_NODE = "Europe";
  -   protected static final int LISTENER_WAIT_TIME = 200; // ms to wait for notifications to be delivered
   
      public enum Type
      {
  @@ -164,7 +162,6 @@
         m_server.removeNotificationListener(mgmt, listener);
   
         // run the tests
  -      TestingUtil.sleepThread(LISTENER_WAIT_TIME);
         assertTrue("Expected CacheStarted notification", events.contains(Type.STARTED));
         assertTrue("Expected CacheStopped notification", events.contains(Type.STOPPED));
         assertTrue("Expected NodeCreated notification", events.contains(Type.PRECREATE));
  @@ -203,7 +200,6 @@
         cache.start();
         try
         {
  -         TestingUtil.sleepThread(LISTENER_WAIT_TIME);
            assertTrue("Expected CacheStarted notification", events.contains(Type.STARTED));
            validateHealthyListener(listener);
         }
  @@ -236,7 +232,6 @@
            cache.put("Europe/Albania", albania);
   
            // run the tests
  -         TestingUtil.sleepThread(LISTENER_WAIT_TIME);
            assertTrue("Expected NodeModified notification", events.contains(Type.PREMODIFY));
            assertTrue("Expected NodeModified notification", events.contains(Type.POSTMODIFY));
            validateHealthyListener(listener);
  @@ -263,7 +258,6 @@
         boolean ok = false;
         try
         {
  -         TestingUtil.sleepThread(LISTENER_WAIT_TIME);
            assertTrue("Expected CacheStarted notification", events.contains(Type.STARTED));
   
            m_server.removeNotificationListener(mgmt, listener);
  @@ -274,7 +268,6 @@
            cache.stop();
            if (ok)
            {
  -            TestingUtil.sleepThread(LISTENER_WAIT_TIME);
               assertFalse("Expected no CacheStopped notification", events.contains(Type.STOPPED));
               validateHealthyListener(listener);
            }