fix a logic error on memcached_server_remove which will cause double free problem

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 32dbcf0b17ec7117b86b41bb131f669a5d9bb023..ab9cdbe6e7d466be903917d7defdcb3e7eb57d22 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -11,10 +11,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
+#include "server.h"
 
 #include "test.h"
 
-uint8_t basic_test(memcached_st *memc)
+test_return basic_test(memcached_st *memc)
 {
   Memcached foo;
   char *value_set= "This is some data";
@@ -26,11 +27,67 @@ uint8_t basic_test(memcached_st *memc)
 
   assert((memcmp(value, value_set, value_length) == 0));
 
+  return TEST_SUCCESS;
+}
+
+uint8_t increment_test(memcached_st *memc)
+{
+  Memcached mcach;
+  memcached_return rc;
+  char *key= "inctest";
+  char *inc_value= "1";
+  char *ret_value;
+  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); 
+
+  rc= mcach.increment(key, 1, &int_ret_value);
+  assert(rc == MEMCACHED_SUCCESS);
+  assert(int_ret_value == 2);
+
+  rc= mcach.increment(key, 1, &int_ret_value);
+  assert(rc == MEMCACHED_SUCCESS);
+  assert(int_ret_value == 3);
+
+  rc= mcach.increment(key, 5, &int_ret_value);
+  assert(rc == MEMCACHED_SUCCESS);
+  assert(int_ret_value == 8);
+
   return 0;
 }
 
+test_return basic_master_key_test(memcached_st *memc)
+{
+  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;
+
+  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, value_set, value_length) == 0));
+
+  value= foo.get_by_key(master_key_b, key, &value_length);
+  assert((memcmp(value, value_set, value_length) == 0));
+
+  return TEST_SUCCESS;
+}
+
+
 test_st tests[] ={
   {"basic", 0, basic_test },
+  {"basic_master_key", 0, basic_master_key_test },
   {0, 0, 0}
 };
 
@@ -39,7 +96,36 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-collection_st *gets_collections(void)
+#define SERVERS_TO_CREATE 1
+
+void *world_create(void)
+{
+  unsigned int x;
+  memcached_server_st *servers;
+  server_startup_st *construct;
+
+  construct= (server_startup_st *)malloc(sizeof(server_startup_st));
+  memset(construct, 0, sizeof(server_startup_st));
+
+  construct->count= SERVERS_TO_CREATE;
+  server_startup(construct);
+
+  return construct;
+}
+
+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);
+
+  server_shutdown(construct);
+  free(construct);
+}
+
+void get_world(world_st *world)
 {
-  return collection;
+  world->collections= collection;
+  world->create= world_create;
+  world->destroy= world_destroy;
 }