X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemstat.cc;h=b2dea7e9b54e73ea1a5e574c2006cb2e541e78c7;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=ec7dd4f88cd6d30de2d2040236367e7ab431a30b;hpb=64e070cda2cc99513fdbaae770a473d5338c9378;p=awesomized%2Flibmemcached

diff --git a/tests/memstat.cc b/tests/memstat.cc
index ec7dd4f8..b2dea7e9 100644
--- a/tests/memstat.cc
+++ b/tests/memstat.cc
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -50,51 +50,53 @@ using namespace libtest;
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
 
-static std::string executable;
+static std::string executable("./clients/memstat");
 
-static test_return_t quiet_test(void *)
+static test_return_t help_test(void *)
 {
-  const char *args[]= { "--quiet", 0 };
+  const char *args[]= { "--help", 0 };
+
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
-
-static test_return_t help_test(void *)
+static test_return_t binary_TEST(void *)
 {
-  const char *args[]= { "--help", "--quiet", 0 };
-
-  test_true(exec_cmdline(executable, args));
+  char buffer[1024];
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { buffer, " --binary ", 0 };
 
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
   return TEST_SUCCESS;
 }
 
-static test_return_t ascii_test(void *)
+static test_return_t server_version_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { "--quiet", buffer, " -a ", 0 };
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { buffer, " --server-version", 0 };
 
-  test_true(exec_cmdline(executable, args));
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
   return TEST_SUCCESS;
 }
 
-static test_return_t binary_test(void *)
+static test_return_t binary_server_version_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { "--quiet", buffer, " -b ", 0 };
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { buffer, " --binary --server-version", 0 };
+
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
 test_st memstat_tests[] ={
-  {"--quiet", 0, quiet_test},
   {"--help", 0, help_test},
-  {"-a, ascii", 0, ascii_test},
-  {"-b, binary", 0, binary_test},
+  {"--binary", 0, binary_TEST},
+  {"--server-version", 0, server_version_TEST},
+  {"--binary --server-version", 0, binary_server_version_TEST},
   {0, 0, 0}
 };
 
@@ -105,26 +107,24 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
-  if (HAVE_MEMCACHED_BINARY == 0)
+  if (libtest::has_memcached() == false)
   {
     error= TEST_SKIPPED;
     return NULL;
   }
 
-  const char *argv[1]= { "memstat" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  executable= "./clients/memstat";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }