X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=460166f544fd9685ab7e1787db772f445ef1cee8;hb=5a9c49c1e9f1950045eb845277c370324ac9ef16;hp=ab9cdbe6e7d466be903917d7defdcb3e7eb57d22;hpb=2b312deb8b7b3f662b492f94a13e673723387724;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index ab9cdbe6..460166f5 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,93 +1,214 @@
 /*
   C++ interface test
 */
-#include <assert.h>
-#include <memcached.hh>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <libmemcached/memcached.hpp>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <time.h>
-#include "server.h"
+#include <ctime>
+
+#include <libtest/server.h>
+
+#include <libtest/test.hpp>
 
-#include "test.h"
+#include <string>
+#include <iostream>
+
+using namespace std;
+using namespace memcache;
+
+extern "C" {
+   test_return_t basic_test(memcached_st *memc);
+   test_return_t increment_test(memcached_st *memc);
+   test_return_t basic_master_key_test(memcached_st *memc);
+   test_return_t mget_result_function(memcached_st *memc);
+   test_return_t basic_behavior(memcached_st *memc);
+   test_return_t mget_test(memcached_st *memc);
+   memcached_return_t callback_counter(const memcached_st *,
+                                       memcached_result_st *,
+                                       void *context);
+}
 
-test_return basic_test(memcached_st *memc)
+static void populate_vector(vector<char> &vec, const string &str)
 {
-  Memcached foo;
-  char *value_set= "This is some data";
-  char *value;
-  size_t value_length;
+  vec.reserve(str.length());
+  vec.assign(str.begin(), str.end());
+}
 
-  foo.set("mine", value_set, strlen(value_set));
-  value= foo.get("mine", &value_length);
+static void copy_vec_to_string(vector<char> &vec, string &str)
+{
+  str.clear();
+  if (not vec.empty())
+  {
+    str.assign(vec.begin(), vec.end());
+  }
+}
+
+test_return_t basic_test(memcached_st *memc)
+{
+  Memcache foo(memc);
+  const string value_set("This is some data");
+  std::vector<char> value;
+  std::vector<char> test_value;
 
-  assert((memcmp(value, value_set, value_length) == 0));
+  populate_vector(value, value_set);
+
+  test_true(foo.set("mine", value, 0, 0));
+  test_true(foo.get("mine", test_value));
+
+  test_memcmp(&test_value[0], &value[0], test_value.size());
+  test_false(foo.set("", value, 0, 0));
 
   return TEST_SUCCESS;
 }
 
-uint8_t increment_test(memcached_st *memc)
+test_return_t increment_test(memcached_st *original)
 {
-  Memcached mcach;
-  memcached_return rc;
-  char *key= "inctest";
-  char *inc_value= "1";
-  char *ret_value;
+  Memcache mcach(original);
+  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= atoi(inc_value);
-  int_ret_value= atoi(ret_value);
-  assert(int_ret_value == int_inc_value); 
+  populate_vector(inc_val, inc_value);
+
+  test_true(mcach.set(key, inc_val, 0, 0));
+
+  test_true(mcach.get(key, ret_value));
+  test_false(ret_value.empty());
+  copy_vec_to_string(ret_value, ret_string);
+
+  int_inc_value= uint64_t(atol(inc_value.c_str()));
+  int_ret_value= uint64_t(atol(ret_string.c_str()));
+  test_compare(int_inc_value, int_ret_value);
+
+  test_true(mcach.increment(key, 1, &int_ret_value));
+  test_compare(2, int_ret_value);
+
+  test_true(mcach.increment(key, 1, &int_ret_value));
+  test_compare(3, int_ret_value);
+
+  test_true(mcach.increment(key, 5, &int_ret_value));
+  test_compare(8, int_ret_value);
+
+  return TEST_SUCCESS;
+}
+
+test_return_t basic_master_key_test(memcached_st *original)
+{
+  Memcache foo(original);
+  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);
+
+  test_true(foo.setByKey(master_key_a, key, value, 0, 0));
+  test_true(foo.getByKey(master_key_a, key, test_value));
 
-  rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(int_ret_value == 2);
+  test_compare(value.size(), test_value.size());
+  test_memcmp(&value[0], &test_value[0], value.size());
 
-  rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(int_ret_value == 3);
+  test_value.clear();
 
