Minor improvements to CCM tests

Author: adutra

driver-core/src/test/java/com/datastax/driver/core/AsyncQueryTest.java

@@ -24,7 +24,6 @@
 import com.datastax.driver.core.utils.CassandraVersion;
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
-import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.Uninterruptibles;
@@ -83,13 +82,7 @@ public void cancelled_query_should_release_the_connection() throws InterruptedEx
   public void should_init_cluster_and_session_if_needed() throws Exception {
     // For this test we need an uninitialized cluster, so we can't reuse the one provided by the
     // parent class. Rebuild a new one with the same (unique) host.
-    Host host = cluster().getMetadata().allHosts().iterator().next();
-
-    Cluster cluster2 =
-        register(
-            Cluster.builder()
-                .addContactPointsWithPorts(Lists.newArrayList(host.getEndPoint().resolve()))
-                .build());
+    Cluster cluster2 = register(createClusterBuilder().build());
     try {
       Session session2 = cluster2.newSession();
 

driver-core/src/test/java/com/datastax/driver/core/AuthenticationTest.java

@@ -53,12 +53,7 @@ public void sleepIf12() {
   @Test(groups = "short")
   public void should_connect_with_credentials() {
     PlainTextAuthProvider authProvider = spy(new PlainTextAuthProvider("cassandra", "cassandra"));
-    Cluster cluster =
-        Cluster.builder()
-            .addContactPoints(getContactPoints())
-            .withPort(ccm().getBinaryPort())
-            .withAuthProvider(authProvider)
-            .build();
+    Cluster cluster = createClusterBuilder().withAuthProvider(authProvider).build();
     cluster.connect();
     verify(authProvider, atLeastOnce())
         .newAuthenticator(
@@ -78,13 +73,7 @@ public void should_connect_with_credentials() {
    */
   @Test(groups = "short")
   public void should_fail_to_connect_with_wrong_credentials() {
-    Cluster cluster =
-        register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints())
-                .withPort(ccm().getBinaryPort())
-                .withCredentials("bogus", "bogus")
-                .build());
+    Cluster cluster = register(createClusterBuilder().withCredentials("bogus", "bogus").build());
 
     try {
       cluster.connect();
@@ -106,12 +95,7 @@ public void should_fail_to_connect_with_wrong_credentials() {
 
   @Test(groups = "short", expectedExceptions = AuthenticationException.class)
   public void should_fail_to_connect_without_credentials() {
-    Cluster cluster =
-        register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints())
-                .withPort(ccm().getBinaryPort())
-                .build());
+    Cluster cluster = register(createClusterBuilder().build());
     cluster.connect();
   }
 
@@ -124,9 +108,7 @@ public void should_fail_to_connect_without_credentials() {
   @CCMConfig(dirtiesContext = true)
   public void should_connect_with_slow_server() {
     Cluster cluster =
-        Cluster.builder()
-            .addContactPoints(getContactPoints())
-            .withPort(ccm().getBinaryPort())
+        createClusterBuilder()
             .withAuthProvider(new SlowAuthProvider())
             .withPoolingOptions(new PoolingOptions().setHeartbeatIntervalSeconds(1))
             .build();
@@ -169,13 +151,7 @@ public void run() {
   @Test(groups = "short")
   public void should_not_create_pool_with_wrong_credentials() {
     PlainTextAuthProvider authProvider = new PlainTextAuthProvider("cassandra", "cassandra");
-    Cluster cluster =
-        register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints())
-                .withPort(ccm().getBinaryPort())
-                .withAuthProvider(authProvider)
-                .build());
+    Cluster cluster = register(createClusterBuilder().withAuthProvider(authProvider).build());
     cluster.init();
     authProvider.setPassword("wrong");
     Level previous = TestUtils.setLogLevel(Session.class, Level.WARN);

driver-core/src/test/java/com/datastax/driver/core/CCMAccess.java

@@ -17,7 +17,9 @@
 
 import java.io.Closeable;
 import java.io.File;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.List;
 import java.util.Map;
 
 public interface CCMAccess extends Closeable {
@@ -41,17 +43,13 @@ enum Workload {
    * is assumed that this value is only used for representing the compatible Cassandra version for
    * that DSE version.
    *
-   * <p>
-   *
    * @return The version of this CCM cluster.
    */
   VersionNumber getCassandraVersion();
 
   /**
    * Returns the DSE version of this CCM cluster if this is a DSE cluster, otherwise null.
    *
-   * <p>
-   *
    * @return The version of this CCM cluster.
    */
   VersionNumber getDSEVersion();
@@ -87,13 +85,29 @@ enum Workload {
   void setKeepLogs(boolean keepLogs);
 
   /**
-   * @return the node count for each datacenter, mapped in the corresponding cell of the returned
-   *     int array. This is the count that was passed at initialization (that is, the argument to
-   *     {@link CCMBridge.Builder#withNodes(int...)} or {@link CCMConfig#numberOfNodes()}). Note
-   *     that it will <b>NOT</b> be updated dynamically if nodes are added or removed at runtime.
+   * Returns the node count for each datacenter, mapped in the corresponding cell of the returned
+   * int array.
+   *
+   * <p>This is the count that was passed at initialization (that is, the argument to {@link
+   * CCMBridge.Builder#withNodes(int...)} or {@link CCMConfig#numberOfNodes()}). Note that it will
+   * <b>NOT</b> be updated dynamically if nodes are added or removed at runtime.
+   *
+   * @return the node count for each datacenter.
    */
   int[] getNodeCount();
 
+  /**
+   * Returns the contact points to use to contact the CCM cluster.
+   *
+   * <p>This reflects the initial number of nodes in the cluster, as configured at initialization
+   * (that is, the argument to {@link CCMBridge.Builder#withNodes(int...)} or {@link
+   * CCMConfig#numberOfNodes()}). Note that it will <b>NOT</b> be updated dynamically if nodes are
+   * added or removed at runtime.
+   *
+   * @return the contact points to use to contact the CCM cluster.
+   */
+  List<InetAddress> getContactPoints();
+
   /**
    * Returns the address of the {@code nth} host in the CCM cluster (counting from 1, i.e., {@code
    * addressOfNode(1)} returns the address of the first node.

driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java

@@ -35,11 +35,15 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -367,6 +371,24 @@ public int[] getNodeCount() {
     return Arrays.copyOf(nodes, nodes.length);
   }
 
+  @Override
+  public List<InetAddress> getContactPoints() {
+    List<InetAddress> contactPoints = new ArrayList<InetAddress>();
+    int n = 1;
+    for (int dc = 1; dc <= nodes.length; dc++) {
+      int nodesInDc = nodes[dc - 1];
+      for (int i = 0; i < nodesInDc; i++) {
+        try {
+          contactPoints.add(InetAddress.getByName(ipOfNode(n)));
+        } catch (UnknownHostException e) {
+          Throwables.propagate(e);
+        }
+        n++;
+      }
+    }
+    return contactPoints;
+  }
+
   protected String ipOfNode(int n) {
     return ipPrefix + n;
   }

driver-core/src/test/java/com/datastax/driver/core/CCMCache.java

@@ -23,8 +23,10 @@
 import com.google.common.cache.RemovalNotification;
 import com.google.common.cache.Weigher;
 import java.io.File;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -107,6 +109,11 @@ public int[] getNodeCount() {
       return ccm.getNodeCount();
     }
 
+    @Override
+    public List<InetAddress> getContactPoints() {
+      return ccm.getContactPoints();
+    }
+
     @Override
     public InetSocketAddress addressOfNode(int n) {
       return ccm.addressOfNode(n);

driver-core/src/test/java/com/datastax/driver/core/CCMTestsSupport.java

@@ -23,6 +23,7 @@
 import static org.assertj.core.api.Assertions.fail;
 
 import com.datastax.driver.core.CCMAccess.Workload;
+import com.datastax.driver.core.Cluster.Builder;
 import com.datastax.driver.core.CreateCCM.TestMode;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
 import com.google.common.base.Throwables;
@@ -157,6 +158,11 @@ public int[] getNodeCount() {
       return delegate.getNodeCount();
     }
 
+    @Override
+    public List<InetAddress> getContactPoints() {
+      return delegate.getContactPoints();
+    }
+
     @Override
     public String checkForErrors() {
       return delegate.checkForErrors();
@@ -631,7 +637,7 @@ public void beforeTestClass(Object testInstance) throws Exception {
       } catch (Exception e) {
         LOGGER.error(e.getMessage(), e);
         errorOut();
-        fail(e.getMessage());
+        throw e;
       }
     }
   }
@@ -706,18 +712,15 @@ public void afterTestClass() throws Exception {
   /**
    * Returns the cluster builder to use for this test.
    *
-   * <p>The default implementation returns a vanilla builder.
-   *
-   * <p>It's not required to call {@link
-   * com.datastax.driver.core.Cluster.Builder#addContactPointsWithPorts}, it will be done
-   * automatically.
+   * <p>The default implementation returns a vanilla builder with contact points and port that match
+   * the running CCM cluster. Therefore it's not required to call {@link
+   * Cluster.Builder#addContactPointsWithPorts}, it will be done automatically.
    *
    * @return The cluster builder to use for the tests.
    */
   public Cluster.Builder createClusterBuilder() {
-    return Cluster.builder()
-        // use a different codec registry for each cluster instance
-        .withCodecRegistry(new CodecRegistry());
+    Cluster.Builder builder = Cluster.builder();
+    return configureClusterBuilder(builder);
   }
 
   /**
@@ -730,7 +733,18 @@ public Cluster.Builder createClusterBuilder() {
    * @return The cluster builder to use for the tests.
    */
   public Cluster.Builder createClusterBuilderNoDebouncing() {
-    return Cluster.builder().withQueryOptions(TestUtils.nonDebouncingQueryOptions());
+    return createClusterBuilder().withQueryOptions(TestUtils.nonDebouncingQueryOptions());
+  }
+
+  /**
+   * Configures the builder with contact points and port that match the running CCM cluster.
+   * Therefore it's not required to call {@link Cluster.Builder#addContactPointsWithPorts}, it will
+   * be done automatically.
+   *
+   * @return The cluster builder (for method chaining).
+   */
+  protected Builder configureClusterBuilder(Builder builder) {
+    return TestUtils.configureClusterBuilder(builder, ccm());
   }
 
   /**
@@ -963,6 +977,12 @@ protected void initTestCluster(Object testInstance) throws Exception {
       // add contact points only if the provided builder didn't do so
       if (builder.getContactPoints().isEmpty()) builder.addContactPoints(getContactPoints());
       builder.withPort(ccm.getBinaryPort());
+      if (ccm().getCassandraVersion().compareTo(VersionNumber.parse("3.10")) >= 0
+          && ccm().getCassandraVersion().compareTo(VersionNumber.parse("4.0-beta5")) < 0) {
+        // prevent usage of protocol v5 for 3.10 and 3.11 since these versions have the beta
+        // version of it
+        builder.withProtocolVersion(ProtocolVersion.V4);
+      }
       cluster = register(builder.build());
       cluster.init();
     }

driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java

@@ -174,9 +174,7 @@ private class CreateClusterAndCheckConnections
     CreateClusterAndCheckConnections(CountDownLatch startSignal) {
       this.startSignal = startSignal;
       this.cluster =
-          Cluster.builder()
-              .addContactPoints(getContactPoints())
-              .withPort(ccm().getBinaryPort())
+          createClusterBuilder()
               .withPoolingOptions(
                   new PoolingOptions().setCoreConnectionsPerHost(HostDistance.LOCAL, 1))
               .withNettyOptions(channelMonitor.nettyOptions())

driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java

@@ -19,7 +19,6 @@
 import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
 import static com.datastax.driver.core.ScassandraCluster.SELECT_PEERS;
 import static com.datastax.driver.core.ScassandraCluster.datacenter;
-import static com.datastax.driver.core.TestUtils.nonDebouncingQueryOptions;
 import static com.datastax.driver.core.TestUtils.nonQuietClusterCloseOptions;
 import static com.google.common.collect.Lists.newArrayList;
 import static org.scassandra.http.client.PrimingRequest.then;
@@ -79,9 +78,7 @@ public void should_prevent_simultaneous_reconnection_attempts() throws Interrupt
     // this host
     Cluster cluster =
         register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints().get(0))
-                .withPort(ccm().getBinaryPort())
+            createClusterBuilder()
                 .withReconnectionPolicy(reconnectionPolicy)
                 .withLoadBalancingPolicy(loadBalancingPolicy)
                 .build());
@@ -109,25 +106,15 @@ public void should_prevent_simultaneous_reconnection_attempts() throws Interrupt
   @CassandraVersion("2.1.0")
   public void should_parse_UDT_definitions_when_using_default_protocol_version() {
     // First driver instance: create UDT
-    Cluster cluster =
-        register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints().get(0))
-                .withPort(ccm().getBinaryPort())
-                .build());
+    Cluster cluster = register(createClusterBuilder().build());
     Session session = cluster.connect();
     session.execute(
         "create keyspace ks WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}");
     session.execute("create type ks.foo (i int)");
     cluster.close();
 
     // Second driver instance: read UDT definition
-    Cluster cluster2 =
-        register(
-            Cluster.builder()
-                .addContactPoints(getContactPoints().get(0))
-                .withPort(ccm().getBinaryPort())
-                .build());
+    Cluster cluster2 = register(createClusterBuilder().build());
     UserType fooType = cluster2.getMetadata().getKeyspace("ks").getUserType("foo");
 
     assertThat(fooType.getFieldNames()).containsExactly("i");
@@ -146,13 +133,7 @@ public void should_parse_UDT_definitions_when_using_default_protocol_version() {
   @CCMConfig(numberOfNodes = 3)
   public void should_reestablish_if_control_node_decommissioned() throws InterruptedException {
     InetSocketAddress firstHost = ccm().addressOfNode(1);
-    Cluster cluster =
-        register(
-            Cluster.builder()
-                .addContactPoints(firstHost.getAddress())
-                .withPort(ccm().getBinaryPort())
-                .withQueryOptions(nonDebouncingQueryOptions())
-                .build());
+    Cluster cluster = register(createClusterBuilderNoDebouncing().build());
     cluster.init();
 
     // Ensure the control connection host is that of the first node.

driver-core/src/test/java/com/datastax/driver/core/EventDebouncerIntegrationTest.java

@@ -47,12 +47,7 @@ public void should_wait_until_load_balancing_policy_is_fully_initialized()
       throws InterruptedException {
     TestLoadBalancingPolicy policy = new TestLoadBalancingPolicy();
     final Cluster cluster =
-        register(
-            createClusterBuilderNoDebouncing()
-                .addContactPoints(getContactPoints().get(0))
-                .withPort(ccm().getBinaryPort())
-                .withLoadBalancingPolicy(policy)
-                .build());
+        register(createClusterBuilderNoDebouncing().withLoadBalancingPolicy(policy).build());
     new Thread() {
       @Override
       public void run() {

driver-core/src/test/java/com/datastax/driver/core/GettableDataIntegrationTest.java

@@ -58,7 +58,7 @@ public void onTestContextInitialized() {
 
   @Override
   public Cluster.Builder createClusterBuilder() {
-    return Cluster.builder().withCodecRegistry(registry);
+    return super.createClusterBuilder().withCodecRegistry(registry);
   }
 
   @BeforeClass(groups = "short")