-fix

[oweals/gnunet.git] / src / datacache / test_datacache.c

diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index c896b667b4a467cc199cc062630e9ede7d224053..d8d2f05db7d1317dd50c217a5a0d522ce6112185 100644 (file)
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2006, 2009, 2010 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
@@ -32,34 +32,33 @@
 
 static int ok;
 
+/**
+ * Name of plugin under test.
+ */
+static const char *plugin_name;
+
 
 static int
-checkIt (void *cls,
-        struct GNUNET_TIME_Absolute exp,
-        const GNUNET_HashCode * key,
-         uint32_t size, 
-        const char *data, 
-        uint32_t type)
+checkIt (void *cls, struct GNUNET_TIME_Absolute exp,
+         const GNUNET_HashCode * key, size_t size, const char *data,
+         enum GNUNET_BLOCK_Type type)
 {
   if (size != sizeof (GNUNET_HashCode))
-    {
-      printf ("ERROR: Invalid size\n");
-      ok = 2;
-    }
+  {
+    printf ("ERROR: Invalid size\n");
+    ok = 2;
+  }
   if (0 != memcmp (data, cls, size))
-    {
-      printf ("ERROR: Invalid data\n");
-      ok = 3;
-    }
+  {
+    printf ("ERROR: Invalid data\n");
+    ok = 3;
+  }
   return GNUNET_OK;
 }
 
 
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_DATACACHE_Handle *h;
@@ -69,34 +68,41 @@ run (void *cls,
   unsigned int i;
 
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                              cfg,
-                              "testcache");
-
-  ASSERT (NULL != h);
+  h = GNUNET_DATACACHE_create (cfg, "testcache");
+  if (h == NULL)
+  {
+    FPRINTF (stderr,
+             "%s", 
+            "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    return;
+  }
   exp = GNUNET_TIME_absolute_get ();
-  exp.value += 5 * 60 * 1000;
+  exp.abs_value += 5 * 60 * 1000;
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 100; i++)
-    {
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h,
-                                                &k,
-                                                sizeof (GNUNET_HashCode),
-                                                (const char *) &n,
-                                                1+i%16,
-                                                exp));
-      k = n;
-    }
+  {
+    GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
+    ASSERT (GNUNET_OK ==
+            GNUNET_DATACACHE_put (h, &k, sizeof (GNUNET_HashCode),
+                                  (const char *) &n, 1 + i % 16, exp));
+    k = n;
+  }
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 100; i++)
-    {
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      ASSERT (1 == 
-             GNUNET_DATACACHE_get (h, &k, 1+i%16,
-                                   &checkIt, &n));
-      k = n;
-    }
+  {
+    GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
+    ASSERT (1 == GNUNET_DATACACHE_get (h, &k, 1 + i % 16, &checkIt, &n));
+    k = n;
+  }
+
+  memset (&k, 42, sizeof (GNUNET_HashCode));
+  GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
+  ASSERT (GNUNET_OK ==
+          GNUNET_DATACACHE_put (h, &k, sizeof (GNUNET_HashCode),
+                                (const char *) &n, 792,
+                                GNUNET_TIME_UNIT_FOREVER_ABS));
+  ASSERT (0 != GNUNET_DATACACHE_get (h, &k, 792, &checkIt, &n));
+
   GNUNET_DATACACHE_destroy (h);
   ASSERT (ok == 0);
   return;
@@ -107,12 +113,16 @@ FAILURE:
 }
 
 
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
-  char *const argv[] = { "test-datacache-api",
+  char *pos;
+  char cfg_name[128];
+
+  char *const xargv[] = {
+    "test-datacache",
     "-c",
-    "test_datacache_data.conf",
+    cfg_name,
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -121,30 +131,32 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-datacache-api", "nohelp",
-                      options, &run, NULL);
-  if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %d\n", ok);
-  return ok;
-}
-
 
-int
-main (int argc, char *argv[])
-{
-  int ret;
-  
-  GNUNET_log_setup ("test-datacache-api",
+  GNUNET_log_setup ("test-datacache",
 #if VERBOSE
                     "DEBUG",
 #else
                     "WARNING",
 #endif
                     NULL);
-  ret = check ();
-
-  return ret;
+  /* 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_datacache_data_%s.conf",
+                   plugin_name);
+  if (pos != plugin_name)
+    pos[0] = '.';
+  GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
+                      "test-datacache", "nohelp", options, &run, NULL);
+  if (ok != 0)
+    FPRINTF (stderr, "Missed some testcases: %d\n", ok);
+  return ok;
 }
 
 /* end of test_datacache.c */