Restructuring for new memcached_result_st.

[awesomized/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index 85adaf1cb3006dc28edffaf0597b558a33958800..17240107e8ee045ba6dd27f873623557132ad1f5 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -7,6 +7,9 @@
 #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 "../lib/common.h"
 
@@ -37,6 +40,43 @@ void allocation_test(memcached_st *not_used)
   memcached_free(memc);
 }
 
+void clone_test(memcached_st *memc)
+{
+  /* All null? */
+  {
+    memcached_st *clone;
+    clone= memcached_clone(NULL, NULL);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from null? */
+  {
+    memcached_st *clone;
+    clone= memcached_clone(NULL, memc);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from struct? */
+  {
+    memcached_st declared_clone;
+    memcached_st *clone;
+    clone= memcached_clone(&declared_clone, NULL);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from struct? */
+  {
+    memcached_st declared_clone;
+    memcached_st *clone;
+    clone= memcached_clone(&declared_clone, memc);
+    assert(clone);
+    memcached_free(clone);
+  }
+}
+
 void connection_test(memcached_st *memc)
 {
   memcached_return rc;
@@ -437,7 +477,7 @@ void get_stats(memcached_st *memc)
    free(list);
  }
 
- free(stat);
+ memcached_stat_free(NULL, stat);
 }
 
 void add_host_test(memcached_st *memc)
@@ -484,9 +524,10 @@ void behavior_test(memcached_st *memc)
   value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
   assert(value == 1);
 
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
-  assert(value == 1);
+  set= MEMCACHED_HASH_MD5;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+  assert(value == MEMCACHED_HASH_MD5);
 
   set= 0;
 
@@ -498,9 +539,15 @@ void behavior_test(memcached_st *memc)
   value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
   assert(value == 0);
 
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
-  assert(value == 0);
+  set= MEMCACHED_HASH_DEFAULT;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+  assert(value == MEMCACHED_HASH_DEFAULT);
+
+  set= MEMCACHED_HASH_CRC;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &set);
+  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+  assert(value == MEMCACHED_HASH_CRC);
 
   value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE);
   assert(value > 0);
@@ -572,9 +619,11 @@ void user_supplied_bug2(memcached_st *memc)
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, &setter);
   getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE);
   getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE);
-#endif
 
   for (x= 0, errors= 0, total= 0 ; total < 20 * 1024576 ; x++)
+#endif
+
+  for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++)
   {
     memcached_return rc= MEMCACHED_SUCCESS;
     char buffer[SMALL_STRING_LEN];
@@ -661,29 +710,60 @@ void user_supplied_bug3(memcached_st *memc)
   free(keys);
 }
 
+void result_static(memcached_st *memc)
+{
+  memcached_result_st result;
+  memcached_result_st *result_ptr;
+
+  result_ptr= memcached_result_create(memc, &result);
+  assert(result.is_allocated == MEMCACHED_NOT_ALLOCATED);
+  assert(result_ptr);
+  memcached_result_free(&result);
+}
+
+void result_alloc(memcached_st *memc)
+{
+  memcached_result_st *result;
+
+  result= memcached_result_create(memc, NULL);
+  assert(result);
+  memcached_result_free(result);
+}
+
+void string_static_null(memcached_st *memc)
+{
+  memcached_string_st string;
+  memcached_string_st *string_ptr;
+
+  string_ptr= memcached_string_create(memc, &string, 0);
+  assert(string.is_allocated == MEMCACHED_NOT_ALLOCATED);
+  assert(string_ptr);
+  memcached_string_free(&string);
+}
+
 void string_alloc_null(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, 0);
+  string= memcached_string_create(memc, NULL, 0);
   assert(string);
-  memcached_string_free(memc, string);
+  memcached_string_free(string);
 }
 
 void string_alloc_with_size(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, 1024);
+  string= memcached_string_create(memc, NULL, 1024);
   assert(string);
-  memcached_string_free(memc, string);
+  memcached_string_free(string);
 }
 
 void string_alloc_with_size_toobig(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, INT64_MAX);
+  string= memcached_string_create(memc, NULL, INT64_MAX);
   assert(string == NULL);
 }
 
@@ -696,16 +776,16 @@ void string_alloc_append(memcached_st *memc)
   /* Ring the bell! */
   memset(buffer, 6, SMALL_STRING_LEN);
 
-  string= memcached_string_create(memc, 100);
+  string= memcached_string_create(memc, NULL, 100);
   assert(string);
 
   for (x= 0; x < 1024; x++)
   {
     memcached_return rc;
-    rc= memcached_string_append(memc, string, buffer, SMALL_STRING_LEN);
+    rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
     assert(rc == MEMCACHED_SUCCESS);
   }
-  memcached_string_free(memc, string);
+  memcached_string_free(string);
 }
 
 void string_alloc_append_toobig(memcached_st *memc)
@@ -718,17 +798,17 @@ void string_alloc_append_toobig(memcached_st *memc)
   /* Ring the bell! */
   memset(buffer, 6, SMALL_STRING_LEN);
 
