CPP-860 - Remove driver_utils in favor of testing (#335)

Author: mikefero

cpp-driver/cmake/modules/Gtest.cmake

@@ -246,8 +246,7 @@ macro(GtestUnitTests project_name extra_files extra_includes excluded_test_files
   # and source files required to shared that code.
   set(INTEGRATION_TESTS_SOURCE_DIR ${CASS_ROOT_DIR}/tests/src/integration)
   set(INTEGRATION_TESTS_CCM_SOURCE_DIR ${INTEGRATION_TESTS_SOURCE_DIR}/ccm)
-  set(INTEGRATION_TESTS_SOURCE_FILES ${INTEGRATION_TESTS_SOURCE_DIR}/test_utils.cpp
-                                     ${INTEGRATION_TESTS_SOURCE_DIR}/driver_utils.cpp)
+  set(INTEGRATION_TESTS_SOURCE_FILES ${INTEGRATION_TESTS_SOURCE_DIR}/test_utils.cpp)
   set(INTEGRATION_TESTS_CCM_SOURCE_FILES "${INTEGRATION_TESTS_CCM_SOURCE_DIR}/tsocket.cpp")
   file(GLOB UNIT_TESTS_INCLUDE_FILES ${UNIT_TESTS_SOURCE_DIR}/*.hpp )
   file(GLOB UNIT_TESTS_SOURCE_FILES ${UNIT_TESTS_SOURCE_DIR}/*.cpp)

cpp-driver/src/testing.cpp

@@ -41,6 +41,22 @@ String get_host_from_future(CassFuture* future) {
   return response_future->address().hostname_or_address();
 }
 
+StringVec get_attempted_hosts_from_future(CassFuture* future) {
+  if (future->type() != Future::FUTURE_TYPE_RESPONSE) {
+    return StringVec();
+  }
+  StringVec attempted_hosts;
+  ResponseFuture* response_future = static_cast<ResponseFuture*>(future->from());
+
+  AddressVec attempted_addresses = response_future->attempted_addresses();
+  for (AddressVec::iterator it = attempted_addresses.begin(); it != attempted_addresses.end();
+       ++it) {
+    attempted_hosts.push_back(it->to_string());
+  }
+  std::sort(attempted_hosts.begin(), attempted_hosts.end());
+  return attempted_hosts;
+}
+
 unsigned get_connect_timeout_from_cluster(CassCluster* cluster) {
   return cluster->config().connect_timeout_ms();
 }
@@ -94,4 +110,15 @@ const CassRetryPolicy* get_retry_policy(const CassStatement* statement) {
   return CassRetryPolicy::to(statement->from()->retry_policy().get());
 }
 
+String get_server_name(CassFuture* future) {
+  if (future->type() != Future::FUTURE_TYPE_RESPONSE) {
+    return "";
+  }
+  return static_cast<ResponseFuture*>(future->from())->address().server_name();
+}
+
+void set_record_attempted_hosts(CassStatement* statement, bool enable) {
+  static_cast<Statement*>(statement->from())->set_record_attempted_addresses(enable);
+}
+
 }}} // namespace datastax::internal::testing

cpp-driver/src/testing.hpp

@@ -19,6 +19,7 @@
 
 #include "cassandra.h"
 #include "string.hpp"
+#include "string_ref.hpp"
 #include "vector.hpp"
 
 #include <stdint.h>
@@ -27,16 +28,14 @@ namespace datastax { namespace internal { namespace testing {
 
 CASS_EXPORT String get_host_from_future(CassFuture* future);
 
+CASS_EXPORT StringVec get_attempted_hosts_from_future(CassFuture* future);
+
 CASS_EXPORT unsigned get_connect_timeout_from_cluster(CassCluster* cluster);
 
 CASS_EXPORT int get_port_from_cluster(CassCluster* cluster);
 
 CASS_EXPORT String get_contact_points_from_cluster(CassCluster* cluster);
 
-CASS_EXPORT int64_t create_murmur3_hash_from_string(const String& value);
-
-CASS_EXPORT uint64_t get_time_since_epoch_in_ms();
-
 CASS_EXPORT uint64_t get_host_latency_average(CassSession* session, String ip_address, int port);
 
 CASS_EXPORT CassConsistency get_consistency(const CassStatement* statement);
@@ -47,6 +46,10 @@ CASS_EXPORT uint64_t get_request_timeout_ms(const CassStatement* statement);
 
 CASS_EXPORT const CassRetryPolicy* get_retry_policy(const CassStatement* statement);
 
+CASS_EXPORT String get_server_name(CassFuture* future);
+
+CASS_EXPORT void set_record_attempted_hosts(CassStatement* statement, bool enable);
+
 }}} // namespace datastax::internal::testing
 
 #endif

cpp-driver/tests/src/integration/driver_utils.cpp

@@ -17,6 +17,10 @@
 #include "integration.hpp"
 #include "options.hpp"
 
+#include "driver_info.hpp"
+#include "get_time.hpp"
+#include "murmur3.hpp"
+
 #include <algorithm>
 #include <cstdarg>
 #include <iostream>
@@ -33,6 +37,9 @@
 // Initialize static variables
 bool Integration::skipped_message_displayed_ = false;
 
+using namespace datastax::internal;
+using namespace ::testing;
+
 Integration::Integration()
     : ccm_(NULL)
     , session_()
@@ -73,7 +80,7 @@ Integration::Integration()
   }
 
   // Get the name of the test and the case/suite it belongs to
-  const testing::TestInfo* test_information = testing::UnitTest::GetInstance()->current_test_info();
+  const TestInfo* test_information = UnitTest::GetInstance()->current_test_info();
   test_name_ = test_information->name();
 
   // Determine if this is a typed test (e.g. ends in a number)
@@ -496,3 +503,15 @@ bool Integration::wait_for_logger(size_t expected_count) {
   }
   return logger_.count() >= expected_count;
 }
+
+int64_t Integration::murmur3_hash(const std::string& value) {
+  return MurmurHash3_x64_128(value.data(), value.size(), 0);
+}
+
+uint64_t Integration::time_since_epoch_in_ms() { return get_time_since_epoch_ms(); }
+
+uint64_t Integration::time_since_epoch_us() { return get_time_since_epoch_us(); }
+
+std::string Integration::driver_name() { return datastax::internal::driver_name(); }
+
+std::string Integration::driver_version() { return datastax::internal::driver_version(); }