Various test fixes for 3.2.0 (apache#791)

Motivation:

Many tests are failing when using recent versions of C* or DSE.

Modifications:

1) Bump the default C* version to 3.8
2) Redesign @CassandraVersion and @DseVersion to be able to fully accept
tick-tock releases and correctly compare them.
3) Reduce log verbosity for Scassandra tests
4) Prevent thrift from being enabled for C* >= 4.0
5) Fix decommission tests with C* >= 3.12

This commit contains contributions by Andrew Tolbert (@tolbertam).

Result:

All tests should pass.

Author: adutra

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

@@ -24,7 +24,7 @@
 import static com.datastax.driver.core.DataType.text;
 import static com.datastax.driver.core.TestUtils.serializeForDynamicCompositeType;
 
-@CassandraVersion(major = 2.2)
+@CassandraVersion("2.2.0")
 @CCMConfig(config = "enable_user_defined_functions:true")
 public class AggregateMetadataTest extends CCMTestsSupport {
 
@@ -183,7 +183,7 @@ public void should_parse_and_format_aggregate_with_udts() {
      * @since 3.0.1
      */
     @Test(groups = "short")
-    @CassandraVersion(major = 2.2)
+    @CassandraVersion("2.2.0")
     public void should_parse_and_format_aggregate_with_composite_type_literal_initcond() {
         VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
         if (ver.getMajor() == 3) {
@@ -204,7 +204,7 @@ public void should_parse_and_format_aggregate_with_composite_type_literal_initco
      * @since 3.0.1
      */
     @Test(groups = "short")
-    @CassandraVersion(major = 3.0, minor = 4)
+    @CassandraVersion("3.4")
     public void should_parse_and_format_aggregate_with_composite_type_hex_initcond() {
         VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
         if ((ver.getMinor() >= 1 && ver.getMinor() < 4)) {

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

@@ -166,7 +166,7 @@ public Thread apply(ResultSet input) {
     }
 
     @Test(groups = "short")
-    @CassandraVersion(major = 2.0, description = "Paging is not supported until 2.0")
+    @CassandraVersion(value = "2.0.0", description = "Paging is not supported until 2.0")
     public void should_fail_when_auto_paging_on_io_thread() throws Exception {
         for (int i = 0; i < 1000; i++) {
             Statement statement = new SimpleStatement("select v from asyncquerytest.foo where k = 1");

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

@@ -27,7 +27,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@CassandraVersion(major = 2.0, description = "uses paging")
+@CassandraVersion(value = "2.0.0", description = "uses paging")
 public class AsyncResultSetTest extends CCMTestsSupport {
 
     @Override

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

@@ -71,7 +71,7 @@ public void simpleBatchTest() {
     }
 
     @Test(groups = "short")
-    @CassandraVersion(major = 2.0, minor = 9, description = "This will only work with C* 2.0.9 (CASSANDRA-7337)")
+    @CassandraVersion(value = "2.0.9", description = "This will only work with C* 2.0.9 (CASSANDRA-7337)")
     public void casBatchTest() {
         PreparedStatement st = session().prepare("INSERT INTO test (k, v) VALUES (?, ?) IF NOT EXISTS");
 

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

@@ -281,6 +281,21 @@ public static String getCassandraVersion() {
         }
     }
 
+    /**
+     * @return {@link VersionNumber} representation of {@link CCMBridge#getCassandraVersion()}
+     */
+    public static VersionNumber getCassandraVersionNumber() {
+        return VersionNumber.parse(getCassandraVersion());
+    }
+
+    /**
+     * @param compareVersion The given version to compare with.
+     * @return Whether or not the configured cassandra version is greater than or equal to the given version.
+     */
+    public static boolean isCassandraVersionAtLeast(String compareVersion) {
+        return getCassandraVersionNumber().compareTo(VersionNumber.parse(compareVersion)) >= 0;
+    }
+
     /**
      * @return The configured DSE version if '-Ddse=true' specified, otherwise null.
      */
@@ -292,6 +307,22 @@ public static String getDSEVersion() {
         }
     }
 
+    /**
+     * @return {@link VersionNumber} representation of {@link CCMBridge#getDSEVersion()}
+     */
+    public static VersionNumber getDSEVersionNumber() {
+        return VersionNumber.parse(getDSEVersion());
+    }
+
+    /**
+     * @param compareVersion The given version to compare with.
+     * @return Whether or not the configured dse version is greater than or equal to the given version.
+     */
+    public static boolean isDSEVersionAtLeast(String compareVersion) {
+        VersionNumber dseVersion = getDSEVersionNumber();
+        return dseVersion != null && dseVersion.compareTo(VersionNumber.parse(compareVersion)) >= 0;
+    }
+
     /**
      * @return Whether or not DSE was configured via '-Ddse=true'.
      */
@@ -549,7 +580,12 @@ public void add(int dc, int n) {
     @Override
     public void decommission(int n) {
         logger.debug(String.format("Decommissioning: node %s (%s%s:%s) from %s", n, TestUtils.IP_PREFIX, n, binaryPort, this));
-        execute(CCM_COMMAND + " node%d decommission", n);
+        // Special case for C* 3.12+, DSE 5.1+, force decommission (see CASSANDRA-12510)
+        String cmd = CCM_COMMAND + " node%d decommission";
+        if ((!isDSE() && isCassandraVersionAtLeast("3.12")) || (isDSE() && isDSEVersionAtLeast("5.1"))) {
+            cmd += " --force";
+        }
+        execute(cmd, n);
     }
 
     @Override
@@ -908,7 +944,7 @@ public CCMBridge build() {
             int storagePort = Integer.parseInt(cassandraConfiguration.get("storage_port").toString());
             int thriftPort = Integer.parseInt(cassandraConfiguration.get("rpc_port").toString());
             int binaryPort = Integer.parseInt(cassandraConfiguration.get("native_transport_port").toString());
-            if (version.compareTo(VersionNumber.parse("4.0")) >= 0) {
+            if (!isThriftSupported(dse, version)) {
                 // remove thrift configuration
                 cassandraConfiguration.remove("start_rpc");
                 cassandraConfiguration.remove("rpc_port");
@@ -926,10 +962,7 @@ public void run() {
             ccm.updateConfig(cassandraConfiguration);
             if (dse) {
                 Map<String, Object> dseConfiguration = Maps.newLinkedHashMap(this.dseConfiguration);
-                /* TODO: Use version passed in if present, there is currently a conflation of C* and DSE versions
-                 * when it comes to this that don't want to disturb.  No tests are currently using withVersion with
-                 * dse, so its not an issue at the moment. */
-                if (VersionNumber.parse(CCMBridge.getDSEVersion()).getMajor() >= 5) {
+                if (dse && version.getMajor() >= 5) {
                     // randomize DSE specific ports if dse present and greater than 5.0
                     dseConfiguration.put("lease_netty_server_port", RANDOM_PORT);
                     dseConfiguration.put("internode_messaging_options.port", RANDOM_PORT);
@@ -946,6 +979,10 @@ public void run() {
             return ccm;
         }
 
+        private static boolean isThriftSupported(boolean dse, VersionNumber version) {
+            return dse || version.compareTo(VersionNumber.parse("4.0")) < 0;
+        }
+
         public int weight() {
             // the weight is simply function of the number of nodes
             int totalNodes = 0;

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

@@ -24,7 +24,7 @@
 /**
  * Test {@link ResultSet#wasApplied()} for conditional updates.
  */
-@CassandraVersion(major = 2.0, description = "Conditional Updates requires 2.0+.")
+@CassandraVersion(value = "2.0.0", description = "Conditional Updates requires 2.0+.")
 public class ConditionalUpdateTest extends CCMTestsSupport {
 
     @Override

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

@@ -94,7 +94,7 @@ public void should_prevent_simultaneous_reconnection_attempts() throws Interrupt
      * Therefore we use two different driver instances in this test.
      */
     @Test(groups = "short")
-    @CassandraVersion(major = 2.1)
+    @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()

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

@@ -33,7 +33,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-@CassandraVersion(major = 2.2)
+@CassandraVersion("2.2.0")
 @CCMConfig(jvmArgs = "-Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler")
 public class CustomPayloadTest extends CCMTestsSupport {
 
@@ -85,8 +85,6 @@ public void should_echo_custom_payload_when_building_statement() throws Exceptio
 
     /**
      * Ensures that an incoming payload is propagated from prepared to bound statements.
-     *
-     * @throws Exception
      */
     @Test(groups = "short")
     public void should_propagate_incoming_payload_to_bound_statement() throws Exception {
@@ -113,8 +111,6 @@ public void should_propagate_incoming_payload_to_bound_statement() throws Except
     /**
      * Ensures that an incoming payload is overridden by an explicitly set outgoing payload
      * when propagated to bound statements.
-     *
-     * @throws Exception
      */
     @Test(groups = "short")
     public void should_override_incoming_payload_when_outgoing_payload_explicitly_set_on_preparing_statement() throws Exception {
@@ -141,8 +137,6 @@ public void should_override_incoming_payload_when_outgoing_payload_explicitly_se
     /**
      * Ensures that payloads can still be set individually on bound statements
      * if the prepared statement does not have a default payload.
-     *
-     * @throws Exception
      */
     @Test(groups = "short")
     public void should_not_set_any_payload_on_bound_statement() throws Exception {
@@ -171,8 +165,6 @@ public void should_not_set_any_payload_on_bound_statement() throws Exception {
 
     /**
      * Ensures that a custom payload is propagated throughout pages.
-     *
-     * @throws Exception
      */
     @Test(groups = "short")
     public void should_echo_custom_payload_when_paginating() throws Exception {
@@ -253,8 +245,6 @@ public void should_throw_ufe_when_protocol_version_lesser_than_4() throws Except
 
     /**
      * Ensures that when debugging custom payloads, the driver will print appropriate log messages.
-     *
-     * @throws Exception
      */
     @Test(groups = "short")
     public void should_print_log_message_when_level_trace() throws Exception {

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

@@ -19,7 +19,6 @@
 import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -153,7 +152,7 @@ public void should_serialize_and_deserialize_collections_of_custom_types() {
      * @test_category metadata
      */
     @Test(groups = "short")
-    @CassandraVersion(major = 2.1)
+    @CassandraVersion("2.1.0")
     public void should_handle_udt_with_custom_type() {
         // Given: a UDT with custom types, and a table using it.
         session().execute("CREATE TYPE custom_udt (regular int, c1 'DynamicCompositeType(s => UTF8Type, i => Int32Type)', c2 'LongType')");

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

@@ -23,7 +23,7 @@
 import static com.datastax.driver.core.DataTypeCqlNameParser.parse;
 import static com.datastax.driver.core.Metadata.quote;
 
-@CassandraVersion(major = 3.0)
+@CassandraVersion("3.0")
 public class DataTypeCqlNameParserTest extends CCMTestsSupport {
 
     @Test(groups = "short")