Author: davsclaus
Date: Tue Jan 22 13:22:59 2013
New Revision: 1436898

URL: http://svn.apache.org/viewvc?rev=1436898&view=rev
Log:
Polished and fixed test reported by CI.

Modified:
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
 Tue Jan 22 13:22:59 2013
@@ -17,7 +17,6 @@
 package org.apache.camel.component.zookeeper;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
@@ -46,7 +45,6 @@ public class ConsumeChildrenTest extends
 
     @Test
     public void shouldAwaitCreationAndGetDataNotification() throws Exception {
-
         MockEndpoint mock = getMockEndpoint("mock:zookeeper-data");
         mock.expectedMessageCount(5);
 
@@ -56,8 +54,7 @@ public class ConsumeChildrenTest extends
         client.delete("/grimm/hansel");
         client.delete("/grimm/gretel");
 
-        mock.await(5, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
 
         validateExchangesContainListings(mock, createChildListing(), 
createChildListing("hansel"), createChildListing("hansel", "gretel"), 
createChildListing("gretel"),
                                          createChildListing());

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
 Tue Jan 22 13:22:59 2013
@@ -58,11 +58,10 @@ public class ConsumeDataTest extends Zoo
 
         updateNode(10);
 
-        delay(200);
+        delay(500);
         client.delete("/camel");
 
-        mock.await(5, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
+        mock.assertIsSatisfied(30, TimeUnit.SECONDS);
 
         int lastVersion = -1;
         for (int i = 0; i < mock.getExchanges().size(); i++) {
@@ -80,10 +79,10 @@ public class ConsumeDataTest extends Zoo
     public void deletionOfAwaitedNodeCausesNoFailure() throws Exception {
 
         MockEndpoint mock = getMockEndpoint("mock:zookeeper-data");
-        mock.expectedMessageCount(11);
+        mock.expectedMinimumMessageCount(11);
         createCamelNode();
 
-        delay(200);
+        delay(500);
 
         // by now we are back waiting for a change so delete the node
         client.delete("/camel");
@@ -92,20 +91,19 @@ public class ConsumeDataTest extends Zoo
         createCamelNode();
         updateNode(10);
   
-        mock.await(5, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
-        
+        mock.assertIsSatisfied(30, TimeUnit.SECONDS);
+
         client.delete("/camel");
     }
 
-    private void updateNode(int times) throws InterruptedException, Exception {
+    private void updateNode(int times) throws Exception {
         for (int x = 1; x < times; x++) {
-            delay(200);
+            delay(500);
             client.setData("/camel", testPayload + "_" + x, -1);
         }
     }
 
-    private void createCamelNode() throws InterruptedException, Exception {
+    private void createCamelNode() throws Exception {
         try {
             delay(1000);
             client.create("/camel", testPayload + "_0");

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
 Tue Jan 22 13:22:59 2013
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEqu
 public class ZooKeeperUtilsTest {
 
     @Test
-    public void testCreatModeExtraction() {
+    public void testCreateModeExtraction() {
         assertEquals(CreateMode.EPHEMERAL, 
getCreateModeFromString("EPHEMERAL", CreateMode.EPHEMERAL));
         assertEquals(CreateMode.EPHEMERAL_SEQUENTIAL, 
getCreateModeFromString("EPHEMERAL_SEQUENTIAL", CreateMode.EPHEMERAL));
         assertEquals(CreateMode.PERSISTENT, 
getCreateModeFromString("PERSISTENT", CreateMode.EPHEMERAL));
@@ -38,7 +38,7 @@ public class ZooKeeperUtilsTest {
     }
     
     @Test
-    public void testCreatModeExtractionFromMessageHeader() {
+    public void testCreateModeExtractionFromMessageHeader() {
         assertEquals(CreateMode.EPHEMERAL, testModeInMessage("EPHEMERAL", 
CreateMode.EPHEMERAL));
         assertEquals(CreateMode.EPHEMERAL_SEQUENTIAL, 
testModeInMessage("EPHEMERAL_SEQUENTIAL", CreateMode.EPHEMERAL));
         assertEquals(CreateMode.PERSISTENT, testModeInMessage("PERSISTENT", 
CreateMode.EPHEMERAL));

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
 Tue Jan 22 13:22:59 2013
@@ -17,7 +17,6 @@
 package org.apache.camel.component.zookeeper;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -79,9 +78,7 @@ public class ZookeeperProducerTest exten
         e.setPattern(ExchangePattern.InOut);
         template.send("direct:roundtrip", e);
 
-        mock.await(2, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
-        pipeline.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
     @Test
@@ -92,8 +89,7 @@ public class ZookeeperProducerTest exten
         Exchange e = createExchangeWithBody(testPayload);
         template.send("direct:roundtrip", e);
 
-        mock.await(2, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
     @Test
@@ -105,8 +101,7 @@ public class ZookeeperProducerTest exten
         e.setPattern(ExchangePattern.InOut);
         template.sendBodyAndHeader("direct:node-from-header", e, 
ZOOKEEPER_NODE, "/set");
 
-        mock.await(5, TimeUnit.SECONDS);
-        mock.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
     }
 
     @Test
@@ -132,12 +127,14 @@ public class ZookeeperProducerTest exten
         e.setPattern(ExchangePattern.InOut);
         
         template.send("direct:create-mode", e);
-        mock.await(5, TimeUnit.SECONDS);
-        
+
+        assertMockEndpointsSatisfied();
+
         Stat s = 
mock.getReceivedExchanges().get(0).getIn().getHeader(ZooKeeperMessage.ZOOKEEPER_STATISTICS,
 Stat.class);
         assertEquals(s.getEphemeralOwner(), 0);
     }
 
+    @Test
     public void deleteNode() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:delete");
         mock.expectedMessageCount(1);
@@ -148,7 +145,8 @@ public class ZookeeperProducerTest exten
         e.getIn().setHeader(ZOOKEEPER_OPERATION, "DELETE");
         template.send("direct:delete", e);
 
-        mock.await(5, TimeUnit.SECONDS);
+        assertMockEndpointsSatisfied();
+
         assertNull(client.getConnection().exists("/to-be-deleted", false));
     }
 
@@ -172,8 +170,8 @@ public class ZookeeperProducerTest exten
 
         Exchange exchange = createExchangeWithBody(testPayload);
         template.send("direct:roundtrip", exchange);
-        mock.await();
-        mock.assertIsSatisfied();
+
+        assertMockEndpointsSatisfied();
 
         Message received = mock.getReceivedExchanges().get(0).getIn();
         assertEquals("/node", ZooKeeperMessage.getPath(received));

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
 Tue Jan 22 13:22:59 2013
@@ -22,7 +22,6 @@ import org.junit.Test;
 
 public class AnyOfOperationTest extends ZooKeeperTestSupport {
 
-
     @Test
     public void testExistsOrWaitsWhenNodeExists() throws Exception {
         String node = "/cogito";
@@ -31,7 +30,6 @@ public class AnyOfOperationTest extends 
         assertEquals(node, operation.get().getResult());
     }
 
-
     @Test
     public void testExistsOrWaitsWhenNodeDoesNotExist() throws Exception {
         String node = "/chapter-one";

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
 Tue Jan 22 13:22:59 2013
@@ -37,7 +37,6 @@ public class ChildrenChangedOperationTes
 
     @Test
     public void getsNotifiedWhenNodeIsDeleted() throws Exception {
-
         String path = "/parent2";
         client.createPersistent(path, null);
         client.createPersistent(path + "/child1", null);

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
 Tue Jan 22 13:22:59 2013
@@ -36,7 +36,6 @@ public class DataChangedOperationTest ex
 
     @Test
     public void getsNotifiedWhenNodeIsDeleted() throws Exception {
-
         client.create("/existedButWasDeleted", "this won't hurt a bit");
         ZooKeeper connection = getConnection();
 

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
 Tue Jan 22 13:22:59 2013
@@ -53,7 +53,6 @@ public class FutureEventDrivenOperationT
         new Thread(new Runnable() {
 
             public void run() {
-
                 try {
                     Thread.sleep(millisecondsTillFire);
                     future.process(event);

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java?rev=1436898&r1=1436897&r2=1436898&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
 Tue Jan 22 13:22:59 2013
@@ -54,7 +54,6 @@ public class SetDataOperationTest extend
 
     @Test
     public void setWithNull() throws Exception {
-
         client.create("/three", testPayload);
         updateDataOnNode("/three", null, -1, 1);
 


Reply via email to