projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix memory issue in test.
[m6w6/libmemcached]
/
tests
/
hash_plus.cc
diff --git
a/tests/hash_plus.cc
b/tests/hash_plus.cc
index 987d79718230ae32124c8b7390301522a4db93e2..b355fe57af7608989f24dd0e472f8955883d1961 100644
(file)
--- a/
tests/hash_plus.cc
+++ b/
tests/hash_plus.cc
@@
-4,7
+4,7
@@
#include <config.h>
#include <config.h>
-#include <libtest/test.h>
+#include <libtest/test.h
pp
>
#include <cstdio>
#include <cstdlib>
#include <cstdio>
#include <cstdlib>
@@
-12,6
+12,8
@@
#include <libhashkit/hashkit.hpp>
#include <libhashkit/hashkit.hpp>
+using namespace libtest;
+
#include "hash_results.h"
static test_return_t exists_test(void *obj)
#include "hash_results.h"
static test_return_t exists_test(void *obj)
@@
-61,13
+63,10
@@
static test_return_t assign_test(void *obj)
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-static test_return_t digest_test(void *
obj
)
+static test_return_t digest_test(void *)
{
Hashkit hashk;
{
Hashkit hashk;
- uint32_t value;
- (void)obj;
-
- value= hashk.digest("Foo", sizeof("Foo"));
+ test_true(hashk.digest("Foo", sizeof("Foo")));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-93,7
+92,7
@@
static test_return_t set_function_test(void *)
{
hashkit_return_t rc= hashk.set_function(*algo);
{
hashkit_return_t rc= hashk.set_function(*algo);
- test_
true(rc == HASHKIT_SUCCESS
);
+ test_
compare(HASHKIT_SUCCESS, rc
);
uint32_t *list;
switch (*algo)
uint32_t *list;
switch (*algo)
@@
-101,30
+100,38
@@
static test_return_t set_function_test(void *)
case HASHKIT_HASH_DEFAULT:
list= one_at_a_time_values;
break;
case HASHKIT_HASH_DEFAULT:
list= one_at_a_time_values;
break;
+
case HASHKIT_HASH_MD5:
list= md5_values;
break;
case HASHKIT_HASH_MD5:
list= md5_values;
break;
+
case HASHKIT_HASH_CRC:
list= crc_values;
break;
case HASHKIT_HASH_CRC:
list= crc_values;
break;
+
case HASHKIT_HASH_FNV1_64:
list= fnv1_64_values;
break;
case HASHKIT_HASH_FNV1_64:
list= fnv1_64_values;
break;
+
case HASHKIT_HASH_FNV1A_64:
list= fnv1a_64_values;
break;
case HASHKIT_HASH_FNV1A_64:
list= fnv1a_64_values;
break;
+
case HASHKIT_HASH_FNV1_32:
list= fnv1_32_values;
break;
case HASHKIT_HASH_FNV1_32:
list= fnv1_32_values;
break;
+
case HASHKIT_HASH_FNV1A_32:
list= fnv1a_32_values;
break;
case HASHKIT_HASH_FNV1A_32:
list= fnv1a_32_values;
break;
+
case HASHKIT_HASH_HSIEH:
#ifndef HAVE_HSIEH_HASH
continue;
#endif
list= hsieh_values;
break;
case HASHKIT_HASH_HSIEH:
#ifndef HAVE_HSIEH_HASH
continue;
#endif
list= hsieh_values;
break;
+
case HASHKIT_HASH_MURMUR:
#ifdef WORDS_BIGENDIAN
continue;
case HASHKIT_HASH_MURMUR:
#ifdef WORDS_BIGENDIAN
continue;
@@
-134,9
+141,11
@@
static test_return_t set_function_test(void *)
#endif
list= murmur_values;
break;
#endif
list= murmur_values;
break;
+
case HASHKIT_HASH_JENKINS:
list= jenkins_values;
break;
case HASHKIT_HASH_JENKINS:
list= jenkins_values;
break;
+
case HASHKIT_HASH_CUSTOM:
case HASHKIT_HASH_MAX:
default:
case HASHKIT_HASH_CUSTOM:
case HASHKIT_HASH_MAX:
default:
@@
-211,7
+220,7
@@
collection_st collection[] ={
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-void get_world(
world_st
*world)
+void get_world(
Framework
*world)
{
world->collections= collection;
}
{
world->collections= collection;
}