Added test for get_by_key, set_by_key C++ tests

diff --git a/ChangeLog b/ChangeLog
index e42a42f445a36c61beab60058fa166a3411d7c46..1d48faa43bfb50f4ebc62eee4a2e444d4fc60b39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.16
   * Work on the UDP protocol
+  * Added get_by_key, set_by_key tests for C++ API
   
 0.15 Tue Jan 29 14:55:44 PST 2008
   * More work on the C++ API.

diff --git a/include/memcached.hh b/include/memcached.hh
index 82fbd3ce15badafbd49a643d8e509d40e4abbe14..e482f4bf517bbbd500b6d48fdf48b2a582974371 100644 (file)
--- a/include/memcached.hh
+++ b/include/memcached.hh
@@ -33,12 +33,12 @@ public:
                          value_length, &flags, &rc);
   }
 
-  char *get_by_key(char *key, char *master_key, size_t *value_length)
+  char *get_by_key(char *master_key, char *key, size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
 
-    return memcached_get_by_key(&memc, key, strlen(key), master_key, strlen(master_key),
+    return memcached_get_by_key(&memc, master_key, strlen(master_key), key, strlen(key),
                                 value_length, &flags, &rc);
   }
 

diff --git a/tests/plus.cpp b/tests/plus.cpp
index cb0b0837893531a72e90a9478cacd822ab3020ab..10b2440a7c2f2ea02c5d7b86271500ff8e81cbe5 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -29,9 +29,31 @@ uint8_t basic_test(memcached_st *memc)
 
   return 0;
 }
+uint8_t 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 0;
+}
+
 
 test_st tests[] ={
   {"basic", 0, basic_test },
+  {"basic_master_key", 0, basic_master_key_test },
   {0, 0, 0}
 };