X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=c4b671153269ea9724082dec199549172c3d4504;hb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;hp=7ede21564c93d00eb07c7ce2fec097a8a5ed258a;hpb=e6a6807ad79f55f49826d3c76498373197ad59a7;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 7ede2156..c4b67115 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,20 +1,20 @@
 /*
   C++ interface test
 */
-#include "libmemcached/memcached.hpp"
+#include <libmemcached/memcached.hpp>
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#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 "test.h"
+#include <libtest/server.h>
+
+#include <libtest/test.h>
 
 #include <string>
 #include <iostream>
@@ -23,16 +23,15 @@ using namespace std;
 using namespace memcache;
 
 extern "C" {
-   test_return basic_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);
+   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);
 }
 
 static void populate_vector(vector<char> &vec, const string &str)
@@ -44,13 +43,13 @@ static void populate_vector(vector<char> &vec, const string &str)
 static void copy_vec_to_string(vector<char> &vec, string &str)
 {
   str.clear();
-  if (! vec.empty())
+  if (not vec.empty())
   {
     str.assign(vec.begin(), vec.end());
   }
 }
 
-test_return basic_test(memcached_st *memc)
+test_return_t basic_test(memcached_st *memc)
 {
   Memcache foo(memc);
   const string value_set("This is some data");
@@ -59,31 +58,18 @@ test_return basic_test(memcached_st *memc)
 
   populate_vector(value, value_set);
 
-  foo.set("mine", value, 0, 0);
-  foo.get("mine", test_value);
+  test_true(foo.set("mine", value, 0, 0));
+  test_true(foo.get("mine", test_value));
 
-  assert((memcmp(&test_value[0], &value[0], test_value.size()) == 0));
+  test_memcmp(&test_value[0], &value[0], test_value.size());
+  test_false(foo.set("", value, 0, 0));
 
-  /* 
-   * 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;
+  return TEST_SUCCESS;
 }
 
-test_return increment_test(memcached_st *memc)
+test_return_t increment_test(memcached_st *original)
 {
-  Memcache mcach(memc);
-  bool rc;
+  Memcache mcach(original);
   const string key("blah");
   const string inc_value("1");
   std::vector<char> inc_val;
@@ -94,40 +80,31 @@ test_return increment_test(memcached_st *memc)
 
   populate_vector(inc_val, inc_value);
 
-  rc= mcach.set(key, inc_val, 0, 0);
-  if (rc == false)
-  {
-    return TEST_FAILURE;
-  }
-  mcach.get(key, ret_value);
-  if (ret_value.empty())
-  {
-    return TEST_FAILURE;
-  }
+  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()));
-  assert(int_ret_value == int_inc_value); 
+  test_compare(int_inc_value, int_ret_value);
 
-  rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == true);
-  assert(int_ret_value == 2);
+  test_true(mcach.increment(key, 1, &int_ret_value));
+  test_compare(2, int_ret_value);
 
-  rc= mcach.increment(key, 1, &int_ret_value);
-  assert(rc == true);
-  assert(int_ret_value == 3);
+  test_true(mcach.increment(key, 1, &int_ret_value));
+  test_compare(3, int_ret_value);
 
-  rc= mcach.increment(key, 5, &int_ret_value);
-  assert(rc == true);
-  assert(int_ret_value == 8);
+  test_true(mcach.increment(key, 5, &int_ret_value));
+  test_compare(8, int_ret_value);
 
   return TEST_SUCCESS;
 }
 
-test_return basic_master_key_test(memcached_st *memc)
+test_return_t basic_master_key_test(memcached_st *original)
 {
-  Memcache foo(memc);
+  Memcache foo(original);
   const string value_set("Data for server A");
   vector<char> value;
   vector<char> test_value;
@@ -140,20 +117,20 @@ test_return basic_master_key_test(memcached_st *memc)
   foo.setByKey(master_key_a, key, value, 0, 0);
   foo.getByKey(master_key_a, key, test_value);
 
-  assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
+  test_true((memcmp(&value[0], &test_value[0], value.size()) == 0));
 
   test_value.clear();
 
   foo.getByKey(master_key_b, key, test_value);
-  assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
+  test_true((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)
+memcached_return_t callback_counter(const memcached_st *,
+                                    memcached_result_st *,
+                                    void *context)
 {
   unsigned int *counter= static_cast<unsigned int *>(context);
 
@@ -162,54 +139,10 @@ memcached_return callback_counter(memcached_st *,
   return MEMCACHED_SUCCESS;
 }
 
-test_return mget_result_function(memcached_st *memc)
+test_return_t mget_test(memcached_st *original)
 {
-  Memcache 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)
-{
-  Memcache mc(memc);
-  bool rc;
-  memcached_return mc_rc;
+  Memcache memc(original);
+  memcached_return_t mc_rc;
   vector<string> keys;
   vector< vector<char> *> values;
   keys.reserve(3);
@@ -231,40 +164,52 @@ test_return mget_test(memcached_st *memc)
   vector<char> return_value;
 
   /* We need to empty the server before we continue the test */
-  rc= mc.flush(0);
-  assert(rc == true);
+  test_true(memc.flush(0));
 
-  rc= mc.mget(keys);
-  assert(rc == true);
+  test_true(memc.mget(keys));
 
-  while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
+  while ((mc_rc= memc.fetch(return_key, return_value)) != MEMCACHED_END)
   {
-    assert(return_value.size() != 0);
+    test_true(return_value.size());
     return_value.clear();
   }
-  assert(mc_rc == MEMCACHED_END);
+  test_compare(mc_rc, MEMCACHED_END);
 
-  rc= mc.setAll(keys, values, 50, 9);
-  assert(rc == true);
+  test_true(memc.setAll(keys, values, 50, 9));
 
-  rc= mc.mget(keys);
-  assert(rc == true);
+  test_true(memc.mget(keys));
 
-  while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
+  while ((mc_rc= memc.fetch(return_key, return_value)) != MEMCACHED_END)
   {
-    assert(return_key.length() == return_value.size());
-    assert(!memcmp(&return_value[0], return_key.c_str(), return_value.size()));
+    test_compare(return_key.length(), return_value.size());
+    test_memcmp(&return_value[0], return_key.c_str(), return_value.size());
   }
 
   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 },
-  { "increment_test", 0, increment_test },
-  { "mget", 1, mget_test },
-  { "mget_result_function", 1, mget_result_function },
+  { "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}
 };
 
@@ -273,35 +218,25 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-#define SERVERS_TO_CREATE 1
-
-extern "C" void *world_create(void)
-{
-  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(world_st *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= static_cast<server_startup_st *>(p);
-  memcached_server_st *servers=
-    static_cast<memcached_server_st *>(construct->servers);
-  memcached_server_list_free(servers);
+  world->test.startup= reinterpret_cast<test_callback_fn>(world_test_startup);
+  world->test.flush= reinterpret_cast<test_callback_fn>(world_flush);
+  world->test.pre_run= reinterpret_cast<test_callback_fn>(world_pre_run);
+  world->test.post_run= reinterpret_cast<test_callback_fn>(world_post_run);
+  world->test.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;
 }