X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fhash_plus.cc;h=140d28fcae35a49d7574c1aa57ad810cea504848;hb=f40a312c617295543fb09864a8be80cc027cac79;hp=cbf2fdf9dff1ac158c42662086cf583bd6131586;hpb=dac48f2dbe34915755f8f4f7f88419f47dc9e27f;p=m6w6%2Flibmemcached

diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc
index cbf2fdf9..140d28fc 100644
--- a/tests/hash_plus.cc
+++ b/tests/hash_plus.cc
@@ -1,25 +1,29 @@
 /*
   C++ to libhashkit
 */
-#include "test.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <libtest/test.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <libhashkit/hashkit.h>
 
 #include "hash_results.h"
 
-static test_return_t exists_test(void *obj __attribute__((unused)))
+static test_return_t exists_test(void *obj)
 {
   Hashkit hashk;
+  (void)obj;
+  (void)hashk;
 
   return TEST_SUCCESS;
 }
 
-static test_return_t new_test(void *obj __attribute__((unused)))
+static test_return_t new_test(void *obj)
 {
   Hashkit *hashk= new Hashkit;
+  (void)obj;
 
   (void)hashk;
 
@@ -28,10 +32,11 @@ static test_return_t new_test(void *obj __attribute__((unused)))
   return TEST_SUCCESS;
 }
 
-static test_return_t copy_test(void *obj __attribute__((unused)))
+static test_return_t copy_test(void *obj)
 {
   Hashkit *hashk= new Hashkit;
   Hashkit *copy(hashk);
+  (void)obj;
 
   (void)copy;
 
@@ -40,10 +45,11 @@ static test_return_t copy_test(void *obj __attribute__((unused)))
   return TEST_SUCCESS;
 }
 
-static test_return_t assign_test(void *obj __attribute__((unused)))
+static test_return_t assign_test(void *obj)
 {
   Hashkit hashk;
   Hashkit copy;
+  (void)obj;
 
   copy= hashk;
 
@@ -52,17 +58,18 @@ static test_return_t assign_test(void *obj __attribute__((unused)))
   return TEST_SUCCESS;
 }
 
-static test_return_t digest_test(void *obj __attribute__((unused)))
+static test_return_t digest_test(void *obj)
 {
   Hashkit hashk;
   uint32_t value;
+  (void)obj;
 
   value= hashk.digest("Foo", sizeof("Foo"));
 
   return TEST_SUCCESS;
 }
 
-static test_return_t set_function_test(void *obj __attribute__((unused)))
+static test_return_t set_function_test(void *)
 {
   Hashkit hashk;
   hashkit_hash_algorithm_t algo_list[]= { 
@@ -77,20 +84,15 @@ static test_return_t set_function_test(void *obj __attribute__((unused)))
     HASHKIT_HASH_JENKINS,
     HASHKIT_HASH_MAX
   };
-  hashkit_hash_algorithm_t *algo;
 
 
-  for (algo= algo_list; *algo != HASHKIT_HASH_MAX; algo++)
+  for (hashkit_hash_algorithm_t *algo= algo_list; *algo != HASHKIT_HASH_MAX; algo++)
   {
-    hashkit_return_t rc;
-    uint32_t x;
-    const char **ptr;
-    uint32_t *list;
-
-    rc= hashk.set_function(*algo);
+    hashkit_return_t rc= hashk.set_function(*algo);
 
     test_true(rc == HASHKIT_SUCCESS);
 
+    uint32_t *list;
     switch (*algo)
     {
     case HASHKIT_HASH_DEFAULT:
@@ -115,9 +117,18 @@ static test_return_t set_function_test(void *obj __attribute__((unused)))
       list= fnv1a_32_values;
       break;
     case HASHKIT_HASH_HSIEH:
+#ifndef HAVE_HSIEH_HASH
+      continue;
+#endif
       list= hsieh_values;
       break;
     case HASHKIT_HASH_MURMUR:
+#ifdef WORDS_BIGENDIAN
+      continue;
+#endif
+#ifndef HAVE_MURMUR_HASH
+      continue;
+#endif
       list= murmur_values;
       break;
     case HASHKIT_HASH_JENKINS:
@@ -131,25 +142,30 @@ static test_return_t set_function_test(void *obj __attribute__((unused)))
     }
 
     // Now we make sure we did set the hash correctly.
+    uint32_t x;
+    const char **ptr;
     for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
     {
       uint32_t hash_val;
 
       hash_val= hashk.digest(*ptr, strlen(*ptr));
-      test_true(list[x] == hash_val);
+      char buffer[1024];
+      snprintf(buffer, sizeof(buffer), "%lu %lus %s", (unsigned long)list[x], (unsigned long)hash_val, libhashkit_string_hash(*algo));
+      test_true_got(list[x] == hash_val, buffer);
     }
   }
 
   return TEST_SUCCESS;
 }
 
-static test_return_t set_distribution_function_test(void *obj __attribute__((unused)))
+static test_return_t set_distribution_function_test(void *obj)
 {
   Hashkit hashk;
   hashkit_return_t rc;
+  (void)obj;
 
   rc= hashk.set_distribution_function(HASHKIT_HASH_CUSTOM);
-  test_true(rc == HASHKIT_FAILURE);
+  test_true_got(rc == HASHKIT_FAILURE or rc == HASHKIT_INVALID_ARGUMENT, hashkit_strerror(NULL, rc));
 
   rc= hashk.set_distribution_function(HASHKIT_HASH_JENKINS);
   test_true(rc == HASHKIT_SUCCESS);
@@ -157,9 +173,10 @@ static test_return_t set_distribution_function_test(void *obj __attribute__((unu
   return TEST_SUCCESS;
 }
 
-static test_return_t compare_function_test(void *obj __attribute__((unused)))
+static test_return_t compare_function_test(void *obj)
 {
   Hashkit a, b;
+  (void)obj;
 
   b= a;
   
@@ -175,14 +192,14 @@ static test_return_t compare_function_test(void *obj __attribute__((unused)))
 }
 
 test_st basic[] ={
-  { "exists", 0, exists_test },
-  { "new", 0, new_test },
-  { "copy", 0, copy_test },
-  { "assign", 0, assign_test },
-  { "digest", 0, digest_test },
-  { "set_function", 0, set_function_test },
-  { "set_distribution_function", 0, set_distribution_function_test },
-  { "compare", 0, compare_function_test },
+  { "exists", 0, reinterpret_cast<test_callback_fn>(exists_test) },
+  { "new", 0, reinterpret_cast<test_callback_fn>(new_test) },
+  { "copy", 0, reinterpret_cast<test_callback_fn>(copy_test) },
+  { "assign", 0, reinterpret_cast<test_callback_fn>(assign_test) },
+  { "digest", 0, reinterpret_cast<test_callback_fn>(digest_test) },
+  { "set_function", 0, reinterpret_cast<test_callback_fn>(set_function_test) },
+  { "set_distribution_function", 0, reinterpret_cast<test_callback_fn>(set_distribution_function_test) },
+  { "compare", 0, reinterpret_cast<test_callback_fn>(compare_function_test) },
   { 0, 0, 0}
 };