Merge Patrick

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 28d728703aa70dd76d6ddda6fe0e400ae02f9a56..7ede21564c93d00eb07c7ce2fec097a8a5ed258a 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,7 +1,7 @@
 /*
   C++ interface test
 */
-#include "libmemcached/memcached.hh"
+#include "libmemcached/memcached.hpp"
 
 #include <assert.h>
 #include <stdio.h>
@@ -17,8 +17,10 @@
 #include "test.h"
 
 #include <string>
+#include <iostream>
 
 using namespace std;
+using namespace memcache;
 
 extern "C" {
    test_return basic_test(memcached_st *memc);
@@ -36,23 +38,21 @@ extern "C" {
 static void populate_vector(vector<char> &vec, const string &str)
 {
   vec.reserve(str.length());
-  memcpy(&*vec.begin(), str.c_str(), str.length());
+  vec.assign(str.begin(), str.end());
 }
 
 static void copy_vec_to_string(vector<char> &vec, string &str)
 {
   str.clear();
-  char *tmp= static_cast<char *>(malloc(vec.size() * sizeof(char)));
-  if (!vec.empty())
+  if (! vec.empty())
   {
-    memcpy(tmp, &vec[0], vec.size());
-    str.assign(tmp);
+    str.assign(vec.begin(), vec.end());
   }
 }
 
 test_return basic_test(memcached_st *memc)
 {
-  Memcached foo(memc);
+  Memcache foo(memc);
   const string value_set("This is some data");
   std::vector<char> value;
   std::vector<char> test_value;
@@ -60,16 +60,29 @@ test_return basic_test(memcached_st *memc)
   populate_vector(value, value_set);
 
   foo.set("mine", value, 0, 0);
-  test_value= foo.get("mine", test_value);
+  foo.get("mine", test_value);
 
   assert((memcmp(&test_value[0], &value[0], test_value.size()) == 0));
 
-  return TEST_SUCCESS;
+  /* 
+   * Simple test of the exceptions here...this should throw an exception
+   * saying that the key is empty.
+   */
+  try
+  {
+    foo.set("", value, 0, 0);
+  }
+  catch (Error &err)
+  {
+    return TEST_SUCCESS;
+  }
+
+  return TEST_FAILURE;
 }
 
 test_return increment_test(memcached_st *memc)
 {
-  Memcached mcach(memc);
+  Memcache mcach(memc);
   bool rc;
   const string key("blah");
   const string inc_value("1");
@@ -86,15 +99,13 @@ test_return increment_test(memcached_st *memc)
   {
     return TEST_FAILURE;
   }
-  ret_value= mcach.get(key, ret_value);
+  mcach.get(key, ret_value);
   if (ret_value.empty())
   {
     return TEST_FAILURE;
   }
   copy_vec_to_string(ret_value, ret_string);
 
-  printf("string is: %s\n", ret_string.c_str());
-
   int_inc_value= uint64_t(atol(inc_value.c_str()));
   int_ret_value= uint64_t(atol(ret_string.c_str()));
   assert(int_ret_value == int_inc_value); 
@@ -116,7 +127,7 @@ test_return increment_test(memcached_st *memc)
 
 test_return basic_master_key_test(memcached_st *memc)
 {
-  Memcached foo(memc);
+  Memcache foo(memc);
   const string value_set("Data for server A");
   vector<char> value;
   vector<char> test_value;
@@ -127,13 +138,13 @@ test_return basic_master_key_test(memcached_st *memc)
   populate_vector(value, value_set);
 
   foo.setByKey(master_key_a, key, value, 0, 0);
-  test_value= foo.getByKey(master_key_a, key, test_value);
+  foo.getByKey(master_key_a, key, test_value);
 
   assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
 
   test_value.clear();
 
-  test_value= foo.getByKey(master_key_b, key, test_value);
+  foo.getByKey(master_key_b, key, test_value);
   assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
 
   return TEST_SUCCESS;
@@ -153,13 +164,13 @@ memcached_return callback_counter(memcached_st *,
 
 test_return mget_result_function(memcached_st *memc)
 {
-  Memcached mc(memc);
+  Memcache mc(memc);
   bool rc;
   string key1("fudge");
   string key2("son");
   string key3("food");
   vector<string> keys;
-  vector< vector<char> > values;
+  vector< vector<char> *> values;
   vector<char> val1;
   vector<char> val2;
   vector<char> val3;
@@ -171,9 +182,9 @@ test_return mget_result_function(memcached_st *memc)
   keys.push_back(key2);
   keys.push_back(key3);
   values.reserve(3);
-  values.push_back(val1);
-  values.push_back(val2);
-  values.push_back(val3);
+  values.push_back(&val1);
+  values.push_back(&val2);
+  values.push_back(&val3);
   unsigned int counter;
   memcached_execute_function callbacks[1];
 
@@ -196,11 +207,11 @@ test_return mget_result_function(memcached_st *memc)
 
 test_return mget_test(memcached_st *memc)
 {
-  Memcached mc(memc);
+  Memcache mc(memc);
   bool rc;
   memcached_return mc_rc;
   vector<string> keys;
-  vector< vector<char> > values;
+  vector< vector<char> *> values;
   keys.reserve(3);
   keys.push_back("fudge");
   keys.push_back("son");
@@ -212,10 +223,9 @@ test_return mget_test(memcached_st *memc)
   populate_vector(val2, "son");
   populate_vector(val3, "food");
   values.reserve(3);
-  values.push_back(val1);
-  values.push_back(val2);
-  values.push_back(val3);
-  uint32_t flags;
+  values.push_back(&val1);
+  values.push_back(&val2);
+  values.push_back(&val3);
 
   string return_key;
   vector<char> return_value;
@@ -227,8 +237,7 @@ test_return mget_test(memcached_st *memc)
   rc= mc.mget(keys);
   assert(rc == true);
 
-  while (mc.fetch(return_key, return_value, 
-                  &flags, &mc_rc))
+  while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
   {
     assert(return_value.size() != 0);
     return_value.clear();
@@ -241,10 +250,8 @@ test_return mget_test(memcached_st *memc)
   rc= mc.mget(keys);
   assert(rc == true);
 
-  while ((mc.fetch(return_key, return_value, 
-                   &flags, &mc_rc)))
+  while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
   {
-    assert(mc_rc == MEMCACHED_SUCCESS);
     assert(return_key.length() == return_value.size());
     assert(!memcmp(&return_value[0], return_key.c_str(), return_value.size()));
   }