[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19936 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19936 - gnunet/src/namestore |
Date: |
Wed, 22 Feb 2012 16:00:40 +0100 |
Author: grothoff
Date: 2012-02-22 16:00:40 +0100 (Wed, 22 Feb 2012)
New Revision: 19936
Added:
gnunet/src/namestore/test_plugin_namestore.c
gnunet/src/namestore/test_plugin_namestore_sqlite.conf
Modified:
gnunet/src/namestore/Makefile.am
gnunet/src/namestore/plugin_namestore_sqlite.c
Log:
-testcase harness
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2012-02-22 14:36:20 UTC (rev 19935)
+++ gnunet/src/namestore/Makefile.am 2012-02-22 15:00:40 UTC (rev 19936)
@@ -16,8 +16,14 @@
XLIBS = -lgcov
endif
+if HAVE_SQLITE
+SQLITE_TESTS = \
+ test_plugin_namestore_sqlite
+endif
+
check_PROGRAMS = \
+ $(SQLITE_TESTS) \
test_namestore_api
lib_LTLIBRARIES = \
@@ -66,6 +72,11 @@
$(top_builddir)/src/namestore/libgnunetnamestore.la
EXTRADIST = \
- test_namestore_api.conf
+ test_namestore_api.conf \
+ test_plugin_namestore_sqlite.conf
-
\ No newline at end of file
+
+test_plugin_namestore_sqlite_SOURCES = \
+ test_plugin_namestore.c
+test_plugin_namestore_sqlite_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c 2012-02-22 14:36:20 UTC
(rev 19935)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c 2012-02-22 15:00:40 UTC
(rev 19936)
@@ -353,7 +353,7 @@
(plugin->dbh,
"INSERT INTO ns090signatures (zone_hash, zone_revision, zone_time,
zone_root_hash, "
"zone_root_depth, zone_public_key, zone_signature) "
- "VALUES (?, ?, ?, ?, ?, ?)",
+ "VALUES (?, ?, ?, ?, ?, ?, ?)",
&plugin->put_signature) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
@@ -372,15 +372,15 @@
&plugin->get_signature) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "DELETE FROM gn090records WHERE zone_hash=?",
+ "DELETE FROM ns090records WHERE zone_hash=?",
&plugin->delete_zone_records) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "DELETE FROM gn090nodes WHERE zone_hash=?",
+ "DELETE FROM ns090nodes WHERE zone_hash=?",
&plugin->delete_zone_nodes) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "DELETE FROM gn090signatures WHERE zone_hash=?",
+ "DELETE FROM ns090signatures WHERE zone_hash=?",
&plugin->delete_zone_signatures) != SQLITE_OK) )
{
LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling");
Added: gnunet/src/namestore/test_plugin_namestore.c
===================================================================
--- gnunet/src/namestore/test_plugin_namestore.c
(rev 0)
+++ gnunet/src/namestore/test_plugin_namestore.c 2012-02-22 15:00:40 UTC
(rev 19936)
@@ -0,0 +1,149 @@
+/*
+ This file is part of GNUnet.
+ (C) 2012 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.
+*/
+/*
+ * @file namestore/test_plugin_namestore.c
+ * @brief Test for the namestore plugins
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_namestore_plugin.h"
+
+#define VERBOSE GNUNET_EXTRA_LOGGING
+
+#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__,
__LINE__); goto FAILURE;} } while (0)
+
+static int ok;
+
+/**
+ * Name of plugin under test.
+ */
+static const char *plugin_name;
+
+
+/**
+ * Function called when the service shuts down. Unloads our namestore
+ * plugin.
+ *
+ * @param api api to unload
+ */
+static void
+unload_plugin (struct GNUNET_NAMESTORE_PluginFunctions *api)
+{
+ char *libname;
+
+ GNUNET_asprintf (&libname, "libgnunet_plugin_namestore_%s", plugin_name);
+ GNUNET_break (NULL == GNUNET_PLUGIN_unload (libname, api));
+ GNUNET_free (libname);
+}
+
+
+/**
+ * Load the namestore plugin.
+ *
+ * @param cfg configuration to pass
+ * @return NULL on error
+ */
+static struct GNUNET_NAMESTORE_PluginFunctions *
+load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_NAMESTORE_PluginFunctions *ret;
+ char *libname;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading `%s' namestore plugin\n"),
+ plugin_name);
+ GNUNET_asprintf (&libname, "libgnunet_plugin_namestore_%s", plugin_name);
+ if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void*) cfg)))
+ {
+ FPRINTF (stderr, "Failed to load plugin `%s'!\n", plugin_name);
+ return NULL;
+ }
+ GNUNET_free (libname);
+ return ret;
+}
+
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_NAMESTORE_PluginFunctions *nsp;
+
+ ok = 0;
+ nsp = load_plugin (cfg);
+ if (NULL == nsp)
+ {
+ FPRINTF (stderr,
+ "%s",
+ "Failed to initialize namestore. Database likely not setup,
skipping test.\n");
+ return;
+ }
+
+ unload_plugin (nsp);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ char *pos;
+ char cfg_name[128];
+
+ char *const xargv[] = {
+ "test-plugin-namestore",
+ "-c",
+ cfg_name,
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_log_setup ("test-plugin-namestore",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ /* determine name of plugin to use */
+ plugin_name = argv[0];
+ while (NULL != (pos = strstr (plugin_name, "_")))
+ plugin_name = pos + 1;
+ if (NULL != (pos = strstr (plugin_name, ".")))
+ pos[0] = 0;
+ else
+ pos = (char *) plugin_name;
+
+ GNUNET_snprintf (cfg_name, sizeof (cfg_name),
"test_plugin_namestore_%s.conf",
+ plugin_name);
+ if (pos != plugin_name)
+ pos[0] = '.';
+ GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
+ "test-plugin-namestore", "nohelp", options, &run, NULL);
+ if (ok != 0)
+ FPRINTF (stderr, "Missed some testcases: %d\n", ok);
+ return ok;
+}
+
+/* end of test_plugin_namestore.c */
Added: gnunet/src/namestore/test_plugin_namestore_sqlite.conf
===================================================================
--- gnunet/src/namestore/test_plugin_namestore_sqlite.conf
(rev 0)
+++ gnunet/src/namestore/test_plugin_namestore_sqlite.conf 2012-02-22
15:00:40 UTC (rev 19936)
@@ -0,0 +1,2 @@
+[namestore-sqlite]
+FILENAME = $SERVICEHOME/namestore/sqlite.db
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19936 - gnunet/src/namestore,
gnunet <=