[GNUnet-SVN] r29762 - gnunet/src/conversation

[gnunet]

Author: fuchs
Date: 2013-10-01 14:44:50 +0200 (Tue, 01 Oct 2013)
New Revision: 29762

Added:
   gnunet/src/conversation/test_conversation_api.c
Removed:
   gnunet/src/conversation/test_voip.api.c
Log:
Added test file for conversation

Copied: gnunet/src/conversation/test_conversation_api.c (from rev 29761, 
gnunet/src/conversation/test_voip.api.c)
===================================================================
--- gnunet/src/conversation/test_conversation_api.c                             
(rev 0)
+++ gnunet/src/conversation/test_conversation_api.c     2013-10-01 12:44:50 UTC 
(rev 29762)
@@ -0,0 +1,85 @@
+/*
+     This file is part of GNUnet.
+     (C)
+
+     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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file src/test_conversation_api.c
+ * @brief testcase for conversation_api.c
+ */
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include "gnunet_conversation_service.h"
+
+
+static int ok = 1;
+
+
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  ok = 0;
+}
+
+
+static int
+check ()
+{
+  char *const argv[] = { "test-conversation-api", NULL };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  struct GNUNET_OS_Process *proc;
+  char *path = GNUNET_OS_get_libexec_binary_path ( 
"gnunet-service-conversation");
+  if (NULL == path)
+  {
+               fprintf (stderr, "Service executable not found `%s'\n", 
"gnunet-service-conversation");
+               return;
+  }
+  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, 
NULL,
+                               path,
+                                 "gnunet-service-conversation",
+                                 NULL);
+
+  GNUNET_free (path);
+  GNUNET_assert (NULL != proc);
+  GNUNET_PROGRAM_run (1, argv, "test-ext-conversation", "nohelp",
+                      options, &run, &ok);
+  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      ok = 1;
+    }
+  GNUNET_OS_process_wait (proc);
+  GNUNET_OS_process_destroy (proc);
+  return ok;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  GNUNET_log_setup ("test_conversation_api", 
+                   "WARNING",
+                   NULL);
+  return check ();
+}
+
+/* end of test_conversation_api.c */

Deleted: gnunet/src/conversation/test_voip.api.c
===================================================================
--- gnunet/src/conversation/test_voip.api.c     2013-10-01 12:30:55 UTC (rev 
29761)
+++ gnunet/src/conversation/test_voip.api.c     2013-10-01 12:44:50 UTC (rev 
29762)
@@ -1,85 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C)
-
-     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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file voip/src/test_voip_api.c
- * @brief testcase for voip_api.c
- */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "gnunet_voip_service.h"
-
-
-static int ok = 1;
-
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  ok = 0;
-}
-
-
-static int
-check ()
-{
-  char *const argv[] = { "test-voip-api", NULL };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  struct GNUNET_OS_Process *proc;
-  char *path = GNUNET_OS_get_libexec_binary_path ( "gnunet-service-voip");
-  if (NULL == path)
-  {
-               fprintf (stderr, "Service executable not found `%s'\n", 
"gnunet-service-voip");
-               return;
-  }
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, 
NULL,
-                               path,
-                                 "gnunet-service-voip",
-                                 NULL);
-
-  GNUNET_free (path);
-  GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run (1, argv, "test-ext-voip", "nohelp",
-                      options, &run, &ok);
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      ok = 1;
-    }
-  GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_destroy (proc);
-  return ok;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  GNUNET_log_setup ("test_voip_api", 
-                   "WARNING",
-                   NULL);
-  return check ();
-}
-
-/* end of test_voip_api.c */