make set testcase fail to highlight issue #3490

1 files changed, 58 insertions, 61 deletions

diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c
index b5140b101..c59624459 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     (C) 2012-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -21,6 +21,8 @@
 /**
  * @file set/test_set_intersection_result_full.c
  * @brief testcase for full result mode of the intersection set operation
+ * @author Christian Fuchs
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -33,56 +35,63 @@ static int ret;
 static struct GNUNET_PeerIdentity local_id;
 
 static struct GNUNET_HashCode app_id;
+
 static struct GNUNET_SET_Handle *set1;
+
 static struct GNUNET_SET_Handle *set2;
+
 static struct GNUNET_SET_ListenHandle *listen_handle;
-const static struct GNUNET_CONFIGURATION_Handle *config;
+
+static const struct GNUNET_CONFIGURATION_Handle *config;
 
 static int iter_count;
 
 
 static void
-result_cb_set1 (void *cls, const struct GNUNET_SET_Element *element,
+result_cb_set1 (void *cls,
+                const struct GNUNET_SET_Element *element,
                 enum GNUNET_SET_Status status)
 {
+  static int count;
   switch (status)
   {
-    case GNUNET_SET_STATUS_OK:
-      printf ("set 1: got element\n");
-      break;
-    case GNUNET_SET_STATUS_FAILURE:
-      printf ("set 1: failure\n");
-      ret = 1;
-      break;
-    case GNUNET_SET_STATUS_DONE:
-      printf ("set 1: done\n");
-      GNUNET_SET_destroy (set1);
-      break;
-    default:
-      GNUNET_assert (0);
+  case GNUNET_SET_STATUS_OK:
+    count++;
+    break;
+  case GNUNET_SET_STATUS_FAILURE:
+    ret = 1;
+    break;
+  case GNUNET_SET_STATUS_DONE:
+    GNUNET_assert (1 == count);
+    GNUNET_SET_destroy (set1);
+    break;
+  default:
+    GNUNET_assert (0);
   }
 }
 
 
 static void
-result_cb_set2 (void *cls, const struct GNUNET_SET_Element *element,
-           enum GNUNET_SET_Status status)
+result_cb_set2 (void *cls,
+                const struct GNUNET_SET_Element *element,
+                enum GNUNET_SET_Status status)
 {
+  static int count;
+
   switch (status)
   {
-    case GNUNET_SET_STATUS_OK:
-      printf ("set 2: got element\n");
-      break;
-    case GNUNET_SET_STATUS_FAILURE:
-      printf ("set 2: failure\n");
-      ret = 1;
-      break;
-    case GNUNET_SET_STATUS_DONE:
-      printf ("set 2: done\n");
-      GNUNET_SET_destroy (set2);
-      break;
-    default:
-      GNUNET_assert (0);
+  case GNUNET_SET_STATUS_OK:
+    count++;
+    break;
+  case GNUNET_SET_STATUS_FAILURE:
+    ret = 1;
+    break;
+  case GNUNET_SET_STATUS_DONE:
+    GNUNET_assert (1 == count);
+    GNUNET_SET_destroy (set2);
+    break;
+  default:
+    GNUNET_assert (0);
   }
 }
 
@@ -96,13 +105,11 @@ listen_cb (void *cls,
   struct GNUNET_SET_OperationHandle *oh;
 
   GNUNET_assert (NULL != context_msg);
-
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_TEST);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "listen cb called\n");
   GNUNET_SET_listen_cancel (listen_handle);
-
-  oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_FULL, result_cb_set2, NULL);
+  oh = GNUNET_SET_accept (request,
+                          GNUNET_SET_RESULT_FULL,
+                          &result_cb_set2, NULL);
   GNUNET_SET_commit (oh, set2);
 }
 
@@ -120,12 +127,15 @@ start (void *cls)
 
   context_msg.size = htons (sizeof context_msg);
   context_msg.type = htons (GNUNET_MESSAGE_TYPE_TEST);
-
-  listen_handle = GNUNET_SET_listen (config, GNUNET_SET_OPERATION_INTERSECTION,
-                                     &app_id, listen_cb, NULL);
-  oh = GNUNET_SET_prepare (&local_id, &app_id, &context_msg, 42,
+  listen_handle = GNUNET_SET_listen (config,
+                                     GNUNET_SET_OPERATION_INTERSECTION,
+                                     &app_id,
+                                     &listen_cb, NULL);
+  oh = GNUNET_SET_prepare (&local_id,
+                           &app_id,
+                           &context_msg, 42,
                            GNUNET_SET_RESULT_FULL,
-                           result_cb_set1, NULL);
+                           &result_cb_set1, NULL);
   GNUNET_SET_commit (oh, set1);
 }
 
@@ -140,10 +150,9 @@ init_set2 (void *cls)
 {
   struct GNUNET_SET_Element element;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n");
-
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "initializing set 2\n");
   element.type = 0;
-
   element.data = "hello";
   element.size = strlen(element.data);
   GNUNET_SET_add_element (set2, &element, NULL, NULL);
@@ -152,7 +161,7 @@ init_set2 (void *cls)
   GNUNET_SET_add_element (set2, &element, NULL, NULL);
   element.data = "baz";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set2, &element, start, NULL);
+  GNUNET_SET_add_element (set2, &element, &start, NULL);
 }
 
 
@@ -165,15 +174,12 @@ init_set1 (void)
   struct GNUNET_SET_Element element;
 
   element.type = 0;
-
   element.data = "hello";
   element.size = strlen(element.data);
   GNUNET_SET_add_element (set1, &element, NULL, NULL);
   element.data = "bar";
   element.size = strlen(element.data);
-  GNUNET_SET_add_element (set1, &element, init_set2, NULL);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized set 1\n");
+  GNUNET_SET_add_element (set1, &element, &init_set2, NULL);
 }
 
 
@@ -187,7 +193,6 @@ iter_cb (void *cls,
     GNUNET_SET_destroy (cls);
     return GNUNET_YES;
   }
-  printf ("iter: got element\n");
   iter_count++;
   return GNUNET_YES;
 }
@@ -200,9 +205,7 @@ test_iter ()
   struct GNUNET_SET_Handle *iter_set;
 
   iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_INTERSECTION);
-
   element.type = 0;
-
   element.data = "hello";
   element.size = strlen(element.data);
   GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
@@ -212,8 +215,7 @@ test_iter ()
   element.data = "quux";
   element.size = strlen(element.data);
   GNUNET_SET_add_element (iter_set, &element, NULL, NULL);
-
-  GNUNET_SET_iterate (iter_set, iter_cb, iter_set);
+  GNUNET_SET_iterate (iter_set, &iter_cb, iter_set);
 }
 
 
@@ -231,11 +233,7 @@ run (void *cls,
      struct GNUNET_TESTING_Peer *peer)
 {
   config = cfg;
-  GNUNET_CRYPTO_get_peer_identity (cfg, &local_id);
-  printf ("my id (from CRYPTO): %s\n", GNUNET_i2s (&local_id));
   GNUNET_TESTING_peer_get_identity (peer, &local_id);
-  printf ("my id (from TESTING): %s\n", GNUNET_i2s (&local_id));
-
   test_iter ();
 
   set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_INTERSECTION);
@@ -246,15 +244,14 @@ run (void *cls,
   init_set1 ();
 }
 
+
 int
 main (int argc, char **argv)
 {
   if (0 != GNUNET_TESTING_peer_run ("test_set_api",
                                     "test_set.conf",
                                     &run, NULL))
-  {
-    return 0;
-  }
+    return 1;
   return ret;
 }