Merge from trunk.

[m6w6/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 818c908a64dca0fb9e55865052fc2220483a27d7..460166f544fd9685ab7e1787db772f445ef1cee8 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -14,7 +14,7 @@
 
 #include <libtest/server.h>
 
-#include <libtest/test.h>
+#include <libtest/test.hpp>
 
 #include <string>
 #include <iostream>
@@ -114,15 +114,16 @@ test_return_t basic_master_key_test(memcached_st *original)
 
   populate_vector(value, value_set);
 
-  foo.setByKey(master_key_a, key, value, 0, 0);
-  foo.getByKey(master_key_a, key, test_value);
+  test_true(foo.setByKey(master_key_a, key, value, 0, 0));
+  test_true(foo.getByKey(master_key_a, key, test_value));
 
-  test_true((memcmp(&value[0], &test_value[0], value.size()) == 0));
+  test_compare(value.size(), test_value.size());
+  test_memcmp(&value[0], &test_value[0], value.size());
 
   test_value.clear();
 
-  foo.getByKey(master_key_b, key, test_value);
-  test_true((memcmp(&value[0], &test_value[0], value.size()) == 0));
+  test_false(foo.getByKey(master_key_b, key, test_value));
+  test_compare(0, test_value.size());
 
   return TEST_SUCCESS;
 }
@@ -134,7 +135,7 @@ memcached_return_t callback_counter(const memcached_st *,
 {
   unsigned int *counter= static_cast<unsigned int *>(context);
 
-  *counter= *counter + 1;
+  *counter= *counter +1;
 
   return MEMCACHED_SUCCESS;
 }
@@ -174,9 +175,8 @@ test_return_t mget_test(memcached_st *original)
   test_true(memc.setAll(keys, values, 50, 9));
 
   test_true(memc.mget(keys));
-
   size_t count= 0;
-  while ((mc_rc= memc.fetch(return_key, return_value)) == MEMCACHED_SUCCESS)
+  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());
@@ -200,15 +200,15 @@ test_return_t basic_behavior(memcached_st *original)
 
 test_st tests[] ={
   { "basic", 0,
-    reinterpret_cast<test_callback_fn>(basic_test) },
+    reinterpret_cast<test_callback_fn*>(basic_test) },
   { "basic_master_key", 0,
-    reinterpret_cast<test_callback_fn>(basic_master_key_test) },
+    reinterpret_cast<test_callback_fn*>(basic_master_key_test) },
   { "increment_test", 0,
-    reinterpret_cast<test_callback_fn>(increment_test) },
+    reinterpret_cast<test_callback_fn*>(increment_test) },
   { "mget", 1,
-    reinterpret_cast<test_callback_fn>(mget_test) },
+    reinterpret_cast<test_callback_fn*>(mget_test) },
   { "basic_behavior", 0,
-    reinterpret_cast<test_callback_fn>(basic_behavior) },
+    reinterpret_cast<test_callback_fn*>(basic_behavior) },
   {0, 0, 0}
 };
 
@@ -221,21 +221,21 @@ collection_st collection[] ={
 
 #include "libmemcached_world.h"
 
-void get_world(world_st *world)
+void get_world(Framework *world)
 {
   world->collections= collection;
 
-  world->create= reinterpret_cast<test_callback_create_fn>(world_create);
-  world->destroy= reinterpret_cast<test_callback_fn>(world_destroy);
+  world->_create= reinterpret_cast<test_callback_create_fn*>(world_create);
+  world->_destroy= reinterpret_cast<test_callback_fn*>(world_destroy);
 
-  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);
+  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);
 
-  world->collection.startup= reinterpret_cast<test_callback_fn>(world_container_startup);
-  world->collection.shutdown= reinterpret_cast<test_callback_fn>(world_container_shutdown);
+  world->collection_startup= reinterpret_cast<test_callback_fn*>(world_container_startup);
+  world->collection_shutdown= reinterpret_cast<test_callback_fn*>(world_container_shutdown);
 
   world->runner= &defualt_libmemcached_runner;
 }