aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-06-18 05:41:16 +0000
committerEvan Huus <eapache@gmail.com>2013-06-18 05:41:16 +0000
commit54959c293d77efcd9ce04bcf29c79da52b25ed4d (patch)
treed883924a94012e008903c1b612a362d2ad82e317
parent7c99d55773117d0e9ab602bc0ba41fd2eabdd747 (diff)
Wmem tree tests with non-trivial keys.
svn path=/trunk/; revision=50003
-rw-r--r--epan/wmem/wmem_test.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 5a6ab6b4d9..d553975655 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -601,7 +601,8 @@ wmem_test_tree(void)
int seen_values = 0;
int j;
gchar *str_key;
-#define WMEM_TREE_MAX_KEY_COUNT 2
+#define WMEM_TREE_MAX_KEY_COUNT 8
+#define WMEM_TREE_MAX_KEY_LEN 4
int key_count;
wmem_tree_key_t keys[WMEM_TREE_MAX_KEY_COUNT+1];
@@ -650,8 +651,9 @@ wmem_test_tree(void)
key_count = g_random_int_range(1, WMEM_TREE_MAX_KEY_COUNT);
keys[key_count].length = 0;
for (j=0; j<key_count; j++) {
- keys[j].key = (guint32*)wmem_test_rand_string(allocator, 8, 9);
- keys[j].length = 2;
+ keys[j].length = g_random_int_range(1, WMEM_TREE_MAX_KEY_LEN);
+ keys[j].key = (guint32*)wmem_test_rand_string(allocator,
+ (keys[j].length*4), (keys[j].length*4)+1);
}
g_assert(wmem_tree_lookup32_array(tree, keys) == NULL);
wmem_tree_insert32_array(tree, keys, GINT_TO_POINTER(i));