CPP-837 Port set keyspace tests to Google test framework (#324)

Author: mpenick

cpp-driver/gtests/src/integration/objects/future.hpp

@@ -118,6 +118,13 @@ class Future : public Object<CassFuture, cass_future_free> {
    */
   const CassErrorResult* error_result() { return cass_future_get_error_result(get()); }
 
+  /**
+   * Get the prepared from the future
+   *
+   * @return A prepared statement
+   */
+  const CassPrepared* prepared() { return cass_future_get_prepared(get()); }
+
   /**
    * Wait for the future to resolve itself
    *

cpp-driver/gtests/src/integration/objects/prepared.hpp

@@ -20,6 +20,7 @@
 
 #include "objects/object_base.hpp"
 
+#include "objects/future.hpp"
 #include "objects/statement.hpp"
 
 namespace test { namespace driver {
@@ -36,20 +37,13 @@ class Prepared : public Object<const CassPrepared, cass_prepared_free> {
       : Object<const CassPrepared, cass_prepared_free>() {}
 
   /**
-   * Create the prepared object from the native driver object
+   * Create the prepared object from a future object
    *
-   * @param prepared Native driver object
+   * @param future Wrapped driver object
    */
-  Prepared(const CassPrepared* prepared)
-      : Object<const CassPrepared, cass_prepared_free>(prepared) {}
-
-  /**
-   * Create the prepared object from a shared reference
-   *
-   * @param prepared Shared reference
-   */
-  Prepared(Ptr prepared)
-      : Object<const CassPrepared, cass_prepared_free>(prepared) {}
+  Prepared(Future future)
+      : Object<const CassPrepared, cass_prepared_free>(future.prepared())
+      , future_(future) {}
 
   /**
    * Bind the prepared object and create a statement
@@ -93,6 +87,30 @@ class Prepared : public Object<const CassPrepared, cass_prepared_free> {
    * @return Value type at the specified column index
    */
   CassValueType value_type(const std::string& name) { return cass_data_type_type(data_type(name)); }
+
+  /**
+   * Get the error code from the future
+   *
+   * @return Error code of the future
+   */
+  CassError error_code() { return future_.error_code(); }
+
+  /**
+   * Get the human readable description of the error code
+   *
+   * @return Error description
+   */
+  const std::string error_description() { return future_.error_description(); }
+
+  /**
+   * Get the error message of the future if an error occurred
+   *
+   * @return Error message
+   */
+  const std::string error_message() { return future_.error_message(); }
+
+private:
+  Future future_;
 };
 
 }} // namespace test::driver

cpp-driver/gtests/src/integration/objects/result.hpp

@@ -299,6 +299,17 @@ class Row {
     return T(cass_row_get_column_by_name(row_, name.c_str()));
   }
 
+  /**
+   * Get the value as a specific type for the given column index
+   *
+   * @param index Index of the column to retrieve
+   * @return The value as a value type
+   */
+  template <typename T>
+  T column(size_t index) {
+    return T(cass_row_get_column(row_, index));
+  }
+
   /**
    * Get the total number of columns in a row
    *
@@ -397,7 +408,6 @@ inline Row Result::first_row() {
 }
 
 inline Rows Result::rows() { return Rows(cass_iterator_from_result(get()), *this); }
-
 }} // namespace test::driver
 
 #endif // __TEST_RESULT_HPP__

cpp-driver/gtests/src/integration/objects/session.hpp

@@ -225,7 +225,7 @@ class Session : public Object<CassSession, cass_session_free> {
   Prepared prepare(const std::string& query, bool assert_ok = true) {
     Future prepare_future = cass_session_prepare(get(), query.c_str());
     prepare_future.wait(assert_ok);
-    return Prepared(cass_future_get_prepared(prepare_future.get()));
+    return Prepared(prepare_future);
   }
 
   /**
@@ -240,7 +240,7 @@ class Session : public Object<CassSession, cass_session_free> {
   Prepared prepare_from_existing(Statement statement, bool assert_ok = true) {
     Future prepare_future = cass_session_prepare_from_existing(get(), statement.get());
     prepare_future.wait(assert_ok);
-    return Prepared(cass_future_get_prepared(prepare_future.get()));
+    return Prepared(prepare_future);
   }
 
   /**

cpp-driver/gtests/src/integration/objects/statement.hpp

@@ -143,9 +143,9 @@ class Statement : public Object<CassStatement, cass_statement_free> {
   }
 
   /**
-   * Sets the statement's keyspace for use with token-aware routing.
+   * Sets the statement's keyspace
    *
-   * @param keyspace Keyspace to aid in token aware routing for statement
+   * @param keyspace Keyspace to use when executing the statement
    */
   void set_keyspace(const std::string& keyspace) {
     ASSERT_EQ(CASS_OK, cass_statement_set_keyspace(get(), keyspace.c_str()));
@@ -342,6 +342,15 @@ class Batch : public Object<CassBatch, cass_batch_free> {
   void set_serial_consistency(CassConsistency serial_consistency) {
     ASSERT_EQ(CASS_OK, cass_batch_set_serial_consistency(get(), serial_consistency));
   }
+
+  /**
+   * Sets the batch's keyspace
+   *
+   * @param keyspace Keyspace to use when executing the batch
+   */
+  void set_keyspace(const std::string& keyspace) {
+    ASSERT_EQ(CASS_OK, cass_batch_set_keyspace(get(), keyspace.c_str()));
+  }
 };
 
 }} // namespace test::driver