Add support for murmur3

[m6w6/libmemcached] / tests / hash_plus.cc

diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc
index 3d2545ab66e9987dcad260ddc74468459b57bc8b..078bdd172d54be1e530aee5ae32fe05dd0263efe 100644 (file)
--- a/tests/hash_plus.cc
+++ b/tests/hash_plus.cc
@@ -2,7 +2,7 @@
   C++ to libhashkit
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 
@@ -10,11 +10,11 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <libhashkit/hashkit.hpp>
+#include <libhashkit-1.0/hashkit.hpp>
 
 using namespace libtest;
 
-#include "hash_results.h"
+#include "tests/hash_results.h"
 
 static test_return_t exists_test(void *)
 {
@@ -130,6 +130,7 @@ static test_return_t set_function_test(void *)
       list= hsieh_values;
       break;
 
+    case HASHKIT_HASH_MURMUR3:
     case HASHKIT_HASH_MURMUR:
 #ifdef WORDS_BIGENDIAN
       continue;
@@ -158,7 +159,7 @@ static test_return_t set_function_test(void *)
       hash_val= hashk.digest(*ptr, strlen(*ptr));
       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);
+      test_compare(list[x], hash_val);
     }
   }
 
@@ -171,7 +172,7 @@ static test_return_t set_distribution_function_test(void *)
   hashkit_return_t rc;
 
   rc= hashk.set_distribution_function(HASHKIT_HASH_CUSTOM);
-  test_true_got(rc == HASHKIT_FAILURE or rc == HASHKIT_INVALID_ARGUMENT, hashkit_strerror(NULL, rc));
+  test_true(rc == HASHKIT_FAILURE or rc == HASHKIT_INVALID_ARGUMENT);
 
   test_compare(HASHKIT_SUCCESS,
                hashk.set_distribution_function(HASHKIT_HASH_JENKINS));
@@ -213,7 +214,7 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->collections= collection;
+  world->collections(collection);
 }