X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=28d728703aa70dd76d6ddda6fe0e400ae02f9a56;hb=acce29c292b435fef4fd486495dca7d653be2bf2;hp=d3674d6caf8ba53d5186094aaaa010e43eaf108d;hpb=ba35cd77a343901f61e4fc5279328b571e51604e;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index d3674d6c..28d72870 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -16,87 +16,248 @@
 
 #include "test.h"
 
+#include <string>
+
+using namespace std;
+
 extern "C" {
    test_return basic_test(memcached_st *memc);
-   uint8_t increment_test(memcached_st *memc);
+   test_return increment_test(memcached_st *memc);
    test_return basic_master_key_test(memcached_st *memc);
+   test_return mget_result_function(memcached_st *memc);
+   test_return mget_test(memcached_st *memc);
+   memcached_return callback_counter(memcached_st *,
+                                     memcached_result_st *, 
+                                     void *context);
    void *world_create(void);
    void world_destroy(void *p);
 }
 
+static void populate_vector(vector<char> &vec, const string &str)
+{
+  vec.reserve(str.length());
+  memcpy(&*vec.begin(), str.c_str(), str.length());
+}
+
+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())
+  {
+    memcpy(tmp, &vec[0], vec.size());
+    str.assign(tmp);
+  }
+}
+
 test_return basic_test(memcached_st *memc)
 {
   Memcached foo(memc);
-  const char *value_set= "This is some data";
-  char *value;
-  size_t value_length;
+  const string value_set("This is some data");
+  std::vector<char> value;
+  std::vector<char> test_value;
+
+  populate_vector(value, value_set);
 
-  foo.set("mine", value_set, strlen(value_set));
-  value= foo.get("mine", &value_length);
+  foo.set("mine", value, 0, 0);
+  test_value= foo.get("mine", test_value);
 
-  assert((memcmp(value, value_set, value_length) == 0));
+  assert((memcmp(&test_value[0], &value[0], test_value.size()) == 0));
 
   return TEST_SUCCESS;
 }
 
-uint8_t increment_test(memcached_st *memc)
+test_return increment_test(memcached_st *memc)
 {
   Memcached mcach(memc);
-  memcached_return rc;
-  const char *key= "inctest";
-  const char *inc_value= "1";
-  char *ret_value;
+  bool rc;
+  const string key("blah");
+  const string inc_value("1");
+  std::vector<char> inc_val;
+  vector<char> ret_value;
+  string ret_string;
   uint64_t int_inc_value;
   uint64_t int_ret_value;
-  size_t value_length;
 
-  mcach.set(key, inc_value, strlen(inc_value));
-  ret_value= mcach.get(key, &value_length);
-  printf("\nretvalue %s\n",ret_value);
-  int_inc_value= uint64_t(atol(inc_value));
-  int_ret_value= uint64_t(atol(ret_value));
+  populate_vector(inc_val, inc_value);
+
+  rc= mcach.set(key, inc_val, 0, 0);
+  if (rc == false)
+  {
+    return TEST_FAILURE;
+  }
+  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); 
 
   rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
+  assert(rc == true);
   assert(int_ret_value == 2);
 
   rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
