- test for external iterator

[oweals/gnunet.git] / src / util / test_container_multihashmap.c

diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index befd0ce460c7428a5fae1e016a1029fe9a7a87e0..a0d29c6060f441ff314bf79b54677d31c0200c4b 100644 (file)
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -37,10 +37,12 @@ testMap (int i)
   struct GNUNET_CONTAINER_MultiHashMap *m;
   struct GNUNET_HashCode k1;
   struct GNUNET_HashCode k2;
+  struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+  struct GNUNET_HashCode key_ret;
   const char *ret;
   int j;
 
-  CHECK (NULL != (m = GNUNET_CONTAINER_multihashmap_create (i)));
+  CHECK (NULL != (m = GNUNET_CONTAINER_multihashmap_create (i, GNUNET_NO)));
   memset (&k1, 0, sizeof (k1));
   memset (&k2, 1, sizeof (k2));
   CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (m, &k1));
@@ -79,11 +81,23 @@ testMap (int i)
   CHECK (2 == GNUNET_CONTAINER_multihashmap_get_multiple (m, &k1, NULL, NULL));
   CHECK (0 == GNUNET_CONTAINER_multihashmap_get_multiple (m, &k2, NULL, NULL));
   CHECK (2 == GNUNET_CONTAINER_multihashmap_iterate (m, NULL, NULL));
+  iter = GNUNET_CONTAINER_multihashmap_iterator_create (m);
+  CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, &key_ret, (const void **)&ret));
+  CHECK (0 == memcmp (&key_ret, &k1, sizeof (key_ret)));
+  CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, &key_ret, (const void **)&ret));
+  CHECK (0 == memcmp (&key_ret, &k1, sizeof (key_ret)));
+  CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, NULL));
+
   CHECK (2 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1));
   for (j = 0; j < 1024; j++)
     CHECK (GNUNET_OK ==
            GNUNET_CONTAINER_multihashmap_put (m, &k1, "v2",
                                               GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+  iter = GNUNET_CONTAINER_multihashmap_iterator_create (m);
+  for (j = 0; j < GNUNET_CONTAINER_multihashmap_size (m); j++)
+    CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, NULL));
+  CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, NULL));
+
   GNUNET_CONTAINER_multihashmap_destroy (m);
   return 0;
 }