QPID-2932: Fix tests on java persistent profile by adding delays

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@1038548 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 12 insertions, 7 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
index a9bdcb2d21..fbaa1342c9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
@@ -81,8 +81,9 @@ public class StatisticsCounterTest extends TestCase
         StatisticsCounter counter = new StatisticsCounter("test", 1000L);
         long start = counter.getStart();
         assertEquals(0.0, counter.getPeak());
+        Thread.sleep(500);
         counter.registerEvent(1000, start + 500);
-        Thread.sleep(1250);
+        Thread.sleep(1000);
         assertEquals(1000.0, counter.getPeak());
         counter.registerEvent(2000, start + 1500);
         Thread.sleep(1000);
@@ -102,10 +103,10 @@ public class StatisticsCounterTest extends TestCase
         long start = counter.getStart();
         assertEquals(0.0, counter.getPeak());
         counter.registerEvent(1000, start + 2500);
-        Thread.sleep(1250);
+        Thread.sleep(1500);
         assertEquals(0.0, counter.getPeak());
         counter.registerEvent(2000, start + 1500);
-        Thread.sleep(1000);
+        Thread.sleep(1000L);
         assertEquals(0.0, counter.getPeak());
         counter.registerEvent(1000, start + 500);
         Thread.sleep(1500);
@@ -127,9 +128,9 @@ public class StatisticsCounterTest extends TestCase
     {
         StatisticsCounter counter = new StatisticsCounter("test", 1000L);
         assertEquals(0.0, counter.getRate());
-        Thread.sleep(100);
+        Thread.sleep(500);
         counter.registerEvent(1000);
-        Thread.sleep(1250);
+        Thread.sleep(1000);
         assertEquals(1000.0, counter.getRate());
         counter.registerEvent(2000);
         Thread.sleep(1000);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
index cea90709e1..9839c6e475 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
@@ -76,6 +76,7 @@ public class MessageConnectionStatisticsTest extends MessageStatisticsTestCase
         
         sendUsing(test, 5, 200);
         sendUsing(_test, 5, 200);
+        Thread.sleep(1000);
         
         for (ManagedConnection mc : _jmxUtils.getManagedConnections("test"))
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
index 721a464c67..3f9e512631 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
@@ -48,6 +48,7 @@ public class MessageStatisticsTest extends MessageStatisticsTestCase
         sendUsing(_local, 5, 100);
         sendUsing(_local, 5, 100);
         sendUsing(_local, 5, 100);
+        Thread.sleep(2000);
         
         ManagedBroker test = _jmxUtils.getManagedBroker("test");
         ManagedBroker dev = _jmxUtils.getManagedBroker("development");
@@ -116,6 +117,7 @@ public class MessageStatisticsTest extends MessageStatisticsTestCase
         sendUsing(_test, 10, 100);
         sendUsing(temp, 10, 100);
         sendUsing(_test, 10, 100);
+        Thread.sleep(2000);
         
         temp.close();
         
@@ -155,9 +157,9 @@ public class MessageStatisticsTest extends MessageStatisticsTestCase
     public void testMessagePeakRates() throws Exception
     {
         sendUsing(_test, 2, 10);
-        Thread.sleep(10 * 1000);
+        Thread.sleep(10000);
         sendUsing(_dev, 4, 10);
-        Thread.sleep(10 * 1000);
+        Thread.sleep(10000);
         
         ManagedBroker test = _jmxUtils.getManagedBroker("test");
         ManagedBroker dev = _jmxUtils.getManagedBroker("development");
@@ -181,6 +183,7 @@ public class MessageStatisticsTest extends MessageStatisticsTestCase
     {
         sendUsing(_test, 10, 10);
         sendUsing(_dev, 10, 10);
+        Thread.sleep(2000);
         
         ManagedBroker test = _jmxUtils.getManagedBroker("test");
         ManagedBroker dev = _jmxUtils.getManagedBroker("development");