Restructuring for new memcached_result_st.

[awesomized/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index ef6afb7460414974089410564e82673ace1800ef..17240107e8ee045ba6dd27f873623557132ad1f5 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -477,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)
@@ -710,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);
 }
 
@@ -745,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)
@@ -767,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)
@@ -833,6 +864,46 @@ memcached_return pre_crc(memcached_st *memc)
   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;
+}
+
+memcached_return pre_hash_ketama(memcached_st *memc)
+{
+  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;
@@ -938,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 },
@@ -946,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 },
@@ -960,9 +1038,15 @@ int main(int argc, char *argv[])
     {"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}
   };