More config tests

hborn · Jun 11, 2014 · d449827 · d449827
1 parent a00a026
commit d449827
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 9 deletions.
diff --git a/src/config.cpp b/src/config.cpp
@@ -7,7 +7,7 @@ namespace cass {
 
 CassError Config::set_option(CassOption option, const void* value, size_t size) {
 #define CHECK_SIZE_AND_COPY(dst, dst_size) do {  \
-    if(dst_size < size) {                        \
+    if(size < dst_size) {                        \
       return CASS_ERROR_LIB_INVALID_OPTION_SIZE; \
     }                                            \
     memcpy(dst, value, dst_size);                \

diff --git a/test/integration_tests/src/config.cpp b/test/integration_tests/src/config.cpp
@@ -18,14 +18,40 @@ BOOST_FIXTURE_TEST_SUITE(config, ConfigTests)
 BOOST_AUTO_TEST_CASE(test_options)
 {
   test_utils::CassClusterPtr cluster(cass_cluster_new());
-  cass_size_t data_length;
-
-  cass_size_t connect_timeout = 9999;
-  cass_cluster_setopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &connect_timeout, sizeof(connect_timeout));
-  cass_size_t connect_timeout_out = 0;
-  data_length = sizeof(connect_timeout_out);
-  cass_cluster_getopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &connect_timeout_out, &data_length);
-  BOOST_REQUIRE(connect_timeout == connect_timeout_out && data_length == sizeof(connect_timeout_out));
+
+  {
+    cass_size_t data_length;
+    cass_size_t connect_timeout = 9999;
+    cass_cluster_setopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &connect_timeout, sizeof(connect_timeout));
+    cass_size_t connect_timeout_out = 0;
+    data_length = sizeof(connect_timeout_out);
+    cass_cluster_getopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &connect_timeout_out, &data_length);
+    BOOST_REQUIRE(connect_timeout == connect_timeout_out && data_length == sizeof(connect_timeout_out));
+  }
+
+  {
+    cass_size_t data_length;
+    cass_int32_t port = 7000;
+    cass_cluster_setopt(cluster.get(), CASS_OPTION_PORT, &port, sizeof(port));
+    cass_int32_t port_out = 0;
+    data_length = sizeof(port_out);
+    cass_cluster_getopt(cluster.get(), CASS_OPTION_PORT, &port_out, &data_length);
+    BOOST_REQUIRE(port == port_out && data_length == sizeof(port_out));
+  }
+}
+
+
+BOOST_AUTO_TEST_CASE(test_invalid)
+{
+  test_utils::CassClusterPtr cluster(cass_cluster_new());
+
+  cass_size_t temp = 0;
+  BOOST_REQUIRE(cass_cluster_setopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &temp, sizeof(temp) - 1) == CASS_ERROR_LIB_INVALID_OPTION_SIZE);
+
+  cass_size_t temp_out = 0;
+  cass_size_t temp_out_size = sizeof(temp_out) - 1;
+  BOOST_REQUIRE(cass_cluster_getopt(cluster.get(), CASS_OPTION_CONNECT_TIMEOUT, &temp_out, &temp_out_size) == CASS_ERROR_LIB_INVALID_OPTION_SIZE);
+
 }
 
 BOOST_AUTO_TEST_CASE(test_contact_points)
@@ -66,6 +92,26 @@ BOOST_AUTO_TEST_CASE(test_contact_points)
   buffer_size = sizeof(buffer);
   cass_cluster_getopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, buffer, &buffer_size);
   BOOST_REQUIRE(strcmp(contact_points1, buffer) == 0);
+
+  // Clear
+  cass_cluster_setopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, "", 0);
+  buffer_size = sizeof(buffer);
+  cass_cluster_getopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, buffer, &buffer_size);
+  BOOST_REQUIRE(buffer_size == 0);
+
+  // Append
+  const char* contact_point1 = "127.0.0.1";
+  cass_cluster_setopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, contact_point1, strlen(contact_point1));
+
+  const char* contact_point2 = "127.0.0.2";
+  cass_cluster_setopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, contact_point2, strlen(contact_point2));
+
+  const char* contact_point3 = "127.0.0.3";
+  cass_cluster_setopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, contact_point3, strlen(contact_point3));
+
+  buffer_size = sizeof(buffer);
+  cass_cluster_getopt(cluster.get(), CASS_OPTION_CONTACT_POINTS, buffer, &buffer_size);
+  BOOST_REQUIRE(strcmp(contact_points1, buffer) == 0);
 }
 
 BOOST_AUTO_TEST_SUITE_END()