X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=ec29b159f9ae5392abee9c02713ae4b88cc3ba23;hb=cfcf61110135a3256ab54d6ced50ce5e68580121;hp=2fb0e83da94a896157bfade6ec76a6b8a63891df;hpb=3b967603f05c738a63c8f72c4ac49a1f79eb0091;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 2fb0e83d..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,14 +27,15 @@ uint8_t basic_test(memcached_st *memc)
 
   assert((memcmp(value, value_set, value_length) == 0));
 
-  return 0;
+  return TEST_SUCCESS;
 }
-uint8_t increment_test(memcached_st *memc)
+
+extern "C" uint8_t increment_test(memcached_st *memc)
 {
-  Memcached mcach;
+  Memcached mcach(memc);
   memcached_return rc;
-  char *key= "inctest";
-  char *inc_value= "1";
+  const char *key= "inctest";
+  const char *inc_value= "1";
   char *ret_value;
   uint64_t int_inc_value;
   uint64_t int_ret_value;
@@ -62,13 +63,13 @@ uint8_t increment_test(memcached_st *memc)
   return 0;
 }
 
-uint8_t basic_master_key_test(memcached_st *memc)
+extern "C" 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";
+   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;
 
@@ -80,13 +81,12 @@ uint8_t basic_master_key_test(memcached_st *memc)
   value= foo.get_by_key(master_key_b, key, &value_length);
   assert((memcmp(value, value_set, value_length) == 0));
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
 
 test_st tests[] ={
   {"basic", 0, basic_test },
-  {"basic", 0, increment_test },
   {"basic_master_key", 0, basic_master_key_test },
   {0, 0, 0}
 };
@@ -98,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));
@@ -113,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;