-  rc= mcach.increment(key, 5, &int_ret_value);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(int_ret_value == 8);
+  test_false(foo.getByKey(master_key_b, key, test_value));
+  test_compare(0, test_value.size());
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
-test_return basic_master_key_test(memcached_st *memc)
+/* Count the results */
+memcached_return_t callback_counter(const memcached_st *,
+                                    memcached_result_st *,
+                                    void *context)
 {
-  Memcached foo;
-  char *value_set= "Data for server A";
-  char *master_key_a= "server-a";
-  char *master_key_b= "server-b";
-  char *key= "xyz";
-  char *value;
-  size_t value_length;
+  unsigned int *counter= static_cast<unsigned int *>(context);
 
-  foo.set_by_key(master_key_a, key, value_set, strlen(value_set));
-  value= foo.get_by_key(master_key_a, key, &value_length);
+  *counter= *counter +1;
 
-  assert((memcmp(value, value_set, value_length) == 0));
+  return MEMCACHED_SUCCESS;
+}
 
-  value= foo.get_by_key(master_key_b, key, &value_length);
-  assert((memcmp(value, value_set, value_length) == 0));
+test_return_t mget_test(memcached_st *original)
+{
+  Memcache memc(original);
+  memcached_return_t 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);
+
+  string return_key;
+  vector<char> return_value;
+
+  /* We need to empty the server before we continue the test */
+  test_true(memc.flush());
+
+  test_true(memc.mget(keys));
+
+  test_compare(MEMCACHED_NOTFOUND, 
+               memc.fetch(return_key, return_value));
+
+  test_true(memc.setAll(keys, values, 50, 9));
+
+  test_true(memc.mget(keys));
+  size_t count= 0;
+  while (memcached_success(mc_rc= memc.fetch(return_key, return_value)))
+  {
+    test_compare(return_key.length(), return_value.size());
+    test_memcmp(&return_value[0], return_key.c_str(), return_value.size());
+    count++;
+  }
+  test_compare(values.size(), count);
 
   return TEST_SUCCESS;
 }
 
+test_return_t basic_behavior(memcached_st *original)
+{
+  Memcache memc(original);
+  uint64_t value= 1;
+  test_true(memc.setBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY, value));
+  uint64_t behavior= memc.getBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY);
+  test_compare(behavior, value);
+
+  return TEST_SUCCESS;
+}
 
 test_st tests[] ={
-  {"basic", 0, basic_test },
-  {"basic_master_key", 0, basic_master_key_test },
+  { "basic", 0,
+    reinterpret_cast<test_callback_fn*>(basic_test) },
+  { "basic_master_key", 0,
+    reinterpret_cast<test_callback_fn*>(basic_master_key_test) },
+  { "increment_test", 0,
+    reinterpret_cast<test_callback_fn*>(increment_test) },
+  { "mget", 1,
+    reinterpret_cast<test_callback_fn*>(mget_test) },
+  { "basic_behavior", 0,
+    reinterpret_cast<test_callback_fn*>(basic_behavior) },
   {0, 0, 0}
 };
 
@@ -96,36 +217,25 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-#define SERVERS_TO_CREATE 1
-
-void *world_create(void)
-{
-  unsigned int x;
-  memcached_server_st *servers;
-  server_startup_st *construct;
+#define SERVERS_TO_CREATE 5
 
-  construct= (server_startup_st *)malloc(sizeof(server_startup_st));
-  memset(construct, 0, sizeof(server_startup_st));
+#include "libmemcached_world.h"
 
-  construct->count= SERVERS_TO_CREATE;
-  server_startup(construct);
+void get_world(Framework *world)
+{
+  world->collections= collection;
 
-  return construct;
-}
+  world->_create= reinterpret_cast<test_callback_create_fn*>(world_create);
+  world->_destroy= reinterpret_cast<test_callback_fn*>(world_destroy);
 
-void world_destroy(void *p)
-{
-  server_startup_st *construct= (server_startup_st *)p;
-  memcached_server_st *servers= (memcached_server_st *)construct->servers;
-  memcached_server_list_free(servers);
+  world->item._startup= reinterpret_cast<test_callback_fn*>(world_test_startup);
+  world->item._flush= reinterpret_cast<test_callback_fn*>(world_flush);
+  world->item.set_pre(reinterpret_cast<test_callback_fn*>(world_pre_run));
+  world->item.set_post(reinterpret_cast<test_callback_fn*>(world_post_run));
+  world->_on_error= reinterpret_cast<test_callback_error_fn*>(world_on_error);
 
-  server_shutdown(construct);
-  free(construct);
-}
+  world->collection_startup= reinterpret_cast<test_callback_fn*>(world_container_startup);
+  world->collection_shutdown= reinterpret_cast<test_callback_fn*>(world_container_shutdown);
 
-void get_world(world_st *world)
-{
-  world->collections= collection;
-  world->create= world_create;
-  world->destroy= world_destroy;
+  world->runner= &defualt_libmemcached_runner;
 }