trying to fix #3576

[oweals/gnunet.git] / src / fs / test_fs_start_stop.c

diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index 1ec1176a63d58426c7a395b2e3fd0fe58045a143..52c54b752dcab06183a3db368e8238a2184a38ed 100644 (file)
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2004, 2005, 2006, 2009 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
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -17,73 +17,47 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
- * @file applications/fs/fsui/fsui_start_stop_test.c
- * @brief testcase for fsui (start-stop only)
+ * @file fs/test_fs_start_stop.c
+ * @brief testcase for fs.c (start-stop only)
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_fsui_lib.h"
-
-#define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(NULL, 0); goto FAILURE; }
-
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_fs_service.h"
 
-static struct GNUNET_FSUI_Context *ctx;
 
 static void *
-eventCallback (void *cls, const GNUNET_FSUI_Event * event)
+progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
 {
   return NULL;
 }
 
-#define START_DAEMON 1
 
-int
-main (int argc, char *argv[])
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-#if START_DAEMON
-  pid_t daemon;
-#endif
-  int ok;
-  struct GNUNET_GC_Configuration *cfg;
+  struct GNUNET_FS_Handle *fs;
 
-  cfg = GNUNET_GC_create ();
-  if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
-    {
-      GNUNET_GC_free (cfg);
-      return -1;
-    }
-#if START_DAEMON
-  daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
-  GNUNET_GE_ASSERT (NULL, daemon > 0);
-  CHECK (GNUNET_OK ==
-         GNUNET_wait_for_daemon_running (NULL, cfg,
-                                         60 * GNUNET_CRON_SECONDS));
-#endif
-  ok = GNUNET_YES;
-  GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);        /* give apps time to start */
+  fs = GNUNET_FS_start (cfg, "test-fs-start-stop", &progress_cb, NULL,
+                        GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+  GNUNET_assert (NULL != fs);
+  GNUNET_FS_stop (fs);
+}
 
-  /* ACTUAL TEST CODE */
-  ctx = GNUNET_FSUI_start (NULL, cfg, "fsui_start_stop_test", 32, GNUNET_YES,   /* do resume! */
-                           &eventCallback, NULL);
-  CHECK (ctx != NULL);
-  GNUNET_FSUI_stop (ctx);
-  ctx =
-    GNUNET_FSUI_start (NULL, cfg, "fsui_start_stop_test", 32, GNUNET_YES,
-                       &eventCallback, NULL);
-  CHECK (ctx != NULL);
-FAILURE:
-  if (ctx != NULL)
-    GNUNET_FSUI_stop (ctx);
-#if START_DAEMON
-  GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
-#endif
-  GNUNET_GC_free (cfg);
 
-  return (ok == GNUNET_YES) ? 0 : 1;
+int
+main (int argc, char *argv[])
+{
+  if (0 != GNUNET_TESTING_peer_run ("test-fs-start-stop",
+                                   "test_fs_data.conf",
+                                   &run, NULL))
+    return 1;
+  return 0;
 }
 
-/* end of fsui_start_stop_test.c */
+/* end of test_fs_start_stop.c */