svn commit: r1347061 - in /cxf/branches/2.5.x-fixes: ./ systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java

[dkulp]

Author: dkulp
Date: Wed Jun  6 19:11:33 2012
New Revision: 1347061

URL: http://svn.apache.org/viewvc?rev=1347061&view=rev
Log:
Merged revisions 1346488 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1346488 | ay | 2012-06-05 13:39:05 -0400 (Tue, 05 Jun 2012) | 1 line
  
  fixed ManagedEndpointsTest for its execution order issue
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java?rev=1347061&r1=1347060&r2=1347061&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
 Wed Jun  6 19:11:33 2012
@@ -103,16 +103,6 @@ public class ManagedEndpointsTest extend
     }
     
     @Test
-    public void runTests() throws Exception {
-        //There is a problem if testSuspendAndResumeSourceSequence is run first
-        //Need to get Aki to look at it.  For now, just force them into 
-        //an order that works
-        testManagedEndpointsOneway();
-        stopBus();
-        testSuspendAndResumeSourceSequence();
-    }
-    
-    //@Test
     public void testManagedEndpointsOneway() throws Exception {
         checkServerReady(30000);
         
@@ -238,7 +228,7 @@ public class ManagedEndpointsTest extend
 
     }
     
-    //@Test
+    @Test
     public void testSuspendAndResumeSourceSequence() throws Exception {
         checkServerReady(30000);