Merge

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index aad1abf1f3060aee78253ebf5b8885a9d498d172..e020cdd988e2bdddf71c6d6ba52cbc67319af265 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -40,7 +40,7 @@
 /*
   C++ interface test
 */
-#include <libmemcached/memcached.hpp>
+#include <libmemcached-1.0/memcached.hpp>
 #include <libtest/test.hpp>
 
 #include <cstdio>
@@ -205,17 +205,15 @@ static test_return_t mget_test(memcached_st *original)
 static test_return_t basic_behavior(memcached_st *original)
 {
   Memcache memc(original);
-  uint64_t value= 1;
-  test_true(memc.setBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY, value));
-  uint64_t behavior= memc.getBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY);
-  test_compare(behavior, value);
+  test_true(memc.setBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY, true));
+  test_compare(true, memc.getBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY));
 
   return TEST_SUCCESS;
 }
 
 static test_return_t error_test(memcached_st *)
 {
-  Memcache memc("--server=localhost:0");
+  Memcache memc("--server=localhost:178");
   std::vector<char> value;
 
   test_false(memc.set("key", value, time_t(0), uint32_t(0)));
@@ -227,7 +225,7 @@ static test_return_t error_test(memcached_st *)
 
 static test_return_t error_std_string_test(memcached_st *)
 {
-  Memcache memc("--server=localhost:0");
+  Memcache memc("--server=localhost:178");
   std::vector<char> value;
 
   test_false(memc.set("key", value, time_t(0), uint32_t(0)));
@@ -241,7 +239,7 @@ static test_return_t error_std_string_test(memcached_st *)
 
 static test_return_t error_memcached_return_t_test(memcached_st *)
 {
-  Memcache memc("--server=localhost:0");
+  Memcache memc("--server=localhost:178");
   std::vector<char> value;
 
   test_false(memc.set("key", value, time_t(0), uint32_t(0)));
@@ -253,27 +251,23 @@ static test_return_t error_memcached_return_t_test(memcached_st *)
   return TEST_SUCCESS;
 }
 
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-fpermissive"
-#endif
-
 test_st error_tests[] ={
-  { "error()", 0, error_test },
-  { "error(std::string&)", 0, error_std_string_test },
-  { "error(memcached_return_t&)", 0, error_memcached_return_t_test },
+  { "error()", false, reinterpret_cast<test_callback_fn*>(error_test) },
+  { "error(std::string&)", false, reinterpret_cast<test_callback_fn*>(error_std_string_test) },
+  { "error(memcached_return_t&)", false, reinterpret_cast<test_callback_fn*>(error_memcached_return_t_test) },
   {0, 0, 0}
 };
 
 test_st tests[] ={
-  { "basic", 0,
+  { "basic", false,
     reinterpret_cast<test_callback_fn*>(basic_test) },
-  { "basic_master_key", 0,
+  { "basic_master_key", false,
     reinterpret_cast<test_callback_fn*>(basic_master_key_test) },
-  { "increment_test", 0,
+  { "increment_test", false,
     reinterpret_cast<test_callback_fn*>(increment_test) },
-  { "mget", 1,
+  { "mget", true,
     reinterpret_cast<test_callback_fn*>(mget_test) },
-  { "basic_behavior", 0,
+  { "basic_behavior", false,
     reinterpret_cast<test_callback_fn*>(basic_behavior) },
   {0, 0, 0}
 };