-fix URIs

[oweals/gnunet.git] / src / testing / test_testing_peerstartup2.c

diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c
index 45d2280c79e5c1fc93cae0a7410159b5f9055241..2bdae72ebeb2290f579d0a358b15723ae87985b8 100644 (file)
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -21,18 +21,29 @@
 /**
  * @file testing/test_testing_new_peerstartup.c
  * @brief test case for testing peer startup and shutdown using new testing
- *          library 
+ *          library
  * @author Sree Harsha Totakura
  */
 
 #include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                           \
   GNUNET_log (kind, __VA_ARGS__)
 
+
+#define FAIL_TEST(cond)                         \
+  do {                                          \
+    if (!(cond)) {                              \
+      GNUNET_break (0);                         \
+      if (GNUNET_OK == status) {                \
+        status = GNUNET_SYSERR;                 \
+      }                                         \
+    }                                           \
+  } while (0)                                   \
+
+
 /**
  * The status of the test
  */
@@ -47,7 +58,7 @@ struct TestingContext
    * The testing system
    */
   struct GNUNET_TESTING_System *system;
-  
+
   /**
    * The peer which has been started by the testing system
    */
@@ -57,6 +68,17 @@ struct TestingContext
    * The running configuration of the peer
    */
   struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * State
+   */
+  enum {
+    PEER_INIT,
+
+    PEER_STARTED,
+
+    PEER_STOPPED
+  } state;
 };
 
 
@@ -72,15 +94,38 @@ do_shutdown2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL != test_ctx->system)
     GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
   GNUNET_free (test_ctx);
-  
+
 }
 
+
+/**
+ * Task for shutdown
+ *
+ * @param cls the testing context
+ * @param tc the tast context
+ */
 static void
-peer_stop_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+static void
+peer_status_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
 {
-  GNUNET_break (GNUNET_NO == success);
-  status = GNUNET_OK;
-  GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
+  struct TestingContext *test_ctx = cls;
+
+  switch (test_ctx->state)
+  {
+  case PEER_INIT:
+    FAIL_TEST (0);
+    break;
+  case PEER_STARTED:
+    FAIL_TEST (GNUNET_YES == success);
+    test_ctx->state = PEER_STOPPED;
+    GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
+    break;
+  case PEER_STOPPED:
+    FAIL_TEST (0);
+  }
 }
 
 
@@ -98,22 +143,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (NULL != test_ctx);
   if (NULL != test_ctx->peer)
   {
-    GNUNET_break (GNUNET_OK == GNUNET_TESTING_peer_stop2 (test_ctx->peer,
-                                                          &peer_stop_cb,
-                                                          test_ctx));
+    FAIL_TEST (GNUNET_OK ==
+               GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+                                               &peer_status_cb,
+                                               test_ctx));
   }
   else
-    do_shutdown (test_ctx, tc);
-}
-
-static void
-ps_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
-{
-  struct TestingContext *test_ctx = cls;
-
-  GNUNET_break (GNUNET_YES == success);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &do_shutdown, test_ctx);  
+    do_shutdown2 (test_ctx, tc);
 }
 
 
@@ -128,15 +164,15 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *emsg;
   struct GNUNET_PeerIdentity id;
 
-  test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
-  test_ctx->system = 
+  test_ctx = GNUNET_new (struct TestingContext);
+  test_ctx->system =
       GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                    "127.0.0.1", NULL);
+                                    "127.0.0.1", NULL, NULL);
   emsg = NULL;
   if (NULL == test_ctx->system)
     goto end;
   test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  test_ctx->peer = 
+  test_ctx->peer =
       GNUNET_TESTING_peer_configure (test_ctx->system,
                                      test_ctx->cfg,
                                      0, &id, &emsg);
@@ -146,12 +182,20 @@ run (void *cls, char *const *args, const char *cfgfile,
       printf ("Test failed upon error: %s", emsg);
     goto end;
   }
-  if (GNUNET_OK != GNUNET_TESTING_peer_start2 (test_ctx->peer,
-                                               &ps_cb, test_ctx))
+  if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
     goto end;
+  test_ctx->state = PEER_STARTED;
+  FAIL_TEST (GNUNET_OK ==
+             GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+                                             &peer_status_cb,
+                                             test_ctx));
+  GNUNET_TESTING_peer_stop_async_cancel (test_ctx->peer);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                &do_shutdown, test_ctx);
   return;
-  
+
  end:
+  FAIL_TEST (0);
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
   GNUNET_free_non_null (emsg);
 }
@@ -163,7 +207,7 @@ int main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  status = GNUNET_SYSERR;
+  status = GNUNET_OK;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv,
                           "test_testing_new_peerstartup",