Catch up with Gearman's libtest

[m6w6/libmemcached] / tests / memtouch.cc

diff --git a/tests/memtouch.cc b/tests/memtouch.cc
index 0b28cbc7bfa0b5ce773c7b506f019c5cfc392e44..c44e6a08dcca5ac67d06eb34ccc8032b6cd097e5 100644 (file)
--- a/tests/memtouch.cc
+++ b/tests/memtouch.cc
@@ -43,6 +43,7 @@
 
 #include <libtest/test.hpp>
 #include <libmemcached/memcached.h>
+#include <libmemcached/util.h>
 
 using namespace libtest;
 
@@ -52,19 +53,12 @@ using namespace libtest;
 
 static std::string executable;
 
-static test_return_t quiet_test(void *)
-{
-  const char *args[]= { "--quiet", 0 };
-
-  test_true(exec_cmdline(executable, args));
-  return TEST_SUCCESS;
-}
-
 static test_return_t help_test(void *)
 {
-  const char *args[]= { "--quiet", "--help", 0 };
+  const char *args[]= { "--help", 0 };
+
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
@@ -72,7 +66,6 @@ static test_return_t touch_test(void *)
 {
   char buffer[1024];
   snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  const char *args[]= { "--quiet", "--expire=30", buffer, "foo", 0 };
 
   memcached_st *memc= memcached(buffer, strlen(buffer));
   test_true(memc);
@@ -82,7 +75,9 @@ static test_return_t touch_test(void *)
 
   test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
 
-  test_true(exec_cmdline(executable, args));
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+  const char *args[]= { "--expire=30", buffer, "foo", 0 };
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
   test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
 
@@ -95,8 +90,6 @@ static test_return_t NOT_FOUND_test(void *)
 {
   char buffer[1024];
   snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  const char *args[]= { "--quiet", "--expire=30", buffer, "foo", 0 };
-
   memcached_st *memc= memcached(buffer, strlen(buffer));
   test_true(memc);
 
@@ -104,7 +97,9 @@ static test_return_t NOT_FOUND_test(void *)
 
   test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
 
-  test_true(exec_cmdline(executable, args));
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+  const char *args[]= { "--expire=30", buffer, "foo", 0 };
+  test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
 
   test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
 
@@ -113,8 +108,24 @@ static test_return_t NOT_FOUND_test(void *)
   return TEST_SUCCESS;
 }
 
+static test_return_t check_version(void*)
+{
+  char buffer[1024];
+  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  memcached_st *memc= memcached(buffer, strlen(buffer));
+  test_true(memc);
+  
+  test_return_t result= TEST_SUCCESS;
+  if (libmemcached_util_version_check(memc, 1, 4, 8) == false)
+  {
+    result= TEST_SKIPPED;
+  }
+  memcached_free(memc);
+
+  return result;
+}
+
 test_st memtouch_tests[] ={
-  {"--quiet", true, quiet_test },
   {"--help", true, help_test },
   {"touch(FOUND)", true, touch_test },
   {"touch(NOT_FOUND)", true, NOT_FOUND_test },
@@ -122,7 +133,7 @@ test_st memtouch_tests[] ={
 };
 
 collection_st collection[] ={
-  {"memtouch", 0, 0, memtouch_tests },
+  {"memtouch", check_version, 0, memtouch_tests },
   {0, 0, 0, 0}
 };
 
@@ -134,8 +145,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  const char *argv[1]= { "memtouch" };
-  if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
     error= TEST_FAILURE;
   }
@@ -147,7 +157,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 void get_world(Framework *world)
 {
   executable= "./clients/memtouch";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }