Using shorter timeouts in tests when waiting for latches that must not trigger.

Simone Bordet · Simone Bordet · commit dc3d489943e9 · 2012-01-25T14:09:09.000+01:00
diff --git a/cometd-java/cometd-java-annotations/src/test/java/org/cometd/java/annotation/ClientAnnotationProcessorTest.java b/cometd-java/cometd-java-annotations/src/test/java/org/cometd/java/annotation/ClientAnnotationProcessorTest.java
@@ -280,7 +280,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         messageLatch.set(new CountDownLatch(1));
 
         bayeuxClient.getChannel("/foo").publish(new HashMap());
-        assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
+        assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));
     }
 
     @Test
@@ -352,7 +352,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
 
         messageLatch.set(new CountDownLatch(1));
         bayeuxClient.getChannel("/foo").publish(new HashMap());
-        assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
+        assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));
     }
 
     @Test
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientConcurrentTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientConcurrentTest.java
@@ -175,7 +175,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         // Publish will fail
         channel.publish(new HashMap());
         assertTrue(failLatch.await(5, TimeUnit.SECONDS));
-        assertFalse(publishLatch.await(5, TimeUnit.SECONDS));
+        assertFalse(publishLatch.await(1, TimeUnit.SECONDS));
 
         assertTrue(client.waitFor(5000, BayeuxClient.State.DISCONNECTED));
     }
