4 files changed, 168 insertions, 6 deletions

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 5e7f1cbfd..20c07f707 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -16,8 +16,14 @@ if USE_COVERAGE
   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 @@ test_namestore_api_LDADD = \
   $(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  
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 9a218f4bc..3c20b0d7f 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -353,7 +353,7 @@ database_setup (struct Plugin *plugin)
        (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 @@ database_setup (struct Plugin *plugin)
         &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");
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
new file mode 100644
index 000000000..01f73df8e
--- /dev/null
+++ b/src/namestore/test_plugin_namestore.c
@@ -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 */
diff --git a/src/namestore/test_plugin_namestore_sqlite.conf b/src/namestore/test_plugin_namestore_sqlite.conf
new file mode 100644
index 000000000..8f95b65bf
--- /dev/null
+++ b/src/namestore/test_plugin_namestore_sqlite.conf
@@ -0,0 +1,2 @@
+[namestore-sqlite]
+FILENAME = $SERVICEHOME/namestore/sqlite.db