X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fhashkit_functions.c;h=005143a0b2e44f7794b70778211fda92ad992d16;hb=857ca43d65fe6a52474641130312d26d125bef15;hp=2642f76a2a3c4bd5ec77632efdcd6d0adc81b14a;hpb=42771008c1a69a2bfac10bbc89d00094d738e896;p=m6w6%2Flibmemcached

diff --git a/tests/hashkit_functions.c b/tests/hashkit_functions.c
index 2642f76a..005143a0 100644
--- a/tests/hashkit_functions.c
+++ b/tests/hashkit_functions.c
@@ -297,10 +297,10 @@ 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;
 }
@@ -361,16 +361,23 @@ static test_return_t hashkit_set_function_test(hashkit_st *hashk)
     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;
     }
   }
 
@@ -397,7 +404,7 @@ static test_return_t hashkit_set_custom_function_test(hashkit_st *hashk)
   {
     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);
   }
 
@@ -465,7 +472,7 @@ static test_return_t hashkit_compare_test(hashkit_st *hashk)
 }
 
 test_st hashkit_st_functions[] ={
-  {"hashkit_generate_value", 0, (test_callback_fn)hashkit_generate_value_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},
@@ -475,19 +482,19 @@ test_st hashkit_st_functions[] ={
   {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}
 };