Update from trunk r1375509 through r1450773asyncstore

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

1 files changed, 40 insertions, 4 deletions

diff --git a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java b/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
index cc969e1ef2..c07d9fcb81 100644
--- a/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
+++ b/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
@@ -21,14 +21,15 @@ package org.apache.qpid.disttest.controller;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.disttest.DistributedTestException;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ClientRegistryTest extends TestCase
+public class ClientRegistryTest extends QpidTestCase
 {
     private static final String CLIENT1_REGISTERED_NAME = "CLIENT1_REGISTERED_NAME";
     private static final String CLIENT2_REGISTERED_NAME = "CLIENT2_REGISTERED_NAME";
+    private static final String CLIENT3_REGISTERED_NAME = "CLIENT3_REGISTERED_NAME";
+
     private static final int AWAIT_DELAY = 100;
 
     private ClientRegistry _clientRegistry = new ClientRegistry();
@@ -70,7 +71,7 @@ public class ClientRegistryTest extends TestCase
         assertEquals(0, numberOfClientsAbsent);
     }
 
-    public void testAwaitTwoClientWhenClientRegistersWhilstWaiting()
+    public void testAwaitTwoClientsWhenClientRegistersWhilstWaiting()
     {
         _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
         registerClientLater(CLIENT2_REGISTERED_NAME, 50);
@@ -79,6 +80,41 @@ public class ClientRegistryTest extends TestCase
         assertEquals(0, numberOfClientsAbsent);
     }
 
+    public void testAwaitTimeoutForPromptRegistrations()
+    {
+        registerClientsLaterAndAssertResult("Clients registering every 100ms should be within 600ms timeout",
+                new int[] {300, 400, 500},
+                600,
+                0);
+    }
+
+    public void testAwaitTimeoutForWhenThirdRegistrationIsLate()
+    {
+        registerClientsLaterAndAssertResult("Third client registering tardily should exceed timeout",
+                new int[] {300, 400, 1500},
+                600,
+                1);
+    }
+
+    public void testAwaitTimeoutWhenSecondAndThirdRegistrationsAreLate()
+    {
+        registerClientsLaterAndAssertResult("Second and third clients registering tardily should exceed timeout",
+                new int[] {300, 1500, 1500},
+                600,
+                2);
+    }
+
+    private void registerClientsLaterAndAssertResult(String message, int[] registrationDelays, int timeout, int expectedNumberOfAbsentees)
+    {
+        registerClientLater(CLIENT1_REGISTERED_NAME, registrationDelays[0]);
+        registerClientLater(CLIENT2_REGISTERED_NAME, registrationDelays[1]);
+        registerClientLater(CLIENT3_REGISTERED_NAME, registrationDelays[2]);
+
+        int numberOfClientsAbsent = _clientRegistry.awaitClients(3, timeout);
+
+        assertEquals(message, expectedNumberOfAbsentees, numberOfClientsAbsent);
+    }
+
     private void registerClientLater(final String clientName, long delayInMillis)
     {
         doLater(new TimerTask()