Merge branch 'master' into unified_driver

Michael Penick · Michael Penick · commit 58ba05c08ffd · 2019-11-20T14:12:53.000-05:00
diff --git a/cpp-driver/tests/src/integration/dse_integration.cpp b/cpp-driver/tests/src/integration/dse_integration.cpp
@@ -41,9 +41,12 @@ void DseIntegration::connect() {
   connect(dse_cluster_);
 }
 
-Cluster DseIntegration::default_cluster() {
-  return dse::Cluster::build()
-      .with_contact_points(contact_points_)
-      .with_randomized_contact_points(is_randomized_contact_points_)
-      .with_schema_metadata(is_schema_metadata_);
+Cluster DseIntegration::default_cluster(bool is_with_default_contact_points) {
+  Cluster cluster = dse::Cluster::build()
+                        .with_randomized_contact_points(is_randomized_contact_points_)
+                        .with_schema_metadata(is_schema_metadata_);
+  if (is_with_default_contact_points) {
+    cluster.with_contact_points(contact_points_);
+  }
+  return cluster;
 }
diff --git a/cpp-driver/tests/src/integration/dse_integration.hpp b/cpp-driver/tests/src/integration/dse_integration.hpp
@@ -80,9 +80,11 @@ class DseIntegration : public Integration {
   /**
    * Get the default DSE cluster configuration
    *
+   * @param is_with_default_contact_points True if default contact points
+                                           should be added to the cluster
    * @return DSE Cluster object (default)
    */
-  virtual Cluster default_cluster();
+  virtual Cluster default_cluster(bool is_with_default_contact_points = true);
 
 protected:
   /**
diff --git a/cpp-driver/tests/src/integration/tests/test_dbaas.cpp b/cpp-driver/tests/src/integration/tests/test_dbaas.cpp
@@ -161,7 +161,7 @@ class DbaasTests : public Integration {
     return ccm_execute(args);
   }
 
-  bool start_node(int node) {
+  bool start_node(unsigned int node) {
     Process::Args args;
     args.push_back(node_name(node));
     args.push_back("start");
@@ -171,10 +171,13 @@ class DbaasTests : public Integration {
     return ccm_execute(args);
   }
 
-  bool stop_node(int node) {
+  bool stop_node(unsigned int node, bool is_kill = false) {
     Process::Args args;
     args.push_back(node_name(node));
     args.push_back("stop");
+    if (is_kill) {
+      args.push_back("--not-gently");
+    }
     return ccm_execute(args);
   }
 
@@ -411,7 +414,6 @@ CASSANDRA_INTEGRATION_TEST_F(DbaasTests, SchemaMetadata) {
     EXPECT_EQ("average", std::string(data, length));
     cass_aggregate_meta_full_name(aggregate_meta, &data, &length);
     EXPECT_EQ("average(int)", std::string(data, length));
-    size_t count = cass_aggregate_meta_argument_count(aggregate_meta);
     ASSERT_EQ(1u, cass_aggregate_meta_argument_count(aggregate_meta));
     datatype = cass_aggregate_meta_argument_type(aggregate_meta, 0);
     EXPECT_EQ(CASS_VALUE_TYPE_INT, cass_data_type_type(datatype));
diff --git a/cpp-driver/tests/src/integration/tests/test_prepared.cpp b/cpp-driver/tests/src/integration/tests/test_prepared.cpp
@@ -146,7 +146,7 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, PrepareFromExistingSimpleStatement)
   bound_statement.bind<Integer>(0, Integer(1));
 
   Result result = session_.execute(bound_statement);
-  ASSERT_EQ(result.row_count(), 1);
+  ASSERT_EQ(result.row_count(), 1u);
   EXPECT_EQ(result.first_row().column_by_name<Integer>("value").value(), 99);
 }
 
@@ -191,6 +191,6 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, PrepareFromExistingBoundStatement) {
   bound_statement2.bind<Integer>(0, Integer(1));
 
   Result result = session_.execute(bound_statement2);
-  ASSERT_EQ(result.row_count(), 1);
+  ASSERT_EQ(result.row_count(), 1u);
   EXPECT_EQ(result.first_row().column_by_name<Integer>("value").value(), 99);
 }
diff --git a/cpp-driver/tests/src/unit/mockssandra.hpp b/cpp-driver/tests/src/unit/mockssandra.hpp
@@ -143,7 +143,6 @@ class ClientConnection {
   SSL* ssl_;
   BIO* incoming_bio_;
   BIO* outgoing_bio_;
-  SslHandshakeState handshake_state_;
 };
 
 class ClientConnectionFactory {
diff --git a/cpp-driver/tests/src/unit/tests/test_http_client.cpp b/cpp-driver/tests/src/unit/tests/test_http_client.cpp
@@ -126,7 +126,7 @@ TEST_F(HttpClientUnitTest, CancelTimeout) {
     const HttpClient::Ptr& client(*it);
     if (!client->is_canceled()) {
       EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_TIMEOUT);
-      EXPECT_EQ(client->status_code(), 404);
+      EXPECT_EQ(client->status_code(), 404u);
     }
   }
 }
@@ -166,7 +166,7 @@ TEST_F(HttpClientUnitTest, InvalidPath) {
   uv_run(loop(), UV_RUN_DEFAULT);
   EXPECT_TRUE(is_failed);
   EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_HTTP_STATUS);
-  EXPECT_EQ(client->status_code(), 404);
+  EXPECT_EQ(client->status_code(), 404u);
 
   stop_http_server();
 }
@@ -184,7 +184,7 @@ TEST_F(HttpClientUnitTest, Timeout) {
   uv_run(loop(), UV_RUN_DEFAULT);
   EXPECT_TRUE(is_failed);
   EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_TIMEOUT);
-  EXPECT_EQ(client->status_code(), 404);
+  EXPECT_EQ(client->status_code(), 404u);
 
   stop_http_server();
 }
diff --git a/cpp-driver/tests/src/unit/tests/test_logging.cpp b/cpp-driver/tests/src/unit/tests/test_logging.cpp
@@ -65,7 +65,7 @@ TEST_F(LoggingUnitTest, ControlConnectionSeverityHigh) {
   add_logging_critera("Unable to establish a control connection to host 127.0.0.1", CASS_LOG_ERROR);
   Future::Ptr connect_future = connect_async();
   EXPECT_TRUE(connect_future->wait_for(WAIT_FOR_TIME));
-  EXPECT_EQ(1u, logging_criteria_count());
+  EXPECT_EQ(1, logging_criteria_count());
 }
 
 /**
@@ -82,7 +82,7 @@ TEST_F(LoggingUnitTest, ControlConnectionSeverityReduced) {
   add_logging_critera("Lost control connection to host 127.0.0.1", CASS_LOG_WARN);
   Future::Ptr connect_future = connect_async();
   EXPECT_TRUE(connect_future->wait_for(WAIT_FOR_TIME));
-  EXPECT_EQ(0u, logging_criteria_count());
+  EXPECT_EQ(0, logging_criteria_count());
   cluster.stop_all();
   EXPECT_TRUE(wait_for_logger(1));
 }
diff --git a/cpp-driver/tests/src/unit/tests/test_pool.cpp b/cpp-driver/tests/src/unit/tests/test_pool.cpp
@@ -837,5 +837,6 @@ TEST_F(PoolUnitTest, NoAvailableStreams) {
   initializer->initialize(loop(), hosts());
   uv_run(loop(), UV_RUN_DEFAULT);
 
-  EXPECT_EQ(status.count(RequestStatus::SUCCESS), CASS_MAX_STREAMS) << status.results();
+  EXPECT_EQ(status.count(RequestStatus::SUCCESS), static_cast<size_t>(CASS_MAX_STREAMS))
+      << status.results();
 }
diff --git a/cpp-driver/tests/src/unit/tests/test_socket.cpp b/cpp-driver/tests/src/unit/tests/test_socket.cpp
@@ -214,7 +214,6 @@ class SocketUnitTest : public LoopTest {
 private:
   void verify_dns_check() {
     uv_getaddrinfo_t request;
-    Address::SocketStorage storage;
     ASSERT_EQ(0, uv_getaddrinfo(loop(), &request, on_request, DNS_HOSTNAME, "8888", NULL));
     uv_run(loop(), UV_RUN_DEFAULT);
   }
diff --git a/cpp-driver/tests/src/unit/tests/test_supported_response.cpp b/cpp-driver/tests/src/unit/tests/test_supported_response.cpp
@@ -68,7 +68,7 @@ TEST_F(SupportedResponseUnitTest, Simple) {
   ASSERT_EQ(cluster.start_all(), 0);
 
   StringMultimap supported_options;
-  ASSERT_EQ(0, supported_options.size());
+  ASSERT_EQ(0u, supported_options.size());
   Connector::Ptr connector(new Connector(Host::Ptr(new Host(Address("127.0.0.1", PORT))),
                                          PROTOCOL_VERSION,
                                          bind_callback(on_connect, &supported_options)));
@@ -121,7 +121,7 @@ TEST_F(SupportedResponseUnitTest, UppercaseKeysOnly) {
   ASSERT_EQ(cluster.start_all(), 0);
 
   StringMultimap supported_options;
-  ASSERT_EQ(0, supported_options.size());
+  ASSERT_EQ(0u, supported_options.size());
   Connector::Ptr connector(new Connector(Host::Ptr(new Host(Address("127.0.0.1", PORT))),
                                          PROTOCOL_VERSION,
                                          bind_callback(on_connect, &supported_options)));
diff --git a/cpp-driver/tests/src/unit/unit.hpp b/cpp-driver/tests/src/unit/unit.hpp
@@ -242,7 +242,6 @@ class Unit : public testing::Test {
       logging_criteria_;
   int logging_criteria_count_;
   uv_mutex_t mutex_;
-  uint64_t start_time_;
 };
 
 #endif // UNIT_TEST_HPP

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, PrepareFromExistingSimpleStatement)`
`146`	`146`	`bound_statement.bind<Integer>(0, Integer(1));`
`147`	`147`
`148`	`148`	`Result result = session_.execute(bound_statement);`
`149`		`- ASSERT_EQ(result.row_count(), 1);`
	`149`	`+ ASSERT_EQ(result.row_count(), 1u);`
`150`	`150`	`EXPECT_EQ(result.first_row().column_by_name<Integer>("value").value(), 99);`
`151`	`151`	`}`
`152`	`152`
`@@ -191,6 +191,6 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, PrepareFromExistingBoundStatement) {`
`191`	`191`	`bound_statement2.bind<Integer>(0, Integer(1));`
`192`	`192`
`193`	`193`	`Result result = session_.execute(bound_statement2);`
`194`		`- ASSERT_EQ(result.row_count(), 1);`
	`194`	`+ ASSERT_EQ(result.row_count(), 1u);`
`195`	`195`	`EXPECT_EQ(result.first_row().column_by_name<Integer>("value").value(), 99);`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ TEST_F(HttpClientUnitTest, CancelTimeout) {`
`126`	`126`	`const HttpClient::Ptr& client(*it);`
`127`	`127`	`if (!client->is_canceled()) {`
`128`	`128`	`EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_TIMEOUT);`
`129`		`- EXPECT_EQ(client->status_code(), 404);`
	`129`	`+ EXPECT_EQ(client->status_code(), 404u);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -166,7 +166,7 @@ TEST_F(HttpClientUnitTest, InvalidPath) {`
`166`	`166`	`uv_run(loop(), UV_RUN_DEFAULT);`
`167`	`167`	`EXPECT_TRUE(is_failed);`
`168`	`168`	`EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_HTTP_STATUS);`
`169`		`- EXPECT_EQ(client->status_code(), 404);`
	`169`	`+ EXPECT_EQ(client->status_code(), 404u);`
`170`	`170`
`171`	`171`	`stop_http_server();`
`172`	`172`	`}`
`@@ -184,7 +184,7 @@ TEST_F(HttpClientUnitTest, Timeout) {`
`184`	`184`	`uv_run(loop(), UV_RUN_DEFAULT);`
`185`	`185`	`EXPECT_TRUE(is_failed);`
`186`	`186`	`EXPECT_EQ(client->error_code(), HttpClient::HTTP_CLIENT_ERROR_TIMEOUT);`
`187`		`- EXPECT_EQ(client->status_code(), 404);`
	`187`	`+ EXPECT_EQ(client->status_code(), 404u);`
`188`	`188`
`189`	`189`	`stop_http_server();`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -837,5 +837,6 @@ TEST_F(PoolUnitTest, NoAvailableStreams) {`
`837`	`837`	`initializer->initialize(loop(), hosts());`
`838`	`838`	`uv_run(loop(), UV_RUN_DEFAULT);`
`839`	`839`
`840`		`- EXPECT_EQ(status.count(RequestStatus::SUCCESS), CASS_MAX_STREAMS) << status.results();`
	`840`	`+ EXPECT_EQ(status.count(RequestStatus::SUCCESS), static_cast<size_t>(CASS_MAX_STREAMS))`
	`841`	`+ << status.results();`
`841`	`842`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@ class SocketUnitTest : public LoopTest {`
`214`	`214`	`private:`
`215`	`215`	`void verify_dns_check() {`
`216`	`216`	`uv_getaddrinfo_t request;`
`217`		`- Address::SocketStorage storage;`
`218`	`217`	`ASSERT_EQ(0, uv_getaddrinfo(loop(), &request, on_request, DNS_HOSTNAME, "8888", NULL));`
`219`	`218`	`uv_run(loop(), UV_RUN_DEFAULT);`
`220`	`219`	`}`