-do not call get callback after get_cancel

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

diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index c5acf365aa74d538481d890b2c3efe7349551cfb..8c429cc7a09918145b1a04772c3fbf4c7606eef1 100644 (file)
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -25,8 +25,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
-
-#define VERBOSE GNUNET_NO
+#include "gnunet_testing_lib.h"
 
 #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
 
@@ -39,81 +38,75 @@ static const char *plugin_name;
 
 
 static int
-checkIt (void *cls,
+checkIt (void *cls, 
+         const struct GNUNET_HashCode *key, 
+        size_t size, const char *data,
+         enum GNUNET_BLOCK_Type type,
         struct GNUNET_TIME_Absolute exp,
-        const GNUNET_HashCode * key,
-         uint32_t size, 
-        const char *data, 
-        enum GNUNET_BLOCK_Type type)
+        unsigned int path_len,
+        const struct GNUNET_PeerIdentity *path)
 {
-  if (size != sizeof (GNUNET_HashCode))
-    {
-      printf ("ERROR: Invalid size\n");
-      ok = 2;
-    }
+  if (size != sizeof (struct GNUNET_HashCode))
+  {
+    GNUNET_break (0);
+    ok = 2;
+  }
   if (0 != memcmp (data, cls, size))
-    {
-      printf ("ERROR: Invalid data\n");
-      ok = 3;
-    }
+  {
+    GNUNET_break (0);
+    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;
-  GNUNET_HashCode k;
-  GNUNET_HashCode n;
+  struct GNUNET_HashCode k;
+  struct GNUNET_HashCode n;
   struct GNUNET_TIME_Absolute exp;
   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;
-  memset (&k, 0, sizeof (GNUNET_HashCode));
+  exp.abs_value += 5 * 60 * 1000;
+  memset (&k, 0, sizeof (struct 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;
-    }
-  memset (&k, 0, sizeof (GNUNET_HashCode));
+  {
+    GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
+    ASSERT (GNUNET_OK ==
+            GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
+                                  (const char *) &n, 1 + i % 16, exp, 
+                                 0, NULL));
+    k = n;
+  }
+  memset (&k, 0, sizeof (struct 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;
-    }
-
-  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_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
+    ASSERT (1 == GNUNET_DATACACHE_get (h, &k, 1 + i % 16, &checkIt, &n));
+    k = n;
+  }
+
+  memset (&k, 42, sizeof (struct GNUNET_HashCode));
+  GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
+  ASSERT (GNUNET_OK ==
+          GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
+                                (const char *) &n, 792,
+                                GNUNET_TIME_UNIT_FOREVER_ABS,
+                               0, NULL));
+  ASSERT (0 != GNUNET_DATACACHE_get (h, &k, 792, &checkIt, &n));
 
   GNUNET_DATACACHE_destroy (h);
   ASSERT (ok == 0);
@@ -128,15 +121,11 @@ FAILURE:
 int
 main (int argc, char *argv[])
 {
-  const char *pos;
   char cfg_name[128];
-  char *const xargv[] = { 
+  char *const xargv[] = {
     "test-datacache",
     "-c",
     cfg_name,
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -144,25 +133,15 @@ main (int argc, char *argv[])
   };
 
   GNUNET_log_setup ("test-datacache",
-#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;
-  GNUNET_snprintf (cfg_name,
-                  sizeof (cfg_name),
-                  "test_datacache_data_%s.conf",
-                  plugin_name);
-  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);
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+  GNUNET_snprintf (cfg_name, sizeof (cfg_name), "test_datacache_data_%s.conf",
+                   plugin_name);
+  GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
+                      "test-datacache", "nohelp", options, &run, NULL);
+  if (0 != ok)
+    FPRINTF (stderr, "Missed some testcases: %d\n", ok);
   return ok;
 }