Merge in pid/ping status.

[awesomized/libmemcached] / tests / string.cc

diff --git a/tests/string.cc b/tests/string.cc
index 827d0f2ca15212dbd938adff635d09c52198aa6a..ea7ba59243653a3990fc915d27ea29328c7a9d16 100644 (file)
--- a/tests/string.cc
+++ b/tests/string.cc
@@ -35,9 +35,17 @@
  *
  */
 
-#include "libmemcached/common.h"
-#include "libmemcached/error.h"
-#include "tests/string.h"
+// We let libmemcached/common.h define config since we are looking at
+// library internals.
+
+#define BUILDING_LIBMEMCACHED
+
+#include <libmemcached/common.h>
+
+#include <libtest/test.hpp>
+
+#include <libmemcached/error.h>
+#include <tests/string.h>
 
 test_return_t string_static_null(memcached_st *memc)
 {
@@ -153,14 +161,12 @@ test_return_t string_alloc_append_toobig(memcached_st *memc)
 test_return_t string_alloc_append_multiple(memcached_st *memc)
 {
   memcached_string_st *error_string= memcached_string_create(memc, NULL, 1024);
-  memcached_string_append(error_string, memcached_string_with_size("Error occured while parsing: "));
+  memcached_string_append(error_string, memcached_literal_param("Error occured while parsing: "));
   memcached_string_append(error_string, memcached_string_make_from_cstr("jog the strlen() method"));
-  memcached_string_append(error_string, memcached_string_with_size(" ("));
+  memcached_string_append(error_string, memcached_literal_param(" ("));
 
   memcached_string_append(error_string, memcached_string_make_from_cstr(memcached_strerror(NULL, MEMCACHED_SUCCESS)));
-  memcached_string_append(error_string, memcached_string_with_size(")"));
-
-  memcached_set_error_string(memc, MEMCACHED_FAILURE, memcached_string_value(error_string), memcached_string_length(error_string));
+  memcached_string_append(error_string, memcached_literal_param(")"));
 
   memcached_string_free(error_string);