X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=example%2Ft%2Fmemcached_light.cc;h=c5956b24c3840ab3e0b096de18178f018a195dc5;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=44f2770c8f0030969e01b083cb3f81cf4490a789;hpb=9dc6d5dd46302302b8683ed88908d7e6a86a3acf;p=awesomized%2Flibmemcached

diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc
index 44f2770c..c5956b24 100644
--- a/example/t/memcached_light.cc
+++ b/example/t/memcached_light.cc
@@ -42,7 +42,9 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
+
+#include "tests/libmemcached-1.0/memcached_get.h"
 
 using namespace libtest;
 
@@ -133,6 +135,37 @@ static test_return_t max_connections_file_TEST(void *)
   return TEST_SUCCESS;
 }
 
+typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
+
+static test_return_t _runner_default(libmemcached_test_callback_fn func, void *object)
+{
+  if (func)
+  {
+    test_true(object);
+    test_return_t ret;
+    try {
+      ret= func((memcached_st*)object);
+    }
+    catch (std::exception& e)
+    {
+      libtest::Error << e.what();
+      return TEST_FAILURE;
+    }
+
+    return ret;
+  }
+
+  return TEST_SUCCESS;
+}
+
+class MemcachedLightRunner : public libtest::Runner {
+public:
+  test_return_t run(test_callback_fn* func, void *object)
+  {
+    return _runner_default(libmemcached_test_callback_fn(func), object);
+  }
+};
+
 test_st cmdline_option_TESTS[] ={
   {"--help", true, help_TEST },
   {"--verbose", true, verbose_TEST },
@@ -146,13 +179,32 @@ test_st cmdline_option_TESTS[] ={
   {0, 0, 0}
 };
 
+/* Clean the server before beginning testing */
+test_st basic_TESTS[] ={
+#if 0
+  {"memcached_get()", true, (test_callback_fn*)get_test },
+  {"memcached_get() test 2", false, (test_callback_fn*)get_test2 },
+  {"memcached_get() test 3", false, (test_callback_fn*)get_test3 },
+  {"memcached_get() test 4", false, (test_callback_fn*)get_test4 },
+  {"memcached_get() test 5", false, (test_callback_fn*)get_test5 },
+#endif
+  {0, 0, 0}
+};
+
 collection_st collection[] ={
   {"command line options", 0, 0, cmdline_option_TESTS },
+  {"basic", 0, 0, basic_TESTS },
   {0, 0, 0, 0}
 };
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (access(executable.c_str(), X_OK) != 0)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   if (HAVE_MEMCACHED_LIGHT_BINARY == 0)
   {
     error= TEST_SKIPPED;
@@ -162,15 +214,35 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
   {
     error= TEST_FAILURE;
+    return NULL;
   }
 
-  return &servers;
+
+  char buffer[1024];
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(libtest::default_port()));
+  fatal_assert(length > 0);
+
+  memcached_st *memc= memcached(buffer, length);
+
+  fatal_assert(memc);
+
+  return (void*)memc;
+}
+
+static bool world_destroy(void *object)
+{
+  memcached_st *memc= (memcached_st*)object;
+  memcached_free(memc);
+
+  return TEST_SUCCESS;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->collections= collection;
-  world->_create= world_create;
+  world->create(world_create);
+  world->destroy(world_destroy);
+  world->collections(collection);
+  world->set_runner(new MemcachedLightRunner);
 }