- test for external iterator

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

diff --git a/src/util/test_mq.c b/src/util/test_mq.c
index 161b40a2073b9daeb941f2187e379c350abcc391..f98fcd2354c5e22dbee22d80b68320589b4e66c1 100644 (file)
--- a/src/util/test_mq.c
+++ b/src/util/test_mq.c
@@ -19,12 +19,11 @@
 */
 
 /**
- * @file set/test_mq.c
+ * @file util/test_mq.c
  * @brief simple tests for mq
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
@@ -37,10 +36,11 @@ struct MyMessage
 
 GNUNET_NETWORK_STRUCT_END
 
-void
-test1 (void)
+
+static void
+test1 ()
 {
-  struct GNUNET_MQ_Message *mqm;
+  struct GNUNET_MQ_Envelope *mqm;
   struct MyMessage *mm;
   
   mm = NULL;
@@ -54,39 +54,10 @@ test1 (void)
 }
 
 
-void
-test2 (void)
-{
-  struct GNUNET_MQ_Message *mqm;
-  struct MyMessage *mm;
-  int res;
-  char *s = "foo";
-
-  mqm = GNUNET_MQ_msg (mm, 42);
-  res = GNUNET_MQ_nest (mqm, s, strlen(s));
-  GNUNET_assert (GNUNET_OK == res);
-  res = GNUNET_MQ_nest (mqm, s, strlen(s));
-  GNUNET_assert (GNUNET_OK == res);
-  res = GNUNET_MQ_nest (mqm, NULL, 0);
-  GNUNET_assert (GNUNET_OK == res);
-
-  GNUNET_assert (strlen (s) * 2 + sizeof (struct MyMessage) == ntohs (mm->header.size));
-
-  res = GNUNET_MQ_nest_mh (mqm, &mm->header);
-  GNUNET_assert (GNUNET_OK == res);
-  GNUNET_assert (2 * (strlen (s) * 2 + sizeof (struct MyMessage)) == ntohs (mm->header.size));
-
-  res = GNUNET_MQ_nest (mqm, (void *) 0xF00BA, 0xFFF0);
-  GNUNET_assert (GNUNET_OK != res);
-
-  GNUNET_MQ_discard (mqm);
-}
-
-
-void
-test3 (void)
+static void
+test2 ()
 {
-  struct GNUNET_MQ_Message *mqm;
+  struct GNUNET_MQ_Envelope *mqm;
   struct GNUNET_MessageHeader *mh;
 
   mqm = GNUNET_MQ_msg_header (42);
@@ -97,18 +68,16 @@ test3 (void)
   mqm = GNUNET_MQ_msg_header_extra (mh, 20, 42);
   GNUNET_assert (42 == ntohs (mh->type));
   GNUNET_assert (sizeof (struct GNUNET_MessageHeader) + 20 == ntohs (mh->size));
+  GNUNET_MQ_discard (mqm);
 }
 
 
 int
 main (int argc, char **argv)
 {
-
   GNUNET_log_setup ("test-mq", "INFO", NULL);
   test1 ();
   test2 ();
-  test3 ();
-
   return 0;
 }