diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_container_multihashmap.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/test_container_multihashmap.c')
-rw-r--r-- | src/util/test_container_multihashmap.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c index ba621c17e..5732ace93 100644 --- a/src/util/test_container_multihashmap.c +++ b/src/util/test_container_multihashmap.c | |||
@@ -52,38 +52,41 @@ testMap (int i) | |||
52 | CHECK (0 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1)); | 52 | CHECK (0 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1)); |
53 | CHECK (0 == GNUNET_CONTAINER_multihashmap_size (m)); | 53 | CHECK (0 == GNUNET_CONTAINER_multihashmap_size (m)); |
54 | CHECK (0 == GNUNET_CONTAINER_multihashmap_iterate (m, NULL, NULL)); | 54 | CHECK (0 == GNUNET_CONTAINER_multihashmap_iterate (m, NULL, NULL)); |
55 | CHECK (0 == GNUNET_CONTAINER_multihashmap_get_multiple (m, &k1, NULL, NULL)); | 55 | CHECK (0 == |
56 | GNUNET_CONTAINER_multihashmap_get_multiple (m, &k1, NULL, NULL)); | ||
56 | 57 | ||
57 | CHECK (GNUNET_OK == | 58 | CHECK (GNUNET_OK == |
58 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v1", | 59 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v1", |
59 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE)); | 60 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE)); |
60 | CHECK (1 == GNUNET_CONTAINER_multihashmap_size (m)); | 61 | CHECK (1 == GNUNET_CONTAINER_multihashmap_size (m)); |
61 | ret = GNUNET_CONTAINER_multihashmap_get (m, &k1); | 62 | ret = GNUNET_CONTAINER_multihashmap_get (m, &k1); |
62 | GNUNET_assert (ret != NULL); | 63 | GNUNET_assert (ret != NULL); |
63 | CHECK (0 == strcmp ("v1", ret)); | 64 | CHECK (0 == strcmp ("v1", ret)); |
64 | CHECK (GNUNET_NO == | 65 | CHECK (GNUNET_NO == |
65 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v1", | 66 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v1", |
66 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE)); | 67 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE)); |
67 | CHECK (1 == GNUNET_CONTAINER_multihashmap_size (m)); | 68 | CHECK (1 == GNUNET_CONTAINER_multihashmap_size (m)); |
68 | CHECK (GNUNET_OK == | 69 | CHECK (GNUNET_OK == |
69 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v2", | 70 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v2", |
70 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); | 71 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); |
71 | CHECK (GNUNET_OK == | 72 | CHECK (GNUNET_OK == |
72 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v3", | 73 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v3", |
73 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); | 74 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); |
74 | CHECK (3 == GNUNET_CONTAINER_multihashmap_size (m)); | 75 | CHECK (3 == GNUNET_CONTAINER_multihashmap_size (m)); |
75 | CHECK (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (m, &k1, "v3")); | 76 | CHECK (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (m, &k1, "v3")); |
76 | CHECK (2 == GNUNET_CONTAINER_multihashmap_size (m)); | 77 | CHECK (2 == GNUNET_CONTAINER_multihashmap_size (m)); |
77 | CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (m, &k1)); | 78 | CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (m, &k1)); |
78 | CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (m, &k2)); | 79 | CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (m, &k2)); |
79 | CHECK (2 == GNUNET_CONTAINER_multihashmap_get_multiple (m, &k1, NULL, NULL)); | 80 | CHECK (2 == |
80 | CHECK (0 == GNUNET_CONTAINER_multihashmap_get_multiple (m, &k2, NULL, NULL)); | 81 | GNUNET_CONTAINER_multihashmap_get_multiple (m, &k1, NULL, NULL)); |
82 | CHECK (0 == | ||
83 | GNUNET_CONTAINER_multihashmap_get_multiple (m, &k2, NULL, NULL)); | ||
81 | CHECK (2 == GNUNET_CONTAINER_multihashmap_iterate (m, NULL, NULL)); | 84 | CHECK (2 == GNUNET_CONTAINER_multihashmap_iterate (m, NULL, NULL)); |
82 | CHECK (2 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1)); | 85 | CHECK (2 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1)); |
83 | for (j = 0; j < 1024; j++) | 86 | for (j = 0; j < 1024; j++) |
84 | CHECK (GNUNET_OK == | 87 | CHECK (GNUNET_OK == |
85 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v2", | 88 | GNUNET_CONTAINER_multihashmap_put (m, &k1, "v2", |
86 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); | 89 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); |
87 | GNUNET_CONTAINER_multihashmap_destroy (m); | 90 | GNUNET_CONTAINER_multihashmap_destroy (m); |
88 | return 0; | 91 | return 0; |
89 | } | 92 | } |