X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=ec29b159f9ae5392abee9c02713ae4b88cc3ba23;hb=c97c8525686219ecae254d6e6a4b8ccab0777269;hp=cb0b0837893531a72e90a9478cacd822ab3020ab;hpb=540b884236fe1e2d5e6cd52c70881d74e0fcea63;p=awesomized%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index cb0b0837..ec29b159 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -15,10 +15,10 @@
 
 #include "test.h"
 
-uint8_t basic_test(memcached_st *memc)
+extern "C" test_return basic_test(memcached_st *memc)
 {
-  Memcached foo;
-  char *value_set= "This is some data";
+  Memcached foo(memc);
+  const char *value_set= "This is some data";
   char *value;
   size_t value_length;
 
@@ -27,11 +27,67 @@ uint8_t basic_test(memcached_st *memc)
 
   assert((memcmp(value, value_set, value_length) == 0));
 
+  return TEST_SUCCESS;
+}
+
+extern "C" uint8_t increment_test(memcached_st *memc)
+{
+  Memcached mcach(memc);
+  memcached_return rc;
+  const char *key= "inctest";
+  const 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;
 }
 
+extern "C" test_return basic_master_key_test(memcached_st *memc)
+{
+   Memcached foo(memc);
+  const char *value_set= "Data for server A";
+  const char *master_key_a= "server-a";
+  const char *master_key_b= "server-b";
+  const 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}
 };
 
@@ -42,10 +98,8 @@ collection_st collection[] ={
 
 #define SERVERS_TO_CREATE 1
 
-void *world_create(void)
+extern "C" void *world_create(void)
 {
-  unsigned int x;
-  memcached_server_st *servers;
   server_startup_st *construct;
 
   construct= (server_startup_st *)malloc(sizeof(server_startup_st));
@@ -57,7 +111,7 @@ void *world_create(void)
   return construct;
 }
 
-void world_destroy(void *p)
+extern "C" void world_destroy(void *p)
 {
   server_startup_st *construct= (server_startup_st *)p;
   memcached_server_st *servers= (memcached_server_st *)construct->servers;