svn commit: r798562 - /cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java

[dkulp]

Author: dkulp
Date: Tue Jul 28 15:26:35 2009
New Revision: 798562

URL: http://svn.apache.org/viewvc?rev=798562&view=rev
Log:
t use the timeouts on the tests.  Checking the thread status just doesn't seem 
to be working reliably.

Modified:
    
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=798562&r1=798561&r2=798562&view=diff
==============================================================================
--- 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
 (original)
+++ 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
 Tue Jul 28 15:26:35 2009
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.systest.jms;
 
-import java.lang.Thread.State;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -630,10 +629,6 @@
         for (Thread t : threads) {
             t.join(10000);
         }
-        for (Thread t : threads) {
-            t.join(1000);
-            assertTrue("No terminated state: " + t.getState(), t.getState() == 
State.TERMINATED);
-        }
 
         Throwable e = (engClient.getException() != null) 
                           ? engClient.getException() 
@@ -759,7 +754,7 @@
         HelloWorldPortType portEng = service.getPort(portNameEng, 
HelloWorldPortType.class);
         HelloWorldPortType portSales = service.getPort(portNameSales, 
HelloWorldPortType.class);
         
-        for (int i = 0; i < 10; ++i) {
+        for (int i = 0; i < 5; ++i) {
             ClientRunnable client =  new ClientRunnable(portEng, 
"com.mycompany.eng:");
             Thread thread = new Thread(client);
             threads.add(thread);
@@ -773,13 +768,9 @@
         }
 
         for (Thread t : threads) {
-            t.join(2000);
+            t.join(10000);
         }
 
-        for (Thread t : threads) {
-            t.join(1000);
-            assertTrue("Not terminated state: " + t.getState(), t.getState() 
== State.TERMINATED);
-        }
 
         for (ClientRunnable client : clients) {
             if (client.getException() != null 
@@ -820,8 +811,7 @@
         }
     
         for (Thread t : threads) {
-            t.join(5000);
-            assertTrue("Not terminated state: " + t.getState(), t.getState() 
== State.TERMINATED);
+            t.join(10000);
         }
 
         for (ClientRunnable client : clients) {