[jboss-cvs] JBoss Messaging SVN: r6651 - trunk/tests/joram-tests/src/org/jboss/test/jms.

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

Author: jmesnil
Date: 2009-05-04 09:53:18 -0400 (Mon, 04 May 2009)
New Revision: 6651

Modified:
   trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
   trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
Log:
JORAM tests

* echoes server log

Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java	2009-05-04 13:23:12 UTC (rev 6650)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java	2009-05-04 13:53:18 UTC (rev 6651)
@@ -226,14 +226,10 @@
       String line = null;
       while ((line = br.readLine()) != null)
       {
-         System.out.println(line);
+         System.out.println("SERVER: " + line);
          line.replace('|', '\n');
-         if (line.startsWith("Listening for transport"))
+         if ("OK".equals(line.trim()))
          {
-            continue;
-         }
-         else if ("OK".equals(line.trim()))
-         {
             new Thread()
             {
                public void run()
@@ -254,7 +250,7 @@
             }.start();
             return;
          }
-         else
+         else if ("KO".equals(line.trim()))
          {
             // something went wrong with the server, destroy it:
             serverProcess.destroy();

Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-05-04 13:23:12 UTC (rev 6650)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-05-04 13:53:18 UTC (rev 6651)
@@ -121,12 +121,9 @@
             allStack += stackTraceElement.toString() + "|";
          }
          System.out.println(allStack);
+         System.out.println("KO");
          System.exit(1);
       }
-      finally
-      {
-         System.out.println("KO");
-      }
    }
 
    // Constructors --------------------------------------------------