Merge in trunk

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index d9d00ad1604713910cc329adeb6d047aefccd83f..5078f1f5583cea9c07ab32f5524eec8c3b5ed13c 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -86,6 +86,7 @@ static test_return_t basic_test(memcached_st *memc)
   test_true(foo.set("mine", value, 0, 0));
   test_true(foo.get("mine", test_value));
 
+  test_compare(test_value.size(), value.size());
   test_memcmp(&test_value[0], &value[0], test_value.size());
   test_false(foo.set("", value, 0, 0));
 
@@ -205,17 +206,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 +226,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 +240,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)));
@@ -283,7 +282,7 @@ collection_st collection[] ={
 #define SERVERS_TO_CREATE 5
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-#include "libmemcached_world.h"
+#include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
 {