Fix for using correct memcached binary.

[awesomized/libmemcached] / tests / hashkit_functions.c

diff --git a/tests/hashkit_functions.c b/tests/hashkit_functions.c
index d97b40c8cf57d8401ab4952548692b1b2c2f8a3a..2dad25fa95ed2838b5e9833ed0c800b386d958a1 100644 (file)
--- a/tests/hashkit_functions.c
+++ b/tests/hashkit_functions.c
@@ -297,15 +297,15 @@ test_st allocation[]= {
   {0, 0, 0}
 };
 
-static test_return_t hashkit_generate_value_test(hashkit_st *hashk)
+static test_return_t hashkit_digest_test(hashkit_st *hashk)
 {
   uint32_t value;
-  value= hashkit_generate_value(hashk, "a", sizeof("a"));
+  value= hashkit_digest(hashk, "a", sizeof("a"));
 
   return TEST_SUCCESS;
 }
 
-static test_return_t hashkit_set_base_function_test(hashkit_st *hashk)
+static test_return_t hashkit_set_function_test(hashkit_st *hashk)
 {
   for (hashkit_hash_algorithm_t algo = HASHKIT_HASH_DEFAULT; algo < HASHKIT_HASH_MAX; algo++) 
   {
@@ -314,12 +314,15 @@ static test_return_t hashkit_set_base_function_test(hashkit_st *hashk)
     const char **ptr;
     uint32_t *list;
 
-    rc= hashkit_set_base_function(hashk, algo);
+    rc= hashkit_set_function(hashk, algo);
 
     /* Hsieh is disabled most of the time for patent issues */
     if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_HSIEH)
       continue;
 
+    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_CUSTOM)
+      continue;
+
     test_true(rc == HASHKIT_SUCCESS);
 
     switch (algo)
@@ -354,19 +357,27 @@ static test_return_t hashkit_set_base_function_test(hashkit_st *hashk)
     case HASHKIT_HASH_JENKINS:
       list= jenkins_values;
       break;
+    case HASHKIT_HASH_CUSTOM:
     case HASHKIT_HASH_MAX:
     default:
       list= NULL;
-      test_fail("We ended up on a non-existent hash");
+      break;
     }
 
     // Now we make sure we did set the hash correctly.
-    for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+    if (list)
     {
-      uint32_t hash_val;
+      for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+      {
+        uint32_t hash_val;
 
-      hash_val= hashkit_generate_value(hashk, *ptr, strlen(*ptr));
-      test_true(list[x] == hash_val);
+        hash_val= hashkit_digest(hashk, *ptr, strlen(*ptr));
+        test_true(list[x] == hash_val);
+      }
+    }
+    else
+    {
+      return TEST_FAILURE;
     }
   }
 
@@ -379,47 +390,112 @@ static uint32_t hash_test_function(const char *string, size_t string_length, voi
   return libhashkit_md5(string, string_length);
 }
 
-static test_return_t hashkit_set_base_function_custom_test(hashkit_st *hashk)
+static test_return_t hashkit_set_custom_function_test(hashkit_st *hashk)
 {
   hashkit_return_t rc;
   uint32_t x;
   const char **ptr;
 
 
-  rc= hashkit_set_base_function_custom(hashk, hash_test_function, NULL);
+  rc= hashkit_set_custom_function(hashk, hash_test_function, NULL);
   test_true(rc == HASHKIT_SUCCESS);
 
   for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
   {
     uint32_t hash_val;
 
-    hash_val= hashkit_generate_value(hashk, *ptr, strlen(*ptr));
+    hash_val= hashkit_digest(hashk, *ptr, strlen(*ptr));
     test_true(md5_values[x] == hash_val);
   }
 
   return TEST_SUCCESS;
 }
 
+static test_return_t hashkit_set_distribution_function_test(hashkit_st *hashk)
+{
+  for (hashkit_hash_algorithm_t algo = HASHKIT_HASH_DEFAULT; algo < HASHKIT_HASH_MAX; algo++) 
+  {
+    hashkit_return_t rc;
+
+    rc= hashkit_set_distribution_function(hashk, algo);
+
+    /* Hsieh is disabled most of the time for patent issues */
+    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_HSIEH)
+      continue;
+
+    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_CUSTOM)
+      continue;
+
+    test_true(rc == HASHKIT_SUCCESS);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return_t hashkit_set_custom_distribution_function_test(hashkit_st *hashk)
+{
+  hashkit_return_t rc;
+
+  rc= hashkit_set_custom_distribution_function(hashk, hash_test_function, NULL);
+  test_true(rc == HASHKIT_SUCCESS);
+
+  return TEST_SUCCESS;
+}
+
+
+static test_return_t hashkit_get_function_test(hashkit_st *hashk)
+{
+  for (hashkit_hash_algorithm_t algo = HASHKIT_HASH_DEFAULT; algo < HASHKIT_HASH_MAX; algo++) 
+  {
+    hashkit_return_t rc;
+
+    if (HASHKIT_HASH_CUSTOM || HASHKIT_HASH_HSIEH)
+      continue;
+
+    rc= hashkit_set_function(hashk, algo);
+    test_true(rc == HASHKIT_SUCCESS);
+
+    test_true(hashkit_get_function(hashk) == algo);
+  }
+  return TEST_SUCCESS;
+}
+
+static test_return_t hashkit_compare_test(hashkit_st *hashk)
+{
+  hashkit_st *clone;
+
+  clone= hashkit_clone(NULL, hashk);
+
+  test_true(hashkit_compare(clone, hashk));
+  hashkit_free(clone);
+
+  return TEST_SUCCESS;
+}
+
 test_st hashkit_st_functions[] ={
-  {"hashkit_generate_value", 0, (test_callback_fn)hashkit_generate_value_test},
-  {"hashkit_set_base_function", 0, (test_callback_fn)hashkit_set_base_function_test},
-  {"hashkit_set_base_function_custom", 0, (test_callback_fn)hashkit_set_base_function_custom_test},
+  {"hashkit_digest", 0, (test_callback_fn)hashkit_digest_test},
+  {"hashkit_set_function", 0, (test_callback_fn)hashkit_set_function_test},
+  {"hashkit_set_custom_function", 0, (test_callback_fn)hashkit_set_custom_function_test},
+  {"hashkit_get_function", 0, (test_callback_fn)hashkit_get_function_test},
+  {"hashkit_set_distribution_function", 0, (test_callback_fn)hashkit_set_distribution_function_test},
+  {"hashkit_set_custom_distribution_function", 0, (test_callback_fn)hashkit_set_custom_distribution_function_test},
+  {"hashkit_compare", 0, (test_callback_fn)hashkit_compare_test},
   {0, 0, 0}
 };
 
-static test_return_t libhashkit_generate_value_test(hashkit_st *hashk)
+static test_return_t libhashkit_digest_test(hashkit_st *hashk)
 {
   uint32_t value;
 
   (void)hashk;
 
-  value= libhashkit_generate_value("a", sizeof("a"), HASHKIT_HASH_DEFAULT);
+  value= libhashkit_digest("a", sizeof("a"), HASHKIT_HASH_DEFAULT);
 
   return TEST_SUCCESS;
 }
 
 test_st library_functions[] ={
-  {"libhashkit_generate_value", 0, (test_callback_fn)libhashkit_generate_value_test},
+  {"libhashkit_digest", 0, (test_callback_fn)libhashkit_digest_test},
   {0, 0, 0}
 };