[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33418 - in gnunet/src: multicast psyc social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33418 - in gnunet/src: multicast psyc social |
Date: |
Tue, 27 May 2014 13:23:24 +0200 |
Author: tg
Date: 2014-05-27 13:23:23 +0200 (Tue, 27 May 2014)
New Revision: 33418
Added:
gnunet/src/multicast/test_multicast.conf
Modified:
gnunet/src/multicast/Makefile.am
gnunet/src/multicast/test_multicast.c
gnunet/src/psyc/test_psyc.c
gnunet/src/social/test_social.c
Log:
multicast: run testing peer
Modified: gnunet/src/multicast/Makefile.am
===================================================================
--- gnunet/src/multicast/Makefile.am 2014-05-27 11:10:35 UTC (rev 33417)
+++ gnunet/src/multicast/Makefile.am 2014-05-27 11:23:23 UTC (rev 33418)
@@ -66,5 +66,10 @@
test_multicast_SOURCES = \
test_multicast.c
test_multicast_LDADD = \
+ libgnunetmulticast.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-
+test_multicast_DEPENDENCIES = \
+ libgnunetmulticast.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
Modified: gnunet/src/multicast/test_multicast.c
===================================================================
--- gnunet/src/multicast/test_multicast.c 2014-05-27 11:10:35 UTC (rev
33417)
+++ gnunet/src/multicast/test_multicast.c 2014-05-27 11:23:23 UTC (rev
33418)
@@ -1,44 +1,156 @@
/*
- This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ * This file is part of GNUnet
+ * (C) 2013 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 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.
+ */
- 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 multicast/test_multicast.c
- * @brief testcase for multicast_api.c
+ * @brief Tests for the Multicast API.
+ * @author Gabor X Toth
*/
+
+#include <inttypes.h>
+
#include "platform.h"
+#include "gnunet_crypto_lib.h"
+#include "gnunet_common.h"
#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_multicast_service.h"
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-static int
-check ()
+#define DEBUG_SERVICE 0
+
+/**
+ * Return value from 'main'.
+ */
+static int res;
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Handle for task for timeout termination.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier end_badly_task;
+
+
+/**
+ * Clean up all resources used.
+ */
+static void
+cleanup ()
{
- return 0;
+
}
-int
-main (int argc, char *argv[])
+
+/**
+ * Terminate the test case (failure).
+ *
+ * @param cls NULL
+ * @param tc scheduler context
+ */
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- int ret;
+ res = 1;
+ cleanup ();
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test FAILED.\n");
+}
- ret = check ();
- return ret;
+/**
+ * Terminate the test case (success).
+ *
+ * @param cls NULL
+ * @param tc scheduler context
+ */
+static void
+end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ res = 0;
+ cleanup ();
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test PASSED.\n");
}
+
+/**
+ * Finish the test case (successfully).
+ */
+static void
+end ()
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending tests.\n");
+
+ if (end_badly_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (end_badly_task);
+ end_badly_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+ &end_normally, NULL);
+}
+
+
+/**
+ * Main function of the test, run from scheduler.
+ *
+ * @param cls NULL
+ * @param cfg configuration we use (also to connect to Multicast service)
+ * @param peer handle to access more of the peer (not used)
+ */
+static void
+#if DEBUG_SERVICE
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
+#else
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_TESTING_Peer *peer)
+#endif
+{
+ cfg = c;
+ end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+ /* FIXME: add tests */
+
+ end ();
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ res = 1;
+#if DEBUG_SERVICE
+ const struct GNUNET_GETOPT_CommandLineOption opts[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, "test-multicast",
+ "test-multicast [options]",
+ opts, &run, NULL))
+ return 1;
+#else
+ if (0 != GNUNET_TESTING_peer_run ("test-multicast", "test_multicast.conf",
&run, NULL))
+ return 1;
+#endif
+ return res;
+}
+
/* end of test_multicast.c */
Added: gnunet/src/multicast/test_multicast.conf
===================================================================
--- gnunet/src/multicast/test_multicast.conf (rev 0)
+++ gnunet/src/multicast/test_multicast.conf 2014-05-27 11:23:23 UTC (rev
33418)
@@ -0,0 +1,2 @@
+[arm]
+DEFAULTSERVICES = cadet multicast
Modified: gnunet/src/psyc/test_psyc.c
===================================================================
--- gnunet/src/psyc/test_psyc.c 2014-05-27 11:10:35 UTC (rev 33417)
+++ gnunet/src/psyc/test_psyc.c 2014-05-27 11:23:23 UTC (rev 33418)
@@ -20,7 +20,7 @@
/**
* @file psyc/test_psyc.c
- * @brief Test for the PSYC service.
+ * @brief Tests for the PSYC API.
* @author Gabor X Toth
* @author Christian Grothoff
*/
Modified: gnunet/src/social/test_social.c
===================================================================
--- gnunet/src/social/test_social.c 2014-05-27 11:10:35 UTC (rev 33417)
+++ gnunet/src/social/test_social.c 2014-05-27 11:23:23 UTC (rev 33418)
@@ -20,9 +20,8 @@
/**
* @file social/test_social.c
- * @brief Test for the SOCIAL service.
+ * @brief Tests for the Social API.
* @author Gabor X Toth
- * @author Christian Grothoff
*/
#include <inttypes.h>
@@ -114,7 +113,7 @@
* Main function of the test, run from scheduler.
*
* @param cls NULL
- * @param cfg configuration we use (also to connect to SOCIAL service)
+ * @param cfg configuration we use (also to connect to Social service)
* @param peer handle to access more of the peer (not used)
*/
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33418 - in gnunet/src: multicast psyc social,
gnunet <=