Fix code review issues #1

Author: mpenick

cpp-driver/gtests/src/unit/mockssandra.cpp

@@ -1,3 +1,19 @@
+/*
+  Copyright (c) DataStax, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
 #include "mockssandra.hpp"
 
 #include <assert.h>
@@ -47,12 +63,12 @@ String Ssl::generate_cert(const String& key, const String& cn) {
   X509_set_version(x509, 2);
   ASN1_INTEGER_set(X509_get_serialNumber(x509), 0);
   X509_gmtime_adj(X509_get_notBefore(x509), 0);
-  X509_gmtime_adj(X509_get_notAfter(x509), (long)60*60*24*365);
+  X509_gmtime_adj(X509_get_notAfter(x509), static_cast<long>(60 * 60 * 24 * 365));
   X509_set_pubkey(x509, pkey);
 
   X509_NAME* name = X509_get_subject_name(x509);
-  X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (const unsigned char*)"US", -1, -1, 0);
-  X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (const unsigned char*)cn.c_str(), -1, -1, 0);
+  X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, reinterpret_cast<const unsigned char*>("US"), -1, -1, 0);
+  X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, reinterpret_cast<const unsigned char*>(cn.c_str()), -1, -1, 0);
   X509_set_issuer_name(x509, name);
   X509_sign(x509, pkey, EVP_md5());
 
@@ -75,9 +91,10 @@ String Ssl::generate_cert(const String& key, const String& cn) {
 namespace internal {
 
 static void print_ssl_error() {
-  unsigned long n = ERR_get_error();
-  char buf[1024];
-  fprintf(stderr, "%s\n", ERR_error_string(n, buf));
+  unsigned long err = ERR_get_error();
+  char buf[256];
+  ERR_error_string_n(err, buf, sizeof(buf));
+  fprintf(stderr, "%s\n", buf);
 }
 
 struct WriteReq {

cpp-driver/gtests/src/unit/mockssandra.hpp

@@ -1,3 +1,19 @@
+/*
+  Copyright (c) DataStax, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
 #ifndef MOCKSSANDRA_HPP
 #define MOCKSSANDRA_HPP
 

cpp-driver/gtests/src/unit/mockssandra_test.cpp

@@ -0,0 +1,82 @@
+/*
+  Copyright (c) DataStax, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+#include "mockssandra_test.hpp"
+
+#include "logger.hpp"
+#include "ssl.hpp"
+
+namespace mockssandra {
+
+SimpleClusterTest::SimpleClusterTest(size_t num_nodes,
+                                     const RequestHandler* handler)
+  : cluster_(handler != NULL ? handler
+                             : mockssandra::SimpleRequestHandlerBuilder().build(),
+             num_nodes)
+  , saved_log_level_(CASS_LOG_DISABLED) { }
+
+void SimpleClusterTest::SetUp() {
+  saved_log_level_ = cass::Logger::log_level();
+  set_log_level(CASS_LOG_DISABLED);
+}
+
+void SimpleClusterTest::TearDown() {
+  stop_all();
+  cass::Logger::set_log_level(saved_log_level_);
+}
+
+void SimpleClusterTest::set_log_level(CassLogLevel log_level) {
+  cass::Logger::set_log_level(log_level);
+}
+
+cass::ConnectionSettings SimpleClusterTest::use_ssl() {
+  cass::SslContext::Ptr ssl_context(cass::SslContextFactory::create());
+
+  String cert = cluster_.use_ssl();
+  EXPECT_FALSE(cert.empty()) << "Unable to enable SSL";
+  EXPECT_EQ(ssl_context->add_trusted_cert(cert.data(), cert.size()), CASS_OK);
+
+  cass::ConnectionSettings settings;
+  settings.socket_settings.ssl_context = ssl_context;
+  settings.socket_settings.hostname_resolution_enabled = true;
+
+  return settings;
+}
+
+void SimpleClusterTest::start(size_t node) {
+  if (cluster_.start(node) != 0) {
+    cluster_.stop_all();
+    ASSERT_TRUE(false) << "Unable to start node " << node;
+  }
+}
+
+void SimpleClusterTest::stop(size_t node) {
+  cluster_.stop(node);
+}
+
+void SimpleClusterTest::start_all() {
+  ASSERT_EQ(cluster_.start_all(), 0);
+}
+
+void SimpleClusterTest::stop_all() {
+  cluster_.stop_all();
+}
+
+void SimpleClusterTest::use_close_immediately() {
+  cluster_.use_close_immediately();
+}
+
+} // namespace mockssandra

cpp-driver/gtests/src/unit/mockssandra_test.hpp

@@ -0,0 +1,107 @@
+/*
+  Copyright (c) DataStax, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+#include "mockssandra.hpp"
+
+#include "cassandra.h"
+#include "connector.hpp"
+
+#include <gtest/gtest.h>
+
+#ifndef MOCKSSANDRA_TEST_HPP
+#define MOCKSSANDRA_TEST_HPP
+
+namespace mockssandra {
+
+/**
+ * A test that create a simple mockssandra cluster.
+ */
+class SimpleClusterTest : public testing::Test {
+public:
+  /**
+   * Construct a cluster with a specified number of nodes and request handler.
+   *
+   * @param num_nodes The number of node in the cluster.
+   * @param handler The request handler.
+   */
+  explicit SimpleClusterTest(size_t num_nodes = 1,
+                             const mockssandra::RequestHandler* handler = NULL);
+
+  /**
+   * Test setup method. This remembers the current state of log level.
+   */
+  virtual void SetUp();
+
+  /**
+   * Test tear down method. This restores the previous log level state and stops
+   * all cluster nodes.
+   */
+  virtual void TearDown();
+
+  /**
+   * Set the log level for the test. The log level will be restored
+   * to its previous state at the end of each test.
+   *
+   * @param log_level The log level.
+   */
+  void set_log_level(CassLogLevel log_level);
+
+  /**
+   * Setup the cluster to use SSL and return a connection settings object with
+   * a SSL context, a SSL certificate, and hostname resolution enabled.
+   *
+   * @return A connection settings object setup to use SSL.
+   */
+  cass::ConnectionSettings use_ssl();
+
+  /**
+   * Start a specific node.
+   *
+   * @param node The node to start.
+   */
+  void start(size_t node);
+
+  /**
+   * Stop a specific node.
+   *
+   * @param node The node to stop.
+   */
+  void stop(size_t node);
+
+  /**
+   * Start all nodes in the cluster.
+   */
+  void start_all();
+
+  /**
+   * Stop all nodes in the cluster.
+   */
+  void stop_all();
+
+  /**
+   * Setup the cluster so that connections to the cluster close immediately
+   * after connection.
+   */
+  void use_close_immediately();
+
+protected:
+  mockssandra::SimpleCluster cluster_;
+  CassLogLevel saved_log_level_;
+};
+
+} // namespace mockssandra
+
+#endif // MOCKSSANDRA_TEST_HPP