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

diff --git a/tests/plus.cpp b/tests/plus.cpp
index cb0b0837..fdc7e916 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -1,8 +1,9 @@
 /*
   C++ interface test
 */
+#include "libmemcached/memcached.hh"
+
 #include <assert.h>
-#include <memcached.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,23 +16,92 @@
 
 #include "test.h"
 
-uint8_t basic_test(memcached_st *memc)
+#include <string>
+
+using namespace std;
+
+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);
+   void *world_create(void);
+   void world_destroy(void *p);
+}
+
+test_return basic_test(memcached_st *memc)
 {
-  Memcached foo;
-  char *value_set= "This is some data";
-  char *value;
+  Memcached foo(memc);
+  const string value_set("This is some data");
+  string value;
   size_t value_length;
 
-  foo.set("mine", value_set, strlen(value_set));
+  foo.set("mine", value_set);
   value= foo.get("mine", &value_length);
 
-  assert((memcmp(value, value_set, value_length) == 0));
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
+test_return increment_test(memcached_st *memc)
+{
+  Memcached mcach(memc);
+  bool rc;
+  const string key("inctest");
+  const string inc_value("1");
+  string ret_value;
+  uint64_t int_inc_value;
+  uint64_t int_ret_value;
+  size_t value_length;
+
+  mcach.set(key, inc_value);
+  ret_value= mcach.get(key, &value_length);
+  printf("\nretvalue %s\n",ret_value.c_str());
+  int_inc_value= uint64_t(atol(inc_value.c_str()));
+  int_ret_value= uint64_t(atol(ret_value.c_str()));
+  assert(int_ret_value == int_inc_value); 
+
+  rc= mcach.increment(key, 1, &int_ret_value);
+  assert(rc == true);
+  assert(int_ret_value == 2);
+
+  rc= mcach.increment(key, 1, &int_ret_value);
+  assert(rc == true);
+  assert(int_ret_value == 3);
+
+  rc= mcach.increment(key, 5, &int_ret_value);
+  assert(rc == true);
+  assert(int_ret_value == 8);
+
+  return TEST_SUCCESS;
+}
+
+test_return basic_master_key_test(memcached_st *memc)
+{
+  Memcached foo(memc);
+  const string value_set("Data for server A");
+  const string master_key_a("server-a");
+  const string master_key_b("server-b");
+  const string key("xyz");
+  string value;
+  size_t value_length;
+
+  foo.set_by_key(master_key_a, key, value_set);
+  value= foo.get_by_key(master_key_a, key, &value_length);
+
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
+
+  value= foo.get_by_key(master_key_b, key, &value_length);
+  assert((memcmp(value.c_str(), value_set.c_str(), value_length) == 0));
+
+  return TEST_SUCCESS;
+}
+
+
 test_st tests[] ={
-  {"basic", 0, basic_test },
+  { "basic", 0, basic_test },
+  { "basic_master_key", 0, basic_master_key_test },
+  { "increment_test", 0, increment_test },
   {0, 0, 0}
 };
 
@@ -42,10 +112,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));
@@ -59,8 +127,9 @@ void *world_create(void)
 
 void world_destroy(void *p)
 {
-  server_startup_st *construct= (server_startup_st *)p;
-  memcached_server_st *servers= (memcached_server_st *)construct->servers;
+  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);
 
   server_shutdown(construct);