Update from trunk to launchpad

[m6w6/libmemcached] / tests / string.cc

diff --git a/tests/string.cc b/tests/string.cc
index 35d6eb41f259936f309358e411e0712923e4fed9..6ffe6a3ff411a5206bb793830978f3ceac48868b 100644 (file)
--- a/tests/string.cc
+++ b/tests/string.cc
@@ -1,6 +1,6 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  Gearmand client and server library.
+ *  Libmemcached client and server library.
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
  *  All rights reserved.
@@ -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,12 +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_string_append(error_string, memcached_literal_param(")"));
 
   memcached_string_free(error_string);