Name correction for test system.

[m6w6/libmemcached] / tests / udp.c

diff --git a/tests/udp.c b/tests/udp.c
index b6ad2065ed7f68efd4e5a9a0e32d7d116f8c646d..c66f10853349a72979f17673a03b1c212a2aed7f 100644 (file)
--- a/tests/udp.c
+++ b/tests/udp.c
@@ -1,3 +1,14 @@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Sample test application.
 */
@@ -14,22 +25,25 @@
 #include "test.h"
 #include "server.h"
 
-uint8_t set_test(memcached_st *memc)
+/* Prototypes */
+test_return_t set_test(memcached_st *memc);
+
+test_return_t set_test(memcached_st *memc)
 {
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
+  memcached_return_t rc;
+  const char *key= "foo";
+  const char *value= "when we sanitize";
 
-  rc= memcached_set(memc, key, strlen(key), 
+  rc= memcached_set(memc, key, strlen(key),
                     value, strlen(value),
                     (time_t)0, (uint32_t)0);
-  assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+  test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
 
-  return 0;
+  return TEST_SUCCESS;
 }
 
 test_st tests[] ={
-  {"set", 1, set_test },
+  {"set", 1, (test_callback_fn)set_test },
   {0, 0, 0}
 };
 
@@ -40,32 +54,17 @@ collection_st collection[] ={
 
 #define SERVERS_TO_CREATE 1
 
-void *world_create(void)
-{
-  server_startup_st *construct;
-
-  construct= (server_startup_st *)malloc(sizeof(server_startup_st));
-  memset(construct, 0, sizeof(server_startup_st));
-  construct->count= SERVERS_TO_CREATE;
-  construct->udp= 1;
-  server_startup(construct);
-
-  return construct;
-}
-
-void world_destroy(void *p)
-{
-  server_startup_st *construct= (server_startup_st *)p;
-  memcached_server_st *servers= (memcached_server_st *)construct->servers;
-  memcached_server_list_free(servers);
-
-  server_shutdown(construct);
-  free(construct);
-}
+#include "libmemcached_world.h"
 
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->create= world_create;
-  world->destroy= world_destroy;
+  world->test_startup= (test_callback_fn)world_test_startup;
+  world->flush= (test_callback_fn)world_flush;
+  world->pre_run= (test_callback_fn)world_pre_run;
+  world->create= (test_callback_create_fn)world_create;
+  world->post_run= (test_callback_fn)world_post_run;
+  world->on_error= (test_callback_error_fn)world_on_error;
+  world->destroy= (test_callback_fn)world_destroy;
+  world->runner= &defualt_libmemcached_runner;
 }