QPID-3713 : Implement producer side flow control for 0-10 in Java Broker

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1226382 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 6 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 775d2c3eb0..47f334adf6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -154,8 +154,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging
         // try to send 5 messages (should block after 4)
         sendMessagesAsync(producer, producerSession, 5, 50L);
 
-        Thread.sleep(5000);
-        List<String> results = waitAndFindMatches("QUE-1003");
+        List<String> results = waitAndFindMatches("QUE-1003", 7000);
 
         assertEquals("Did not find correct number of QUE-1003 queue overfull messages", 1, results.size());
 
@@ -199,11 +198,13 @@ public class ProducerFlowControlTest extends AbstractTestLogging
         // try to send 5 messages (should block after 4)
         MessageSender sender = sendMessagesAsync(producer, producerSession, 5, 50L);
 
-        Thread.sleep(TIMEOUT);
         List<String> results = waitAndFindMatches("Message send delayed by", TIMEOUT);
         assertTrue("No delay messages logged by client",results.size()!=0);
-        results = findMatches("Message send failed due to timeout waiting on broker enforced flow control");
-        assertEquals("Incorrect number of send failure messages logged by client",1,results.size());
+
+        List<String> failedMessages = waitAndFindMatches("Message send failed due to timeout waiting on broker enforced"
+                                                  + " flow control", TIMEOUT);
+        assertEquals("Incorrect number of send failure messages logged by client (got " + results.size() + " delay "
+                     + "messages)",1,failedMessages.size());
 
 
 
@@ -325,8 +326,9 @@ public class ProducerFlowControlTest extends AbstractTestLogging
 
 
         // try to send 5 messages (should block after 4)
-        MessageSender sender = sendMessagesAsync(producer, producerSession, 5, 50L);
+        MessageSender sender = sendMessagesAsync(producer, producerSession, 5, 100L);
 
+        
         Thread.sleep(10000);
 
         Exception e = sender.getException();
@@ -440,6 +442,15 @@ public class ProducerFlowControlTest extends AbstractTestLogging
                 e.printStackTrace();
                 throw new RuntimeException(e);
             }
+
+            try
+            {
+                Thread.sleep(sleepPeriod);
+            }
+            catch (InterruptedException e)
+            {
+                throw new RuntimeException(e);
+            }
         }
     }