LRN: Here's a patch. See if it doesn't break anything for you.

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

diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index ada5ae1715c57e7176bfbe55c3802e70c76406af..0400b505118fdb844c4c977ef252c2c140fa5a53 100644 (file)
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.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)
 
@@ -44,73 +43,54 @@ static const char *plugin_name;
  * some of the data from the last iteration is still there.
  */
 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;
   unsigned int i;
   unsigned int j;
   char buf[3200];
   struct GNUNET_TIME_Absolute exp;
 
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                              cfg,
-                              "testcache");
+  h = GNUNET_DATACACHE_create (cfg, "testcache");
 
   if (h == NULL)
-    {
-      fprintf (stderr,
-              "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
-      return;
-    }
-  exp = GNUNET_TIME_absolute_get ();
-  exp.value += 20 * 60 * 1000;
+  {
+    FPRINTF (stderr, "%s", "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    return;
+  }
+  exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
   memset (buf, 1, sizeof (buf));
-  memset (&k, 0, sizeof (GNUNET_HashCode));
+  memset (&k, 0, sizeof (struct GNUNET_HashCode));
   for (i = 0; i < 10; i++)
+  {
+    FPRINTF (stderr, "%s",  ".");
+    GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
+    for (j = i; j < sizeof (buf); j += 10)
     {
-      fprintf (stderr, ".");
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      for (j = i; j < sizeof (buf); j += 10)
-        {
-         exp.value++;
-          buf[j] = i;
-          ASSERT (GNUNET_OK == 
-                 GNUNET_DATACACHE_put (h,
-                                       &k,
-                                       j,
-                                       buf,
-                                       1+i,
-                                       exp));
-          ASSERT (0 < GNUNET_DATACACHE_get (h, 
-                                           &k, 1+i, 
-                                           NULL, NULL));
-        }
-      k = n;
+      exp.abs_value++;
+      buf[j] = i;
+      ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, &k, j, buf, 1 + i, exp, 0, NULL));
+      ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
     }
-  fprintf (stderr, "\n");
-  memset (&k, 0, sizeof (GNUNET_HashCode));
+    k = n;
+  }
+  FPRINTF (stderr, "%s",  "\n");
+  memset (&k, 0, sizeof (struct GNUNET_HashCode));
   for (i = 0; i < 10; i++)
-    {
-      fprintf (stderr, ".");
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      if (i < 2)
-       ASSERT (0 == GNUNET_DATACACHE_get  (h, 
-                                           &k, 1+i, 
-                                           NULL, NULL));
-      if (i == 9)
-       ASSERT (0 < GNUNET_DATACACHE_get  (h, 
-                                          &k, 1+i, 
-                                          NULL, NULL));
-      k = n;
-    }
-  fprintf (stderr, "\n");
+  {
+    FPRINTF (stderr, "%s",  ".");
+    GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
+    if (i < 2)
+      ASSERT (0 == GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
+    if (i == 9)
+      ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
+    k = n;
+  }
+  FPRINTF (stderr, "%s",  "\n");
   GNUNET_DATACACHE_destroy (h);
   return;
 FAILURE:
@@ -123,41 +103,28 @@ FAILURE:
 int
 main (int argc, char *argv[])
 {
-  const char *pos;
   char cfg_name[128];
-  char *const xargv[] = { 
+  char *const xargv[] = {
     "test-datacache-quota",
     "-c",
     cfg_name,
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
- 
+
   GNUNET_log_setup ("test-datacache-quota",
-#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-quota", "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-quota", "nohelp", options, &run, NULL);
+  if (0 != ok)
+    FPRINTF (stderr, "Missed some testcases: %d\n", ok);
   return ok;
 }