svn commit: r1347038 - /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 18:32:52 2012
New Revision: 1347038

URL: http://svn.apache.org/viewvc?rev=1347038&view=rev
Log:
Merged revisions 1345418 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1345418 | dkulp | 2012-06-01 21:54:27 -0400 (Fri, 01 Jun 2012) | 3 lines

  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

........

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

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=1347038&r1=1347037&r2=1347038&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 18:32:52 2012
@@ -105,6 +105,16 @@ 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);
         
@@ -230,7 +240,7 @@ public class ManagedEndpointsTest extend
 
     }
     
-    @Test
+    //@Test
     public void testSuspendAndResumeSourceSequence() throws Exception {
         checkServerReady(30000);