Fixed merge

[m6w6/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index 4948c70a7ddf191fcf69f2a54403c8b8a0eca2ec..f4ba3480380534ad5b0dc6be77d2b62c3f9da6cb 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,4 +1,3 @@
-#include <brian.h>
 /*
   Sample test application.
 */
@@ -24,10 +23,20 @@ void allocation_test(void)
   memcached_deinit(memc);
 }
 
+void connection_test(void)
+{
+  memcached_return rc;
+  memcached_st *memc;
+  memc= memcached_init(NULL);
+  rc= memcached_server_add(memc, "localhost", 0);
+  assert(rc == MEMCACHED_SUCCESS);
+  assert(memc);
+  memcached_deinit(memc);
+}
+
 void set_test(void)
 {
   memcached_st *memc;
-  char *foo;
   memcached_return rc;
   char *key= "foo";
   char *value= "when we sanitize";
@@ -38,7 +47,6 @@ void set_test(void)
                     value, strlen(value),
                     (time_t)0, (uint16_t)0);
   assert(rc == MEMCACHED_SUCCESS);
-  assert(foo);
   
   memcached_deinit(memc);
 }
@@ -46,7 +54,6 @@ void set_test(void)
 void add_test(void)
 {
   memcached_st *memc;
-  char *foo;
   memcached_return rc;
   char *key= "foo";
   char *value= "when we sanitize";
@@ -57,7 +64,6 @@ void add_test(void)
                     value, strlen(value),
                     (time_t)0, (uint16_t)0);
   assert(rc == MEMCACHED_NOTSTORED);
-  assert(foo);
   
   memcached_deinit(memc);
 }
@@ -65,7 +71,6 @@ void add_test(void)
 void replace_test(void)
 {
   memcached_st *memc;
-  char *foo;
   memcached_return rc;
   char *key= "foo";
   char *value= "when we sanitize";
@@ -76,7 +81,6 @@ void replace_test(void)
                     value, strlen(value),
                     (time_t)0, (uint16_t)0);
   assert(rc == MEMCACHED_SUCCESS);
-  assert(foo);
   
   memcached_deinit(memc);
 }
@@ -84,7 +88,6 @@ void replace_test(void)
 void delete_test(void)
 {
   memcached_st *memc;
-  char *foo;
   memcached_return rc;
   char *key= "foo";
   char *value= "when we sanitize";
@@ -95,11 +98,9 @@ void delete_test(void)
                     value, strlen(value),
                     (time_t)0, (uint16_t)0);
   assert(rc == MEMCACHED_SUCCESS);
-  assert(foo);
 
   rc= memcached_delete(memc, key, strlen(key), (time_t)0);
   assert(rc == MEMCACHED_SUCCESS);
-  assert(foo);
   
   memcached_deinit(memc);
 }
@@ -132,6 +133,7 @@ void get_test(void)
   string= memcached_get(memc, key, strlen(key),
                         &string_length, &flags, &rc);
 
+  assert(rc == MEMCACHED_NOTFOUND);
   assert(string_length ==  0);
   assert(!string);
 
@@ -141,7 +143,6 @@ void get_test(void)
 void get_test2(void)
 {
   memcached_st *memc;
-  char *foo;
   memcached_return rc;
   char *key= "foo";
   char *value= "when we sanitize";
@@ -159,6 +160,8 @@ void get_test2(void)
   string= memcached_get(memc, key, strlen(key),
                         &string_length, &flags, &rc);
 
+  assert(string);
+  assert(rc == MEMCACHED_SUCCESS);
   assert(string_length == strlen(value));
   assert(!memcmp(string, value, string_length));
 
@@ -167,13 +170,154 @@ void get_test2(void)
   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);
+}
+
+void quit_test(void)
+{
+  memcached_st *memc;
+  memcached_return rc;
+  char *key= "fudge";
+  char *value= "sanford and sun";
+
+  memc= memcached_init(NULL);
+  assert(memc);
+  rc= memcached_set(memc, key, strlen(key), 
+                    value, strlen(value),
+                    (time_t)10, (uint16_t)3);
+  assert(rc == MEMCACHED_SUCCESS);
+  memcached_quit(memc);
+
+  rc= memcached_set(memc, key, strlen(key), 
+                    value, strlen(value),
+                    (time_t)50, (uint16_t)9);
+  assert(rc == MEMCACHED_SUCCESS);
+  
+  memcached_deinit(memc);
+}
+
+void mget_test(void)
+{
+  memcached_st *memc;
+  memcached_return rc;
+  char *keys[]= {"fudge", "son", "food"};
+  size_t key_length[]= {5, 3, 4};
+  unsigned int x;
+  uint16_t flags;
+
+  char return_key[MEMCACHED_MAX_KEY];
+  size_t return_key_length;
+  char *return_value;
+  size_t return_value_length;
+
+  memc= memcached_init(NULL);
+  assert(memc);
+  
+  rc= memcached_mget(memc, keys, key_length, 3);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  while (return_value= memcached_fetch(memc, return_key, &return_key_length, 
+                      &return_value_length, &flags, &rc))
+  {
+    assert(return_value);
+  }
+  assert(rc == MEMCACHED_NOTFOUND);
+
+  for (x= 0; x < 3; x++)
+  {
+    rc= memcached_set(memc, keys[x], key_length[x], 
+                      keys[x], key_length[x],
+                      (time_t)50, (uint16_t)9);
+    assert(rc == MEMCACHED_SUCCESS);
+  }
+
+  rc= memcached_mget(memc, keys, key_length, 3);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  x= 0;
+  while (return_value= memcached_fetch(memc, return_key, &return_key_length, 
+                      &return_value_length, &flags, &rc))
+  {
+    assert(return_value);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(key_length[x] == return_value_length);
+    assert(!memcmp(return_value, keys[x], return_value_length));
+    x++;
+  }
+
+  memcached_deinit(memc);
+}
+
+
 int main(void)
 {
   /* Clean the server before beginning testing */
   flush_test();
-
   init_test();
   allocation_test();
+  connection_test();
   set_test();
   add_test();
   replace_test();
@@ -182,6 +326,12 @@ int main(void)
   flush_test();
   get_test();
   get_test2();
+  stats_hostname_test();
+
+  increment_test();
+  decrement_test();
+  quit_test();
+  mget_test();
 
   /* Clean up whatever we might have left */
   flush_test();