+  assert(rc == true);
   assert(int_ret_value == 3);
 
   rc= mcach.increment(key, 5, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
+  assert(rc == true);
   assert(int_ret_value == 8);
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
 test_return basic_master_key_test(memcached_st *memc)
 {
-   Memcached foo(memc);
-  const char *value_set= "Data for server A";
-  const char *master_key_a= "server-a";
-  const char *master_key_b= "server-b";
-  const char *key= "xyz";
-  char *value;
-  size_t value_length;
+  Memcached foo(memc);
+  const string value_set("Data for server A");
+  vector<char> value;
+  vector<char> test_value;
+  const string master_key_a("server-a");
+  const string master_key_b("server-b");
+  const string key("xyz");
+
+  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.set_by_key(master_key_a, key, value_set, strlen(value_set));
-  value= foo.get_by_key(master_key_a, key, &value_length);
+  assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
 
-  assert((memcmp(value, value_set, value_length) == 0));
+  test_value.clear();
 
-  value= foo.get_by_key(master_key_b, key, &value_length);
-  assert((memcmp(value, value_set, value_length) == 0));
+  test_value= foo.getByKey(master_key_b, key, test_value);
+  assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
 
   return TEST_SUCCESS;
 }
 
+/* Count the results */
+memcached_return callback_counter(memcached_st *,
+                                  memcached_result_st *, 
+                                  void *context)
+{
+  unsigned int *counter= static_cast<unsigned int *>(context);
+
+  *counter= *counter + 1;
+
+  return MEMCACHED_SUCCESS;
+}
+
+test_return mget_result_function(memcached_st *memc)
+{
+  Memcached mc(memc);
+  bool rc;
+  string key1("fudge");
+  string key2("son");
+  string key3("food");
+  vector<string> keys;
+  vector< vector<char> > values;
+  vector<char> val1;
+  vector<char> val2;
+  vector<char> val3;
+  populate_vector(val1, key1);
+  populate_vector(val2, key2);
+  populate_vector(val3, key3);
+  keys.reserve(3);
+  keys.push_back(key1);
+  keys.push_back(key2);
+  keys.push_back(key3);
+  values.reserve(3);
+  values.push_back(val1);
+  values.push_back(val2);
+  values.push_back(val3);
+  unsigned int counter;
+  memcached_execute_function callbacks[1];
+
+  /* We need to empty the server before we continue the test */
+  rc= mc.flush(0);
+  rc= mc.setAll(keys, values, 50, 9);
+  assert(rc == true);
+
+  rc= mc.mget(keys);
+  assert(rc == true);
+
+  callbacks[0]= &callback_counter;
+  counter= 0;
+  rc= mc.fetchExecute(callbacks, static_cast<void *>(&counter), 1); 
+
+  assert(counter == 3);
+
+  return TEST_SUCCESS;
+}
+
+test_return mget_test(memcached_st *memc)
+{
+  Memcached mc(memc);
+  bool rc;
+  memcached_return mc_rc;
+  vector<string> keys;
+  vector< vector<char> > values;
+  keys.reserve(3);
+  keys.push_back("fudge");
+  keys.push_back("son");
+  keys.push_back("food");
+  vector<char> val1;
+  vector<char> val2;
+  vector<char> val3;
+  populate_vector(val1, "fudge");
+  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;
+
+  string return_key;
+  vector<char> return_value;
+
+  /* We need to empty the server before we continue the test */
+  rc= mc.flush(0);
+  assert(rc == true);
+
+  rc= mc.mget(keys);
+  assert(rc == true);
+
+  while (mc.fetch(return_key, return_value, 
+                  &flags, &mc_rc))
+  {
+    assert(return_value.size() != 0);
+    return_value.clear();
+  }
+  assert(mc_rc == MEMCACHED_END);
+
+  rc= mc.setAll(keys, values, 50, 9);
+  assert(rc == true);
+
+  rc= mc.mget(keys);
+  assert(rc == true);
+
+  while ((mc.fetch(return_key, return_value, 
+                   &flags, &mc_rc)))
+  {
+    assert(mc_rc == MEMCACHED_SUCCESS);
+    assert(return_key.length() == return_value.size());
+    assert(!memcmp(&return_value[0], return_key.c_str(), return_value.size()));
+  }
+
+  return TEST_SUCCESS;
+}
 
 test_st tests[] ={
-  {"basic", 0, basic_test },
-  {"basic_master_key", 0, basic_master_key_test },
+  { "basic", 0, basic_test },
+  { "basic_master_key", 0, basic_master_key_test },
+  { "increment_test", 0, increment_test },
+  { "mget", 1, mget_test },
+  { "mget_result_function", 1, mget_result_function },
   {0, 0, 0}
 };