-  string= memcached_string_create(memc, 100);
+  string= memcached_string_create(memc, NULL, 100);
   assert(string);
 
   for (x= 0; x < 1024; x++)
   {
-    rc= memcached_string_append(memc, string, buffer, SMALL_STRING_LEN);
+    rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
     assert(rc == MEMCACHED_SUCCESS);
   }
-  rc= memcached_string_append(memc, string, buffer, INT64_MAX);
+  rc= memcached_string_append(string, buffer, INT64_MAX);
   assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
-  memcached_string_free(memc, string);
+  memcached_string_free(string);
 }
 
 void add_host_test1(memcached_st *memc)
@@ -761,20 +841,92 @@ void add_host_test1(memcached_st *memc)
   memcached_server_list_free(servers);
 }
 
-void pre_nonblock(memcached_st *memc)
+memcached_return pre_nonblock(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_md5(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_MD5;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_crc(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_CRC;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1_64(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_FNV1_64;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1a_64(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_FNV1A_64;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1_32(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_FNV1_32;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_hash_fnv1a_32(memcached_st *memc)
+{
+  memcached_hash value= MEMCACHED_HASH_FNV1A_32;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
 }
 
-void pre_md5(memcached_st *memc)
+memcached_return pre_hash_ketama(memcached_st *memc)
 {
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, NULL);
+  memcached_hash value= MEMCACHED_HASH_KETAMA;
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, &value);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return pre_unix_socket(memcached_st *memc)
+{
+  memcached_return rc;
+  struct stat buf;
+
+  memcached_server_list_free(memc->hosts);
+  memc->hosts= NULL;
+  memc->number_of_hosts= 0;
+
+  if (stat("/tmp/memcached.socket", &buf))
+    return MEMCACHED_FAILURE;
+
+  rc= memcached_server_add_unix_socket(memc, "/tmp/memcached.socket");
+
+  return rc;
 }
 
-void pre_nodelay(memcached_st *memc)
+memcached_return pre_nodelay(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, NULL);
+
+  return MEMCACHED_SUCCESS;
 }
 
 typedef struct collection_st collection_st;
@@ -788,8 +940,8 @@ struct test_st {
 
 struct collection_st {
   char *name;
-  void (*pre)(memcached_st *memc);
-  void (*post)(memcached_st *memc);
+  memcached_return (*pre)(memcached_st *memc);
+  memcached_return (*post)(memcached_st *memc);
   test_st *tests;
 };
 
@@ -832,6 +984,7 @@ int main(int argc, char *argv[])
     {"flush", 0, flush_test },
     {"init", 0, init_test },
     {"allocation", 0, allocation_test },
+    {"clone_test", 0, clone_test },
     {"error", 0, error_test },
     {"set", 0, set_test },
     {"set2", 0, set_test2 },
@@ -856,6 +1009,7 @@ int main(int argc, char *argv[])
   };
 
   test_st string_tests[] ={
+    {"string static with null", 0, string_static_null },
     {"string alloc with null", 0, string_alloc_null },
     {"string alloc with 1K", 0, string_alloc_with_size },
     {"string alloc with malloc failure", 0, string_alloc_with_size_toobig },
@@ -864,6 +1018,12 @@ int main(int argc, char *argv[])
     {0, 0, 0}
   };
 
+  test_st result_tests[] ={
+    {"result static", 0, result_static},
+    {"result alloc", 0, result_alloc},
+    {0, 0, 0}
+  };
+
   test_st user_tests[] ={
     {"user_supplied_bug1", 0, user_supplied_bug1 },
     {"user_supplied_bug2", 0, user_supplied_bug2 },
@@ -877,7 +1037,16 @@ int main(int argc, char *argv[])
     {"nonblock", pre_nonblock, 0, tests},
     {"nodelay", pre_nodelay, 0, tests},
     {"md5", pre_md5, 0, tests},
+    {"crc", pre_crc, 0, tests},
+    {"fnv1_64", pre_hash_fnv1_64, 0, tests},
+    {"fnv1a_64", pre_hash_fnv1a_64, 0, tests},
+    {"fnv1_32", pre_hash_fnv1_32, 0, tests},
+    {"fnv1a_32", pre_hash_fnv1a_32, 0, tests},
+    {"ketama", pre_hash_ketama, 0, tests},
+    {"unix_socket", pre_unix_socket, 0, tests},
+    {"unix_socket_nodelay", pre_nodelay, 0, tests},
     {"string", 0, 0, string_tests},
+    {"result", 0, 0, result_tests},
     {"user", 0, 0, user_tests},
     {0, 0, 0, 0}
   };
@@ -923,7 +1092,16 @@ int main(int argc, char *argv[])
       }
 
       if (next->pre)
-        next->pre(memc);
+      {
+        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);
       run->function(memc);
@@ -933,9 +1111,10 @@ int main(int argc, char *argv[])
               load_time % 1000);
 
       if (next->post)
-        next->post(memc);
+        (void)next->post(memc);
 
       assert(memc);
+error:
       memcached_free(memc);
     }
   }