X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=47db82c733a2e43aec483f3e5fe28d281a570e28;hb=7f50da6ed2f30cc137b51415edc64810ef84c69a;hp=020bfc5347939d4a1c866535ea78545cad537b91;hpb=aadeadec9c2ca09c41a5dc2d63a34c465d39df3a;p=awesomized%2Flibmemcached

diff --git a/tests/test.c b/tests/test.c
index 020bfc53..47db82c7 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -2,246 +2,137 @@
   Sample test application.
 */
 #include <assert.h>
-#include <memcached.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <time.h>
+#include <fnmatch.h>
+#include "server.h"
 
-void init_test(void)
-{
-  memcached_st memc;
-
-  (void)memcached_init(&memc);
-  memcached_deinit(&memc);
-}
+#include "test.h"
 
-void allocation_test(void)
+long int timedif(struct timeval a, struct timeval b)
 {
-  memcached_st *memc;
-  memc= memcached_init(NULL);
-  assert(memc);
-  memcached_deinit(memc);
-}
+  register int us, s;
 
-void set_test(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-  
-  memcached_deinit(memc);
+  us = a.tv_usec - b.tv_usec;
+  us /= 1000;
+  s = a.tv_sec - b.tv_sec;
+  s *= 1000;
+  return s + us;
 }
 
-void add_test(void)
+int main(int argc, char *argv[])
 {
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_add(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_NOTSTORED);
-  
-  memcached_deinit(memc);
-}
-
-void replace_test(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_replace(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-  
-  memcached_deinit(memc);
-}
-
-void delete_test(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_delete(memc, key, strlen(key), (time_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-  
-  memcached_deinit(memc);
-}
-
-void flush_test(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_flush(memc, 0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  memcached_deinit(memc);
-}
+  unsigned int x;
+  char *collection_to_run= NULL;
+  char *wildcard= NULL;
+  server_startup_st *startup_ptr;
+  memcached_server_st *servers;
+  world_st world;
+  collection_st *collection;
+  collection_st *next;
+  uint8_t failed;
+  void *world_ptr;
+
+  memset(&world, 0, sizeof(world_st));
+  get_world(&world);
+  collection= world.collections;
+
+  if (world.create)
+    world_ptr= world.create();
+  else 
+    world_ptr= NULL;
+
+  startup_ptr= (server_startup_st *)world_ptr;
+  servers= (memcached_server_st *)startup_ptr->servers;
+
+  if (argc > 1)
+    collection_to_run= argv[1];
+
+  if (argc == 3)
+    wildcard= argv[2];
+
+  for (next= collection; next->name; next++)
+  {
+    test_st *run;
+
+    run= next->tests;
+    if (collection_to_run && fnmatch(collection_to_run, next->name, 0))
+      continue;
+
+    fprintf(stderr, "\n%s\n\n", next->name);
+
+    for (x= 0; run->name; run++)
+    {
+      unsigned int loop;
+      memcached_st *memc;
+      memcached_return rc;
+      struct timeval start_time, end_time;
+      long int load_time;
+
+      if (wildcard && fnmatch(wildcard, run->name, 0))
+        continue;
+
+      fprintf(stderr, "Testing %s", run->name);
+
+      memc= memcached_create(NULL);
+      assert(memc);
+
+      rc= memcached_server_push(memc, servers);
+      assert(rc == MEMCACHED_SUCCESS);
+
+      if (run->requires_flush)
+      {
+        memcached_flush(memc, 0);
+        memcached_quit(memc);
+      }
+
+      for (loop= 0; loop < memcached_server_list_count(servers); loop++)
+      {
+        assert(memc->hosts[loop].fd == -1);
+        assert(memc->hosts[loop].cursor_active == 0);
+      }
+
+      if (next->pre)
+      {
+        memcached_return rc;
+        rc= next->pre(memc);
+
+        if (rc != MEMCACHED_SUCCESS)
+        {
+          fprintf(stderr, "\t\t\t\t\t [ skipping ]\n");
+          goto error;
+        }
+      }
+
+      gettimeofday(&start_time, NULL);
+      failed= run->function(memc);
+      gettimeofday(&end_time, NULL);
+      load_time= timedif(end_time, start_time);
+      if (failed)
+        fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ failed ]\n", load_time / 1000, 
+                load_time % 1000);
+      else
+        fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
+                load_time % 1000);
+
+      if (next->post)
+        (void)next->post(memc);
+
+      assert(memc);
+error:
+      memcached_free(memc);
+    }
+  }
+
+  fprintf(stderr, "All tests completed successfully\n\n");
+
+  if (world.destroy)
+    world.destroy(world_ptr);
 
-void get_test(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  
-  string= memcached_get(memc, key, strlen(key),
-                        &string_length, &flags, &rc);
-
-  assert(string_length ==  0);
-  assert(!string);
-
-  memcached_deinit(memc);
-}
-
-void get_test2(void)
-{
-  memcached_st *memc;
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  string= memcached_get(memc, key, strlen(key),
-                        &string_length, &flags, &rc);
-
-  assert(string_length == strlen(value));
-  assert(!memcmp(string, value, string_length));
-
-  free(string);
-
-  memcached_deinit(memc);
-}
-
-void stats_hostname_test(void)
-{
-  memcached_return rc;
-  memcached_stat_st stat;
-  rc= memcached_stat_hostname(&stat, NULL,
-                              "localhost", 
-                              MEMCACHED_DEFAULT_PORT);
-}
-
-void increment_test(void)
-{
-  memcached_st *memc;
-  unsigned int new_number;
-  memcached_return rc;
-  char *key= "number";
-  char *value= "0";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_increment(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 1);
-
-  rc= memcached_increment(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 2);
-
-  memcached_deinit(memc);
-}
-
-void decrement_test(void)
-{
-  memcached_st *memc;
-  unsigned int new_number;
-  memcached_return rc;
-  char *key= "number";
-  char *value= "3";
-
-  memc= memcached_init(NULL);
-  assert(memc);
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_decrement(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 2);
-
-  rc= memcached_decrement(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 1);
-
-  memcached_deinit(memc);
-}
-
-int main(void)
-{
-  /* Clean the server before beginning testing */
-  flush_test();
-
-  init_test();
-  allocation_test();
-  set_test();
-  add_test();
-  replace_test();
-  flush_test();
-  delete_test();
-  flush_test();
-  get_test();
-  get_test2();
-  stats_hostname_test();
-
-  increment_test();
-  decrement_test();
-
-  /* Clean up whatever we might have left */
-  flush_test();
   return 0;
 }