X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=23b5cf17adde8255143e87dc4837d83d8734ffa1;hb=ad00dffc2333bf341028de8962bf17a05e40da18;hp=323d6c20de6beb19fe5cbda8f5b89e469cd858c3;hpb=dbd274af6fc88a8f7a0456eb419a753dd842c88f;p=awesomized%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 323d6c20..23b5cf17 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -21,43 +21,40 @@
 using namespace std;
 
 extern "C" {
-   test_return basic_test(memcached_st *memc);
-   uint8_t increment_test(memcached_st *memc);
-   test_return basic_master_key_test(memcached_st *memc);
    void *world_create(void);
    void world_destroy(void *p);
 }
 
-test_return basic_test(memcached_st *memc)
+static test_return basic_test(memcached_st *memc)
 {
   Memcached foo(memc);
-  const char *value_set= "This is some data";
+  const string value_set("This is some data");
   string value;
   size_t value_length;
 
-  foo.set("mine", value_set, strlen(value_set));
+  foo.set("mine", value_set, 0, 0);
   value= foo.get("mine", &value_length);
 
-  assert((memcmp(value.c_str(), value_set, value_length) == 0));
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
 
   return TEST_SUCCESS;
 }
 
-uint8_t increment_test(memcached_st *memc)
+static test_return increment_test(memcached_st *memc)
 {
   Memcached mcach(memc);
   bool rc;
   const string key("inctest");
-  const char *inc_value= "1";
+  const string inc_value("1");
   string ret_value;
   uint64_t int_inc_value;
   uint64_t int_ret_value;
   size_t value_length;
 
-  mcach.set(key, inc_value, strlen(inc_value));
+  mcach.set(key, inc_value, 0, 0);
   ret_value= mcach.get(key, &value_length);
   printf("\nretvalue %s\n",ret_value.c_str());
-  int_inc_value= uint64_t(atol(inc_value));
+  int_inc_value= uint64_t(atol(inc_value.c_str()));
   int_ret_value= uint64_t(atol(ret_value.c_str()));
   assert(int_ret_value == int_inc_value); 
 
@@ -73,34 +70,130 @@ uint8_t increment_test(memcached_st *memc)
   assert(rc == true);
   assert(int_ret_value == 8);
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
-test_return basic_master_key_test(memcached_st *memc)
+static test_return basic_master_key_test(memcached_st *memc)
 {
-   Memcached foo(memc);
-  const char *value_set= "Data for server A";
+  Memcached foo(memc);
+  const string value_set("Data for server A");
   const string master_key_a("server-a");
   const string master_key_b("server-b");
   const string key("xyz");
   string value;
   size_t value_length;
 
-  foo.set_by_key(master_key_a, key, value_set, strlen(value_set));
+  foo.set_by_key(master_key_a, key, value_set, 0, 0);
   value= foo.get_by_key(master_key_a, key, &value_length);
 
-  assert((memcmp(value.c_str(), value_set, value_length) == 0));
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
 
   value= foo.get_by_key(master_key_b, key, &value_length);
-  assert((memcmp(value.c_str(), value_set, value_length) == 0));
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
+
+  return TEST_SUCCESS;
+}
+
+/* Count the results */
+static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), 
+                                     memcached_result_st *result __attribute__((unused)), 
+                                     void *context)
+{
+  unsigned int *counter= static_cast<unsigned int *>(context);
+
+  *counter= *counter + 1;
+
+  return MEMCACHED_SUCCESS;
+}
+
+static 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;
+  keys.reserve(3);
+  keys.push_back(key1);
+  keys.push_back(key2);
+  keys.push_back(key3);
+  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.set_all(keys, keys, 50, 9);
+  assert(rc == true);
+
+  rc= mc.mget(keys);
+  assert(rc == true);
+
+  callbacks[0]= &callback_counter;
+  counter= 0;
+  rc= mc.fetch_execute(callbacks, static_cast<void *>(&counter), 1); 
+
+  assert(counter == 3);
 
   return TEST_SUCCESS;
 }
 
+static test_return mget_test(memcached_st *memc)
+{
+  Memcached mc(memc);
+  bool rc;
+  memcached_return mc_rc;
+  vector<string> keys;
+  keys.reserve(3);
+  keys.push_back("fudge");
+  keys.push_back("son");
+  keys.push_back("food");
+  uint32_t flags;
+
+  string return_key;
+  size_t return_key_length;
+  string return_value;
+  size_t return_value_length;
+
+  /* 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, &return_key_length, 
+                  &return_value_length, &flags, &mc_rc))
+  {
+    assert(return_value.length() != 0);
+  }
+  assert(return_value_length == 0);
+  assert(mc_rc == MEMCACHED_END);
+
+  rc= mc.set_all(keys, keys, 50, 9);
+  assert(rc == true);
+
+  rc= mc.mget(keys);
+  assert(rc == true);
+
+  while ((mc.fetch(return_key, return_value, &return_key_length, 
+                   &return_value_length, &flags, &mc_rc)))
+  {
+    assert(return_value.length() != 0);
+    assert(mc_rc == MEMCACHED_SUCCESS);
+    assert(return_key_length == return_value_length);
+    assert(!memcmp(return_value.c_str(), return_key.c_str(), return_value_length));
+  }
+
+  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}
 };