test: Correcting test failures

* Updated log messages
* Ensured valid Cassandra version is supported for test

Author: Michael Fero

gtests/src/integration/tests/test_auth.cpp

@@ -21,15 +21,6 @@
  */
 class AuthenticationTests : public Integration {
 public:
-  AuthenticationTests()
-    : starting_protocol_version_(1) {
-    // Determine starting protocol version (based on server version used)
-    if (server_version_ >= "2.2.0") {
-      // Handle deprecated and removed protocol versions [CASSANDRA-10146]
-      starting_protocol_version_ = 3;
-    }
-  }
-
   void SetUp() {
     // Call the parent setup function (override startup and session connection)
     is_ccm_start_requested_ = false;
@@ -44,11 +35,6 @@ class AuthenticationTests : public Integration {
   }
 
 protected:
-  /**
-   * Starting protocol version to use for most tests
-   */
-  int starting_protocol_version_;
-
   /**
    * Establish a connection with the given protocol version and credentials
    *
@@ -94,7 +80,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, ProtocolVersions) {
   CHECK_FAILURE;
 
   // Iterate over all known/supported protocol versions
-  for (int i = starting_protocol_version_;
+  for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION;
        i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION; ++i) {
     // Establish a connection using the protocol version
     Session session = connect_using_credentials(i, "cassandra", "cassandra");
@@ -125,7 +111,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidEmptyCredentials) {
 
   // Iterate over all known/supported protocol versions
   logger_.add_critera("Key may not be empty");
-  for (int i = starting_protocol_version_;
+  for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION;
        i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION; ++i) {
     /*
      * This is a case that could be guarded in the API entry point, or error out
@@ -156,7 +142,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullUsernameCredentials
 
   // Iterate over all known/supported protocol versions
   logger_.add_critera("Key may not be empty");
-  for (int i = starting_protocol_version_;
+  for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION;
        i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION; ++i) {
     /*
      * This is a case that could be guarded in the API entry point, or error out
@@ -187,7 +173,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullPasswordCredentials
 
   // Iterate over all known/supported protocol versions
   logger_.add_critera("and/or password are incorrect");
-  for (int i = starting_protocol_version_;
+  for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION;
        i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION; ++i) {
     /*
      * This is a case that could be guarded in the API entry point, or error out
@@ -224,7 +210,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, BadCredentials) {
   }
 
   // Iterate over all known/supported protocol versions
-  for (int i = starting_protocol_version_;
+  for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION;
        i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION; ++i) {
     /*
      * This is a case that could be guarded in the API entry point, or error out

gtests/src/integration/tests/test_control_connection.cpp

@@ -266,8 +266,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests,
   // but invalid remote address. The specified remote is not routable
   // from the specified local.
   logger_.add_critera("Unable to establish a control connection to host " \
-                      "1.1.1.1 because of the following error: " \
-                      "Connect error 'operation not permitted'");
+                      "1.1.1.1 because of the following error:");
   Cluster cluster = Cluster::build().with_contact_points("1.1.1.1")
     .with_local_address("127.0.0.1");
   try {
@@ -355,6 +354,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests, TopologyChange) {
 
   // Bootstrap a second node and ensure all hosts are actively used
   unsigned int node_2 = ccm_->bootstrap_node(); // Triggers a `NEW_NODE` event
+  msleep(3000); //TODO: Remove static sleep and check driver logs for reduced wait
   std::set<unsigned short> expected_nodes;
   expected_nodes.insert(1);
   expected_nodes.insert(node_2);
@@ -614,6 +614,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests,
   // Restart the cluster and wait for the nodes to reconnect
   ccm_->start_cluster();
   ASSERT_TRUE(wait_for_logger(nodes.size()));
+  msleep(3000); //TODO: Remove static sleep and check driver logs for reduced wait
 
   // Ensure all nodes are actively used
   std::set<unsigned short> expected_nodes;
@@ -743,8 +744,10 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionSingleNodeDataCentersClusterTests,
     FAIL() << "Connection was established using invalid data center";
   } catch (Session::Exception& se) {
     ASSERT_EQ(CASS_ERROR_LIB_NO_HOSTS_AVAILABLE, se.error_code());
-    ASSERT_STREQ("No hosts available for connection using the current load " \
-                 "balancing policy(s)", se.error_message().c_str());
+    ASSERT_STREQ("No hosts available for the control connection using the " \
+                 "DC-aware load balancing policy. Check to see if the " \
+                 "configured local datacenter is valid",
+                 se.error_message().c_str());
   }
 }
 

gtests/src/integration/tests/test_null_string_params.cpp

@@ -60,6 +60,7 @@ class NullStringApiArgsTest : public Integration {
 class SchemaNullStringApiArgsTest : public NullStringApiArgsTest {
 public:
   void SetUp() {
+    CHECK_VERSION(2.2.0);
     NullStringApiArgsTest::SetUp();
     populateSchema();
     schema_meta_ = session_.schema();
@@ -227,6 +228,7 @@ CASSANDRA_INTEGRATION_TEST_F(NullStringApiArgsTest, PrepareNullQuery) {
  * @expected_result Null for each lookup, since no object has a null name.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, KeyspaceMetaFunctions) {
+  CHECK_VERSION(2.2.0);
   const CassTableMeta* table_meta =
     cass_keyspace_meta_table_by_name(keyspace_meta_.get(), NULL);
   EXPECT_EQ(NULL, table_meta);
@@ -271,6 +273,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, KeyspaceMetaFunctions)
  * @expected_result Null for each lookup, since no object has a null name.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, TableMetaFunctions) {
+  CHECK_VERSION(2.2.0);
   const CassColumnMeta* column_meta =
     cass_table_meta_column_by_name(table_meta_.get(), NULL);
   EXPECT_EQ(NULL, column_meta);
@@ -331,6 +334,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, MaterializedViewMetaFu
  * @expected_result Null for each lookup, since no object has a null name.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, FunctionAndAggregateMetaFunctions) {
+  CHECK_VERSION(2.2.0);
   // C* 3.x and later annotate collection columns as frozen.
   const CassFunctionMeta* function_meta = (schema_meta_.version().major_version >= 3) ?
     cass_keyspace_meta_function_by_name(keyspace_meta_.get(), "avg_final",
@@ -361,6 +365,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, FunctionAndAggregateMe
  * @expected_result Error out appropriately for invalid queries, succeed otherwise.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, StatementFunctions) {
+  CHECK_VERSION(2.2.0);
   Statement statement(NULL);
 
   statement = cass_statement_new(NULL, 0);
@@ -517,6 +522,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, StatementFunctions) {
  * @expected_result Null because no parameter in the statement has a null name.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, PreparedFunctions) {
+  CHECK_VERSION(2.2.0);
   Prepared prepared =
     session_.prepare(format_string("INSERT INTO %s (key, value) "
                                      "VALUES ('42', :v)", table_name_.c_str()));
@@ -537,6 +543,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, PreparedFunctions) {
  *   null).
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, DataTypeFunctions) {
+  CHECK_VERSION(2.2.0);
   CassDataType* udt = cass_data_type_new(CASS_VALUE_TYPE_UDT);
   EXPECT_EQ(CASS_OK, cass_data_type_set_type_name(udt, NULL));
   EXPECT_EQ(NULL, cass_data_type_sub_data_type_by_name(udt, NULL));
@@ -560,6 +567,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, DataTypeFunctions) {
  * @expected_result Success; null strings are added/encoded in collections fine.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, CollectionFunctions) {
+  CHECK_VERSION(2.2.0);
   CassCollection* collection = cass_collection_new(CASS_COLLECTION_TYPE_SET, 2);
   EXPECT_EQ(CASS_OK, cass_collection_append_string(collection, NULL));
   EXPECT_EQ(CASS_OK, cass_collection_append_custom(collection, NULL,
@@ -582,6 +590,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, CollectionFunctions) {
  *   However, succeed in storing a null value in a udt field.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, UserTypeFunctions) {
+  CHECK_VERSION(2.2.0);
   const CassDataType *udt_address =
     cass_keyspace_meta_user_type_by_name(keyspace_meta_.get(), "address");
   ASSERT_NE(static_cast<CassDataType *>(NULL), udt_address);
@@ -662,6 +671,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, UserTypeFunctions) {
  *   though it will certainly fail when processing on a node.
  */
 CASSANDRA_INTEGRATION_TEST_F(SchemaNullStringApiArgsTest, MiscellaneousFunctions) {
+  CHECK_VERSION(2.2.0);
   cass::ResultResponse response;
   cass::Row r(&response);
   CassRow* row = CassRow::to(&r);

gtests/src/integration/tests/test_schema_metadata.cpp

@@ -27,6 +27,7 @@ class SchemaMetadataTest : public Integration {
   }
 
   void SetUp() {
+    CHECK_VERSION(2.2.0);
     Integration::SetUp();
     populateSchema();
     schema_meta_ = session_.schema();
@@ -84,6 +85,7 @@ class SchemaMetadataTest : public Integration {
 };
 
 CASSANDRA_INTEGRATION_TEST_F(SchemaMetadataTest, Views) {
+  CHECK_VERSION(3.0.0);
   Keyspace keyspace_meta = schema_meta_.keyspace(keyspace_name_);
   Table table_meta = keyspace_meta.table(table_name_);
 
@@ -116,6 +118,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaMetadataTest, Views) {
 }
 
 CASSANDRA_INTEGRATION_TEST_F(SchemaMetadataTest, DropView) {
+  CHECK_VERSION(3.0.0);
   Table table_meta = schema_meta_.keyspace(keyspace_name_).table(table_name_);
 
   // Verify that the table contains the view
@@ -134,6 +137,7 @@ CASSANDRA_INTEGRATION_TEST_F(SchemaMetadataTest, DropView) {
 }
 
 CASSANDRA_INTEGRATION_TEST_F(SchemaMetadataTest, RegularMetadataNotMarkedVirtual) {
+  CHECK_VERSION(2.2.0);
   // Check non-virtual keyspace/table is correctly not set
   Keyspace keyspace_meta = schema_meta_.keyspace("system");
   ASSERT_TRUE(keyspace_meta);