@@ -312,7 +312,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
                 try
                 {
                     // Be sure messages are not sent (we're still batching)
-                    assertFalse(sendLatch.await(5, TimeUnit.SECONDS));
+                    assertFalse(sendLatch.await(1, TimeUnit.SECONDS));
                 }
                 catch (InterruptedException x)
                 {
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientExtensionTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientExtensionTest.java
@@ -253,7 +253,7 @@ public boolean sendMeta(ClientSession session, Message.Mutable message)
 
         client.getChannel(channelName).publish(new HashMap());
 
-        Assert.assertFalse(latch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(latch.await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientTest.java
@@ -304,7 +304,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         Assert.assertEquals(BayeuxClient.State.DISCONNECTED, client.getState());
 
         // Be sure the connect is not tried
-        Assert.assertFalse(connectLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(connectLatch.await(1, TimeUnit.SECONDS));
     }
 
     @Test
@@ -815,14 +815,14 @@ public void onMessage(ClientSessionChannel channel, Message message)
         Assert.assertTrue(failureLatch.await(5, TimeUnit.SECONDS));
 
         // Publish must not be sent
-        Assert.assertFalse(publishLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(publishLatch.await(1, TimeUnit.SECONDS));
         Assert.assertFalse(client.isConnected());
 
         connectLatch.set(new CountDownLatch(1));
         client.handshake();
         Assert.assertTrue(connectLatch.get().await(5, TimeUnit.SECONDS));
         // Check that publish has not been queued and is not sent on restart
-        Assert.assertFalse(publishLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(publishLatch.await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
@@ -881,7 +881,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         Assert.assertFalse(client.isConnected());
 
         // Message must not be received
-        Assert.assertFalse(messageLatch.get().await(10, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));
 
         connectLatch.set(new CountDownLatch(1));
         client.handshake();
@@ -1065,7 +1065,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         Assert.assertTrue(publishLatch.await(5, TimeUnit.SECONDS));
 
         client.getChannel("/service/foo").publish(new HashMap<String, Object>());
-        Assert.assertFalse(serviceLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(serviceLatch.await(1, TimeUnit.SECONDS));
 
         Assert.assertFalse(metaLatch.await(timeout + timeout / 2, TimeUnit.MILLISECONDS));
 
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/MessagesAfterFailedHandshakeTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/MessagesAfterFailedHandshakeTest.java
@@ -90,7 +90,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
 
         assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
         assertTrue(subscribeLatch.await(5, TimeUnit.SECONDS));
-        assertFalse(serverLatch.await(5, TimeUnit.SECONDS));
+        assertFalse(serverLatch.await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
@@ -137,7 +137,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
 
         assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
         assertTrue(publishLatch.await(5, TimeUnit.SECONDS));
-        assertFalse(serverLatch.await(5, TimeUnit.SECONDS));
+        assertFalse(serverLatch.await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/ServerChannelSubscribeUnsubscribeTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/ServerChannelSubscribeUnsubscribeTest.java
@@ -104,7 +104,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         // Publish, must not receive it
         messageLatch.set(new CountDownLatch(1));
         testChannel.publish(new HashMap<String, Object>());
-        Assert.assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));
 
         // Tell the server to resubscribe the session
         Map<String, Object> resubscribe = new HashMap<String, Object>();
@@ -243,7 +243,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         // Publish, must not receive it
         messageLatch.set(new CountDownLatch(1));
         testChannel.publish(new HashMap<String, Object>());
-        Assert.assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));
 
         // Disconnect
         Assert.assertTrue(client.disconnect(1000));
diff --git a/cometd-java/cometd-java-client/src/test/java/org/cometd/client/SimulatedNetworkFailureTest.java b/cometd-java/cometd-java-client/src/test/java/org/cometd/client/SimulatedNetworkFailureTest.java
@@ -127,7 +127,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         // We should be able to publish now
         publishLatch.set(new CountDownLatch(1));
         channel.publish(new HashMap());
-        assertFalse(publishLatch.get().await(5, TimeUnit.SECONDS));
+        assertFalse(publishLatch.get().await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
@@ -219,7 +219,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         // We should be able to publish now
         publishLatch.set(new CountDownLatch(1));
         channel.publish(new HashMap());
-        assertFalse(publishLatch.get().await(5, TimeUnit.SECONDS));
+        assertFalse(publishLatch.get().await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
diff --git a/cometd-java/cometd-java-oort/src/test/java/org/cometd/oort/OortObserveChannelTest.java b/cometd-java/cometd-java-oort/src/test/java/org/cometd/oort/OortObserveChannelTest.java
@@ -85,7 +85,7 @@ public void testObserveChannel() throws Exception
         // Sending a message to Oort2, must be received by client1 but not by client3
         client2.getChannel(channelName).publish(new HashMapMessage());
         Assert.assertTrue(messageLatch1.await(5, TimeUnit.SECONDS));
-        Assert.assertFalse(messageLatch3.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch3.await(1, TimeUnit.SECONDS));
 
         // Sending a message to Oort3, must be received by client1 and by client3
         messageLatch1.reset(1);
@@ -188,6 +188,6 @@ public void testDeobserve() throws Exception
         // Resend, the message must not be received
         messageLatch1.reset(1);
         client2.getChannel(channelName).publish(new HashMapMessage());
-        Assert.assertFalse(messageLatch1.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch1.await(1, TimeUnit.SECONDS));
     }
 }
diff --git a/cometd-java/cometd-java-oort/src/test/java/org/cometd/oort/SetiTest.java b/cometd-java/cometd-java-oort/src/test/java/org/cometd/oort/SetiTest.java
@@ -193,7 +193,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
         client1.getChannel(channel).publish(data1);
 
         // User2 has been disassociated, must not receive the message
-        Assert.assertFalse(messageLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(messageLatch.await(1, TimeUnit.SECONDS));
     }
 
     @Test
diff --git a/cometd-java/cometd-java-server/src/test/java/org/cometd/server/ConcurrentConnectDisconnectTest.java b/cometd-java/cometd-java-server/src/test/java/org/cometd/server/ConcurrentConnectDisconnectTest.java
@@ -198,7 +198,7 @@ protected void metaConnectSuspended(HttpServletRequest request, ServerSession se
         disconnectLatch.countDown();
 
         // The connect must not be suspended
-        Assert.assertFalse(suspendLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(suspendLatch.await(1, TimeUnit.SECONDS));
 
         Assert.assertEquals(HttpExchange.STATUS_COMPLETED, connect2.waitForDone());
         Assert.assertEquals(200, connect2.getResponseStatus());
diff --git a/cometd-java/cometd-websocket-jetty/src/test/java/org/cometd/websocket/client/BayeuxClientWebSocketTest.java b/cometd-java/cometd-websocket-jetty/src/test/java/org/cometd/websocket/client/BayeuxClientWebSocketTest.java
@@ -333,7 +333,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
 
         Assert.assertTrue(publishLatch.get().await(5, TimeUnit.SECONDS));
         // Make sure long poll is not responded
-        Assert.assertFalse(connectLatch.get().await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(connectLatch.get().await(1, TimeUnit.SECONDS));
 
         // Test publish triggered by a message sent by the client
         // There will be a response pending so the case is different
@@ -359,7 +359,7 @@ public boolean onMessage(ServerSession from, ServerChannel channel, ServerMessag
 
         Assert.assertTrue(publishLatch.get().await(5, TimeUnit.SECONDS));
         // Make sure long poll is not responded
-        Assert.assertFalse(connectLatch.get().await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(connectLatch.get().await(1, TimeUnit.SECONDS));
 
         disconnectBayeuxClient(client);
     }
diff --git a/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDDeliverTest.java b/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDDeliverTest.java
@@ -51,7 +51,7 @@ public void testDeliver() throws Exception
         evaluateScript("var listener = cometd.addListener('/meta/publish', function(message) { latch.countDown(); });");
         evaluateScript("cometd.publish('/service/deliver', { deliver: false });");
         Assert.assertTrue(latch.await(5000));
-        Assert.assertFalse(pushLatch.await(5000));
+        Assert.assertFalse(pushLatch.await(1000));
         evaluateScript("cometd.removeListener(listener);");
         evaluateScript("window.assert(_data === undefined);");
 
diff --git a/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDDisconnectInListenersTest.java b/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDDisconnectInListenersTest.java
@@ -50,7 +50,7 @@ public void testDisconnectInHandshakeListener() throws Exception
                 "");
 
         // Connect must not be called
-        Assert.assertFalse(connectLatch.await(5000));
+        Assert.assertFalse(connectLatch.await(1000));
 
         Assert.assertTrue(disconnectLatch.await(5000));
     }
@@ -82,7 +82,7 @@ public void testDisconnectInConnectListener() throws Exception
                 "");
 
         // Connect must be called only once
-        Assert.assertFalse(connectLatch.await(5000));
+        Assert.assertFalse(connectLatch.await(1000));
         Assert.assertEquals(1L, connectLatch.jsGet_count());
 
         Assert.assertTrue(disconnectLatch.await(5000));
diff --git a/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDSubscribeTest.java b/cometd-javascript/common-test/src/test/java/org/cometd/javascript/CometDSubscribeTest.java
@@ -45,7 +45,7 @@ public void testSubscriptionsUnsubscriptionsForSameChannelOnlySentOnce() throws
         subscribeLatch.reset(2);
         evaluateScript("var subscription1 = cometd.subscribe('/foo', function(message) {});");
         evaluateScript("var subscription2 = cometd.subscribe('/foo', function(message) {});");
-        Assert.assertFalse(subscribeLatch.await(5000));
+        Assert.assertFalse(subscribeLatch.await(1000));
 
         // No message if there are subscriptions
         unsubscribeLatch.reset(0);
diff --git a/cometd-javascript/common-test/src/test/java/org/cometd/javascript/dojo/CometDTwoInstancesTest.java b/cometd-javascript/common-test/src/test/java/org/cometd/javascript/dojo/CometDTwoInstancesTest.java
@@ -46,7 +46,7 @@ public void testTwoInstances() throws Exception
                 "cometd.init({url: '" + cometdURL + "', logLevel: '" + getLogLevel() + "'});" +
                 "");
         Assert.assertTrue(handshakeLatch.await(5000));
-        Assert.assertFalse(handshakeLatch2.await(5000));
+        Assert.assertFalse(handshakeLatch2.await(1000));
 
         String cometdURL2 = cometdURL.replace("localhost", "127.0.0.1");
         evaluateScript("" +
diff --git a/cometd-javascript/common-test/src/test/java/org/cometd/javascript/jquery/CometDTwoInstancesTest.java b/cometd-javascript/common-test/src/test/java/org/cometd/javascript/jquery/CometDTwoInstancesTest.java
@@ -42,7 +42,7 @@ public void testTwoInstances() throws Exception
                 "cometd.init({url: '" + cometdURL + "', logLevel: '" + getLogLevel() + "'});" +
                 "");
         Assert.assertTrue(handshakeLatch.await(5000));
-        Assert.assertFalse(handshakeLatch2.await(5000));
+        Assert.assertFalse(handshakeLatch2.await(1000));
 
         String cometdURL2 = cometdURL.replace("localhost", "127.0.0.1");
         evaluateScript("" +

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`280`	`280`	`messageLatch.set(new CountDownLatch(1));`
`281`	`281`
`282`	`282`	`bayeuxClient.getChannel("/foo").publish(new HashMap());`
`283`		`- assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));`
	`283`	`+ assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`@Test`
`@@ -352,7 +352,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`352`	`352`
`353`	`353`	`messageLatch.set(new CountDownLatch(1));`
`354`	`354`	`bayeuxClient.getChannel("/foo").publish(new HashMap());`
`355`		`- assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));`
	`355`	`+ assertFalse(messageLatch.get().await(1, TimeUnit.SECONDS));`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`175`	`175`	`// Publish will fail`
`176`	`176`	`channel.publish(new HashMap());`
`177`	`177`	`assertTrue(failLatch.await(5, TimeUnit.SECONDS));`
`178`		`- assertFalse(publishLatch.await(5, TimeUnit.SECONDS));`
	`178`	`+ assertFalse(publishLatch.await(1, TimeUnit.SECONDS));`
`179`	`179`
`180`	`180`	`assertTrue(client.waitFor(5000, BayeuxClient.State.DISCONNECTED));`
`181`	`181`	`}`
`@@ -312,7 +312,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`312`	`312`	`try`
`313`	`313`	`{`
`314`	`314`	`// Be sure messages are not sent (we're still batching)`
`315`		`- assertFalse(sendLatch.await(5, TimeUnit.SECONDS));`
	`315`	`+ assertFalse(sendLatch.await(1, TimeUnit.SECONDS));`
`316`	`316`	`}`
`317`	`317`	`catch (InterruptedException x)`
`318`	`318`	`{`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public boolean sendMeta(ClientSession session, Message.Mutable message)`
`253`	`253`
`254`	`254`	`client.getChannel(channelName).publish(new HashMap());`
`255`	`255`
`256`		`- Assert.assertFalse(latch.await(5, TimeUnit.SECONDS));`
	`256`	`+ Assert.assertFalse(latch.await(1, TimeUnit.SECONDS));`
`257`	`257`
`258`	`258`	`disconnectBayeuxClient(client);`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`90`	`90`
`91`	`91`	`assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));`
`92`	`92`	`assertTrue(subscribeLatch.await(5, TimeUnit.SECONDS));`
`93`		`- assertFalse(serverLatch.await(5, TimeUnit.SECONDS));`
	`93`	`+ assertFalse(serverLatch.await(1, TimeUnit.SECONDS));`
`94`	`94`
`95`	`95`	`disconnectBayeuxClient(client);`
`96`	`96`	`}`
`@@ -137,7 +137,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`137`	`137`
`138`	`138`	`assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));`
`139`	`139`	`assertTrue(publishLatch.await(5, TimeUnit.SECONDS));`
`140`		`- assertFalse(serverLatch.await(5, TimeUnit.SECONDS));`
	`140`	`+ assertFalse(serverLatch.await(1, TimeUnit.SECONDS));`
`141`	`141`
`142`	`142`	`disconnectBayeuxClient(client);`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public void onMessage(ClientSessionChannel channel, Message message)`
`193`	`193`	`client1.getChannel(channel).publish(data1);`
`194`	`194`
`195`	`195`	`// User2 has been disassociated, must not receive the message`
`196`		`- Assert.assertFalse(messageLatch.await(5, TimeUnit.SECONDS));`
	`196`	`+ Assert.assertFalse(messageLatch.await(1, TimeUnit.SECONDS));`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`@Test`