cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1337297 - /cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
Date Fri, 11 May 2012 17:38:08 GMT
Author: dkulp
Date: Fri May 11 17:38:08 2012
New Revision: 1337297

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

........
  r1337291 | dkulp | 2012-05-11 13:34:03 -0400 (Fri, 11 May 2012) | 3 lines

  Fix some random failures where we may need to wait for an additional
  message to get all the acks.

........

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

Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.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/ClientPersistenceTest.java?rev=1337297&r1=1337296&r2=1337297&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
Fri May 11 17:38:08 2012
@@ -27,6 +27,8 @@ import java.util.logging.Logger;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Endpoint;
 
+import junit.framework.AssertionFailedError;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -271,8 +273,16 @@ public class ClientPersistenceTest exten
 //        mf.verifyActions(expectedActions, false);
 //        mf.verifyAcknowledgements(new boolean[]{true, true, false}, false);
         
-        // verify the final ack range to be complete 
-        mf.verifyAcknowledgementRange(1, 5);
+        // verify the final ack range to be complete
+        try {
+            mf.verifyAcknowledgementRange(1, 5);
+        } catch (AssertionFailedError er) {
+            //possibly only got the first 2 ranges when split in 3, lets 
+            //wait for the third and then recheck
+            awaitMessages(1, 3);
+            mf.reset(out.getOutboundMessages(), in.getInboundMessages());
+            mf.verifyAcknowledgementRange(1, 5);
+        }
     }
 
     void recover() throws Exception {



Mime
View raw message