[GNUnet-SVN] r22235 - gnunet/src/mesh

[gnunet]

Author: grothoff
Date: 2012-06-23 23:37:20 +0200 (Sat, 23 Jun 2012)
New Revision: 22235

Modified:
   gnunet/src/mesh/Makefile.am
   gnunet/src/mesh/test_mesh_api.c
Log:
-use testing lib

Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-06-23 21:34:01 UTC (rev 22234)
+++ gnunet/src/mesh/Makefile.am 2012-06-23 21:37:20 UTC (rev 22235)
@@ -89,6 +89,7 @@
  test_mesh_api.c
 test_mesh_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/mesh/libgnunetmesh.la
 test_mesh_api_DEPENDENCIES = \
   libgnunetmesh.la \
@@ -98,7 +99,7 @@
  test_mesh_tree_api.c
 test_mesh_tree_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_mesh_tree_api_DEPENDENCIES = \
   libgnunetmesh.la \
   $(top_builddir)/src/dht/libgnunetdht.la

Modified: gnunet/src/mesh/test_mesh_api.c
===================================================================
--- gnunet/src/mesh/test_mesh_api.c     2012-06-23 21:34:01 UTC (rev 22234)
+++ gnunet/src/mesh/test_mesh_api.c     2012-06-23 21:37:20 UTC (rev 22235)
@@ -23,22 +23,21 @@
  * @brief test mesh api: dummy test of callbacks
  * @author Bartlomiej Polot
  */
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_mesh_service.h"
 
-#define VERBOSE 1
-#define VERBOSE_ARM 0
-
-static struct GNUNET_OS_Process *arm_pid;
 static struct GNUNET_MESH_Handle *mesh;
+
 static struct GNUNET_MESH_Tunnel *t;
+
 static int result;
+
 static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-static GNUNET_SCHEDULER_TaskIdentifier test_task;
 
+
 /**
  * Function is called whenever a message is received.
  *
@@ -60,8 +59,10 @@
   return GNUNET_OK;
 }
 
-static struct GNUNET_MESH_MessageHandler handlers[] = { {&callback, 1, 0},
-{NULL, 0, 0}
+
+static struct GNUNET_MESH_MessageHandler handlers[] = { 
+  { &callback, 1, 0 },
+  { NULL, 0, 0 }
 };
 
 
@@ -80,113 +81,57 @@
   {
     GNUNET_MESH_disconnect (mesh);
   }
-  if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  }
-  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
-  GNUNET_OS_process_destroy (arm_pid);
 }
 
+
 static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (0 != test_task)
-  {
-    GNUNET_SCHEDULER_cancel (test_task);
-  }
   result = GNUNET_SYSERR;
   abort_task = 0;
   do_shutdown (cls, tc);
 }
 
+
 static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls, 
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   static const GNUNET_MESH_ApplicationType app[] =
-      { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
+    { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
 
-  test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0;
   mesh = GNUNET_MESH_connect (cfg, 10, NULL, NULL, NULL, handlers, app);
   if (NULL == mesh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh 
:(\n");
+    result = GNUNET_SYSERR;
     return;
   }
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n");
   }
-
   t = GNUNET_MESH_tunnel_create (mesh, NULL, NULL, NULL, NULL);
-
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                 (GNUNET_TIME_UNIT_SECONDS, 5), &do_shutdown,
                                 NULL);
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  GNUNET_log_setup ("test_mesh_api",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  arm_pid =
-      GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm",
-#if VERBOSE_ARM
-                               "-L", "DEBUG",
-#endif
-                               "-c", "test_mesh.conf", NULL);
-
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
                                     NULL);
-
-  test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg);
-
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  int ret;
-
-  char *const argv2[] = { "test-mesh-api",
-    "-c", "test_mesh.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  ret =
-      GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
-                          "test-mesh-api", "nohelp", options, &run, NULL);
-
-  if (GNUNET_OK != ret)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n",
-                ret);
+  if (0 != GNUNET_TESTING_peer_run ("test-mesh-api",
+                                   "test_mesh.conf",
+                                   &run, NULL))
     return 1;
-  }
-  if (GNUNET_SYSERR == result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
-    return 1;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
-  return 0;
+  return (result == GNUNET_OK) ? 0 : 1;
 }
+
+/* end of test_mesh_api.c */
+