-more debug messages

[oweals/gnunet.git] / src / namestore / test_plugin_namestore.c

diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index b95e9f0c9ecb3e8bc62d0ffae13038db1ef72ba7..45cce861fc7cca0abb9943d3aa74a2f2fdacb468 100644 (file)
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -25,8 +25,8 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_plugin.h"
+#include "gnunet_testing_lib-new.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
 
@@ -102,6 +102,28 @@ test_record (void *cls,
             const struct GNUNET_NAMESTORE_RecordData *rd,
             const struct GNUNET_CRYPTO_RsaSignature *signature)
 {
+  int *idp = cls;
+  int id = *idp;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded tzone_key;
+  char tname[64];
+  unsigned int trd_count = 1 + (id % 1024);
+  struct GNUNET_CRYPTO_RsaSignature tsignature;
+  unsigned int i;
+
+  GNUNET_snprintf (tname, sizeof (tname),
+                  "a%u", (unsigned int ) id);
+  for (i=0;i<trd_count;i++)
+  {
+    GNUNET_assert (rd[i].data_size == id % 10);
+    GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10));
+    GNUNET_assert (rd[i].record_type == 1 + (id % 13));
+    GNUNET_assert (rd[i].flags == (id  % 7));
+  }
+  memset (&tzone_key, (id % 241), sizeof (tzone_key));
+  memset (&tsignature, (id % 243), sizeof (tsignature));
+  GNUNET_assert (0 == strcmp (name, tname));
+  GNUNET_assert (0 == memcmp (&tzone_key, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)));
+  GNUNET_assert (0 == memcmp (&tsignature, signature, sizeof (struct GNUNET_CRYPTO_RsaSignature)));
 }
 
 
@@ -117,6 +139,34 @@ get_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 static void
 put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 {
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
+  struct GNUNET_TIME_Absolute expire;
+  char name[64];
+  unsigned int rd_count = 1 + (id % 1024);
+  struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+  struct GNUNET_CRYPTO_RsaSignature signature;
+  unsigned int i;
+
+  GNUNET_snprintf (name, sizeof (name),
+                  "a%u", (unsigned int ) id);
+  expire = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
+  for (i=0;i<rd_count;i++)
+  {
+    rd[i].data = "Hello World";
+    rd[i].data_size = id % 10;
+    rd[i].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES).abs_value;
+    rd[i].record_type = 1 + (id % 13);
+    rd[i].flags = (id  % 7);    
+  }
+  memset (&zone_key, (id % 241), sizeof (zone_key));
+  memset (&signature, (id % 243), sizeof (signature));
+  GNUNET_assert (GNUNET_OK == nsp->put_records (nsp->cls,
+                                               &zone_key,
+                                               expire,
+                                               name,
+                                               rd_count,
+                                               rd,
+                                               &signature));
 }
 
 
@@ -125,7 +175,8 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_NAMESTORE_PluginFunctions *nsp;  
-  GNUNET_HashCode zone;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
   
   ok = 0;
   nsp = load_plugin (cfg);
@@ -139,7 +190,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   put_record (nsp, 1);
   get_record (nsp, 1);
 
-  memset (&zone, 42, sizeof (zone));  
+  memset (&zone_key, 1, sizeof (zone_key));
+  GNUNET_CRYPTO_short_hash (&zone_key, sizeof (zone_key), &zone);
   nsp->delete_zone (nsp->cls, &zone);
   unload_plugin (nsp);
 }
@@ -148,16 +200,11 @@ run (void *cls, char *const *args, const char *cfgfile,
 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[] = {
@@ -166,25 +213,11 @@ main (int argc, char *argv[])
 
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-plugin-namestore-sqlite");
   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;
-
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   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)