Wait for Host to be added before validating it.

tolbertam · olim7t · commit 37386a434cb9 · 2015-11-05T18:37:23.000+01:00
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ClusterAssert.java b/driver-core/src/test/java/com/datastax/driver/core/ClusterAssert.java
@@ -15,12 +15,13 @@
  */
 package com.datastax.driver.core;
 
-import com.google.common.collect.Iterators;
-import org.assertj.core.api.AbstractAssert;
-
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Iterators;
+import org.assertj.core.api.AbstractAssert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -47,19 +48,17 @@ public ClusterAssert hasOpenControlConnection() {
     }
 
     public HostAssert host(int hostNumber) {
-        // TODO at some point this won't work anymore if we have assertions that wait for a node to
-        // join the cluster, e.g. assertThat(cluster).node(3).comesUp().
-        return new HostAssert(
-            TestUtils.findHost(actual, hostNumber),
-            actual);
+        // Wait for the node to be added if it's not already known.
+        // In 2.2+ C* does not send an added event until the node is ready so we wait a long time.
+        Host host = TestUtils.findOrWaitForHost(actual, hostNumber,
+            60 + Cluster.NEW_NODE_DELAY_SECONDS, TimeUnit.SECONDS);
+        return new HostAssert(host, actual);
     }
 
     public HostAssert host(String hostAddress) {
-        // TODO at some point this won't work anymore if we have assertions that wait for a node to
-        // join the cluster, e.g. assertThat(cluster).node(3).comesUp().
-        return new HostAssert(
-            TestUtils.findHost(actual, hostAddress),
-            actual);
+        Host host = TestUtils.findOrWaitForHost(actual, hostAddress,
+            60 + Cluster.NEW_NODE_DELAY_SECONDS, TimeUnit.SECONDS);
+        return new HostAssert(host, actual);
     }
 
     /**
diff --git a/driver-core/src/test/java/com/datastax/driver/core/HostAssert.java b/driver-core/src/test/java/com/datastax/driver/core/HostAssert.java
@@ -120,26 +120,4 @@ public void onDown(Host host) {
         fail(actual + " did not go down within " + duration + " " + unit);
         return this;
     }
-
-    public static class StateListenerBase implements StateListener {
-        @Override
-        public void onAdd(Host host) {
-        }
-
-        @Override
-        public void onUp(Host host) {
-        }
-
-        @Override
-        public void onSuspected(Host host) {
-        }
-
-        @Override
-        public void onDown(Host host) {
-        }
-
-        @Override
-        public void onRemove(Host host) {
-        }
-    }
 }
diff --git a/driver-core/src/test/java/com/datastax/driver/core/RefreshConnectedHostTest.java b/driver-core/src/test/java/com/datastax/driver/core/RefreshConnectedHostTest.java
@@ -78,6 +78,8 @@ public void should_refresh_single_connected_host() {
             assertThat(cluster).host(2)
                                .hasState(State.UP)
                                .isAtDistance(HostDistance.LOCAL);
+
+            // Ensure that the host is added to the Cluster.
             assertThat(cluster).host(3)
                                .comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS+1, SECONDS)
                                .isAtDistance(HostDistance.IGNORED);
diff --git a/driver-core/src/test/java/com/datastax/driver/core/StateListenerBase.java b/driver-core/src/test/java/com/datastax/driver/core/StateListenerBase.java
@@ -0,0 +1,40 @@
+/*
+ *      Copyright (C) 2012-2015 DataStax Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.datastax.driver.core;
+
+public class StateListenerBase implements Host.StateListener {
+    @Override
+    public void onAdd(Host host) {
+    }
+
+    @Override
+    public void onUp(Host host) {
+    }
+
+    @Override
+    public void onSuspected(Host host) {
+
+    }
+
+    @Override
+    public void onDown(Host host) {
+    }
+
+    @Override
+    public void onRemove(Host host) {
+    }
+
+}
diff --git a/driver-core/src/test/java/com/datastax/driver/core/TestUtils.java b/driver-core/src/test/java/com/datastax/driver/core/TestUtils.java
@@ -23,6 +23,7 @@
 import java.net.ServerSocket;
 import java.nio.ByteBuffer;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.util.concurrent.Futures;
@@ -384,6 +385,38 @@ public static void versionCheck(double majorCheck, int minorCheck, String skipSt
         }
     }
 
+    public static Host findOrWaitForHost(Cluster cluster, int node, long duration, TimeUnit unit) {
+        return findOrWaitForHost(cluster, CCMBridge.ipOfNode(node), duration, unit);
+    }
+
+    public static Host findOrWaitForHost(final Cluster cluster, final String address, long duration, TimeUnit unit) {
+        Host host = findHost(cluster, address);
+        if(host == null) {
+            final CountDownLatch addSignal = new CountDownLatch(1);
+            Host.StateListener addListener = new StateListenerBase() {
+                @Override
+                public void onAdd(Host host) {
+                    if(host.getAddress().getHostAddress().equals(address)) {
+                        // for a new node, because of this we also listen for add events.
+                        addSignal.countDown();
+                    }
+                }
+            };
+            cluster.register(addListener);
+            try {
+                // Wait until an add event occurs or we timeout.
+                if (addSignal.await(duration, unit)) {
+                    host = findHost(cluster, address);
+                }
+            } catch (InterruptedException e) {
+                return null;
+            } finally {
+                cluster.unregister(addListener);
+            }
+        }
+        return host;
+    }
+
     public static Host findHost(Cluster cluster, int hostNumber) {
         return findHost(cluster, CCMBridge.ipOfNode(hostNumber));
     }
