X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fdump.cc;h=1e19c4a9f0ad411066d0e60833aaf2d6a5330ed4;hb=6d8ae66c64dded43f17dc85b906dd334e1173bf7;hp=1421bd478476beff102b94576e62533b72977997;hpb=387c65c94bec4333da574771fc82a40deabbc3e2;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc
index 1421bd47..1e19c4a9 100644
--- a/tests/libmemcached-1.0/dump.cc
+++ b/tests/libmemcached-1.0/dump.cc
@@ -34,32 +34,57 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
+
+#include <cstdlib>
+#include <climits>
+
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
 #include "tests/libmemcached-1.0/dump.h"
 
 static memcached_return_t callback_dump_counter(const memcached_st *,
-                                                const char *key,
-                                                size_t length,
+                                                const char*, // key,
+                                                size_t, // length,
                                                 void *context)
 {
   size_t *counter= (size_t *)context;
 
+#if 0
   std::cerr.write(key, length);
   std::cerr << std::endl;
-
+#endif
 
   *counter= *counter +1;
 
   return MEMCACHED_SUCCESS;
 }
 
+static memcached_return_t item_counter(const memcached_instance_st * ,
+                                       const char *key, size_t key_length,
+                                       const char *value, size_t, // value_length,
+                                       void *context)
+{
+  if ((key_length == (sizeof("curr_items") -1)) and (strncmp("curr_items", key, (sizeof("curr_items") -1)) == 0))
+  {
+    uint64_t* counter= (uint64_t*)context;
+    unsigned long number_value= strtoul(value, (char **)NULL, 10);
+    if (number_value == ULONG_MAX)
+    {
+      return MEMCACHED_FAILURE;
+    }
+    *counter= *counter +number_value;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
+#if 0
 test_return_t memcached_dump_TEST(memcached_st *memc)
 {
   test_skip(false, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
@@ -68,10 +93,17 @@ test_return_t memcached_dump_TEST(memcached_st *memc)
   memcached_dump_fn callbacks[1];
   callbacks[0]= &callback_dump_counter;
 
+  uint64_t counter= 0;
+  test_compare_got(MEMCACHED_SUCCESS,
+                   memcached_stat_execute(memc, NULL, item_counter, &counter),
+                   memcached_last_error_message(memc));
+  test_zero(counter);
+
   test_compare_got(MEMCACHED_SUCCESS, memcached_dump(memc, callbacks, &count, 1), memcached_last_error_message(memc));
 
   return TEST_SUCCESS;
 }
+#endif
 
 #define memcached_dump_TEST2_COUNT 64
 test_return_t memcached_dump_TEST2(memcached_st *memc)
@@ -87,25 +119,26 @@ test_return_t memcached_dump_TEST2(memcached_st *memc)
 
     test_true(length > 0);
 
-    test_compare_hint(MEMCACHED_SUCCESS,
-                      memcached_set(memc, key, length,
-                                    NULL, 0, // Zero length values
-                                    time_t(0), uint32_t(0)),
-                      memcached_last_error_message(memc));
+    test_compare(MEMCACHED_SUCCESS,
+                 memcached_set(memc, key, length,
+                               NULL, 0, // Zero length values
+                               time_t(0), uint32_t(0)));
   }
   memcached_quit(memc);
 
+  uint64_t counter= 0;
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_stat_execute(memc, NULL, item_counter, &counter));
+  test_true(counter > 0);
+
   size_t count= 0;
   memcached_dump_fn callbacks[1];
   callbacks[0]= &callback_dump_counter;
 
-  test_compare_got(MEMCACHED_SUCCESS,
-                   memcached_dump(memc, callbacks, &count, 1),
-                   memcached_last_error_message(memc));
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_dump(memc, callbacks, &count, 1));
 
-#if 0
-  test_compare(size_t(memcached_dump_TEST2_COUNT), count);
-#endif
+  test_true(count > 0);
 
   return TEST_SUCCESS;
 }