Merge in util update

[awesomized/libmemcached] / tests / namespace.cc

diff --git a/tests/namespace.cc b/tests/namespace.cc
index 21c14e404ccc7c8e3d842f8920be18ea2faaaa4b..57ecc60667d0f3e2273cad75b1f648184c7eddf2 100644 (file)
--- a/tests/namespace.cc
+++ b/tests/namespace.cc
@@ -35,8 +35,13 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
+
 #include <libmemcached/memcached.h>
+
 #include <tests/namespace.h>
 
 test_return_t memcached_increment_namespace(memcached_st *memc)
@@ -53,13 +58,13 @@ test_return_t memcached_increment_namespace(memcached_st *memc)
                memcached_increment(memc,
                                    test_literal_param("number"),
                                    1, &new_number));
-  test_compare(1, new_number);
+  test_compare(uint64_t(1), new_number);
 
   test_compare(MEMCACHED_SUCCESS, 
                memcached_increment(memc,
                                    test_literal_param("number"),
                                    1, &new_number));
-  test_compare(2, new_number);
+  test_compare(uint64_t(2), new_number);
 
   memcached_st *clone= memcached_clone(NULL, memc);
 
@@ -81,20 +86,21 @@ test_return_t memcached_increment_namespace(memcached_st *memc)
                              test_literal_param("number"),
                              0, 0, 0);
   test_true(value);
-  test_compare(2, strlen(value));
+  test_compare(2UL, strlen(value));
   test_strcmp("10", value);
+  free(value);
 
   test_compare(MEMCACHED_SUCCESS, 
                memcached_increment(clone,
                                    test_literal_param("number"),
                                    1, &new_number));
-  test_compare(11, new_number);
+  test_compare(uint64_t(11), new_number);
 
   test_compare(MEMCACHED_SUCCESS, 
                memcached_increment(memc,
                                    test_literal_param("number"),
                                    1, &new_number));
-  test_compare(3, new_number);
+  test_compare(uint64_t(3), new_number);
 
   memcached_free(clone);