[jboss-cvs] JBossAS SVN: r75630 - in trunk/testsuite/src/main/org/jboss/test/jmx: test and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-07-10 11:45:31 -0400 (Thu, 10 Jul 2008)
New Revision: 75630

Modified:
   trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTest.java
   trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java
   trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
Log:
[JBAS-5691] - Remove the bad assumption from these tests that addNotificationListener on the client also means do it on the server

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTest.java	2008-07-10 14:45:25 UTC (rev 75629)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTest.java	2008-07-10 15:45:31 UTC (rev 75630)
@@ -23,13 +23,11 @@
 
 import java.util.Timer;
 import java.util.TimerTask;
-import javax.management.ListenerNotFoundException;
-import javax.management.NotificationListener;
-import javax.management.NotificationFilter;
+
 import javax.management.Notification;
+
 import org.jboss.logging.Logger;
 import org.jboss.mx.notification.AsynchNotificationBroadcasterSupport;
-import org.jboss.mx.notification.NotificationFilterProxy;
 import org.jboss.util.threadpool.BasicThreadPool;
 import org.jboss.util.threadpool.BlockingMode;
 import org.w3c.dom.Element;
@@ -74,43 +72,13 @@
       return "something";
    }
 
-   public void addNotificationListener(NotificationListener listener,
-      NotificationFilter filter, Object handback)
+   public void startTimer()
    {
-      log.info("addNotificationListener, listener: "+listener+", handback: "+handback);
-      super.addNotificationListener(listener, filter, handback);
-      if( "runTimer".equals(handback) )
-      {
-         Timer t = new Timer();
-         Send10Notifies task = new Send10Notifies();
-         t.scheduleAtFixedRate(task, 0, 1000);
-      }
-      /**
-       * This had to be added for the jmx remoting (jsr-160) tests.
-       * Per spec, the handback will NOT be the same as what the client
-       * initially passed when calling addNotificationListener.  Instead,
-       * in the case of our implementation, it will be a NotificationFilterProxy.
-       */
-      if(filter instanceof NotificationFilterProxy)
-      {
-         NotificationFilter delegateFilter = ((NotificationFilterProxy)filter).getFilter();
-         if(delegateFilter instanceof RunTimerFilter)
-         {
-            Timer t = new Timer();
-            Send10Notifies task = new Send10Notifies();
-            t.scheduleAtFixedRate(task, 0, 1000);
-         }
-      }
-
+      Timer t = new Timer();
+      Send10Notifies task = new Send10Notifies();
+      t.scheduleAtFixedRate(task, 0, 1000);
    }
 
-   public void removeNotificationListener(NotificationListener listener)
-      throws ListenerNotFoundException
-   {
-      log.info("removeNotificationListener, listener: "+listener);
-      super.removeNotificationListener(listener);
-   }
-
    /**
     * @jmx:managed-attribute
     */

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java	2008-07-10 14:45:25 UTC (rev 75629)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java	2008-07-10 15:45:31 UTC (rev 75630)
@@ -30,5 +30,7 @@
   org.jboss.test.jmx.invoker.CustomClass doSomething() ;
 
   void stop() ;
+  
+  void startTimer();
 
 }

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java	2008-07-10 14:45:25 UTC (rev 75629)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java	2008-07-10 15:45:31 UTC (rev 75630)
@@ -176,6 +176,7 @@
       log.info("+++ testNotification");
       Listener listener = new Listener(10);
       server.addNotificationListener(getObjectName(), listener, new RunTimerFilter(), "runTimer");
+      server.invoke(getObjectName(), "startTimer", null, null);
       synchronized( listener )
       {
          listener.wait(15000);
@@ -200,6 +201,7 @@
       Listener listener = new Listener(10);
       // Add a good listener
       server.addNotificationListener(getObjectName(), listener, new RunTimerFilter(), "runTimer");
+      server.invoke(getObjectName(), "startTimer", null, null);
       // Wait 25 seconds for the good listener events to complete
       synchronized( listener )
       {

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java	2008-07-10 14:45:25 UTC (rev 75629)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java	2008-07-10 15:45:31 UTC (rev 75630)
@@ -173,6 +173,7 @@
       listener.export();
       RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
       server.addNotificationListener(getObjectName(), listener, null, "runTimer");
+      server.invoke(getObjectName(), "startTimer", null, null);
       synchronized( listener )
       {
          listener.wait(15000);
@@ -201,6 +202,7 @@
       listener.export();
       // Add a good listener
       server.addNotificationListener(getObjectName(), listener, null, "runTimer");
+      server.invoke(getObjectName(), "startTimer", null, null);
       // Wait 25 seconds for the good listener events to complete
       synchronized( listener )
       {