[jboss-cvs] JBoss Messaging SVN: r1870 - in trunk/tests/src/org/jboss/test/messaging: jms/clustering jms/server/destination tools tools/jmx/rmi

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-12-28 22:02:10 -0500 (Thu, 28 Dec 2006)
New Revision: 1870

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
Log:
minor tweaks

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2006-12-29 02:39:43 UTC (rev 1869)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2006-12-29 03:02:10 UTC (rev 1870)
@@ -75,11 +75,13 @@
          // kill node 1
 
 
+
+         ServerManagement.killAndWait(1);
+
          log.info("########");
          log.info("######## KILLED NODE 1");
          log.info("########");
 
-         ServerManagement.killAndWait(1);
          try
          {
             ic[1].lookup("queue"); // looking up anything

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2006-12-29 02:39:43 UTC (rev 1869)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2006-12-29 03:02:10 UTC (rev 1870)
@@ -34,7 +34,6 @@
 import javax.jms.TopicConnection;
 import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
@@ -662,7 +661,7 @@
          ObjectName destObjectName = 
             new ObjectName("jboss.messaging.destination:service=Topic,name=TopicMessageList");
          
-         String strSub = (String)ServerManagement.invoke(destObjectName, "listSubscriptionsAsText", null, null);
+         ServerManagement.invoke(destObjectName, "listSubscriptionsAsText", null, null);
          
          
          // Note that listing the messages ONLY list those ones not in the process of delivery

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2006-12-29 02:39:43 UTC (rev 1869)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2006-12-29 03:02:10 UTC (rev 1870)
@@ -261,11 +261,11 @@
    }
 
    /** 
-    * Kills the server and wait keep trying any dumb communication until the server is effectively killed.
-    * We had to implement this method as kill will actually schedule a thread that will perform System.exit
-    * after few milliseconds.
-    * We will use this method in places where we need the server killed.
-    * */
+    * Kills the server and waits keep trying any dumb communication until the server is effectively
+    * killed. We had to implement this method as kill will actually schedule a thread that will
+    * perform System.exit after few milliseconds. We will use this method in places where we need
+    * the server killed.
+    */
    public static synchronized void killAndWait(int i) throws Exception
    {
       Server server = servers[i].getServer();

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java	2006-12-29 02:39:43 UTC (rev 1869)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java	2006-12-29 03:02:10 UTC (rev 1870)
@@ -61,7 +61,7 @@
 
    private static final Logger log = Logger.getLogger(LocalTestServer.class);
 
-   // Static --------------------------------------------------------    4
+   // Static --------------------------------------------------------
 
    public static void setEnvironmentServerIndex(int serverIndex)
    {