fixing common off-by-one error with respect to maximum message size

[oweals/gnunet.git] / src / fs / test_fs_directory.c

diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index d643e6ed9799a5ee04a233c60919a33b4bbd68fa..7b297f15d1f95fd89286d087ee0758bd66f41abb 100644 (file)
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -51,6 +51,8 @@ processor (void *cls,
   struct PCLS *p = cls;
   int i;
 
+  if (NULL == uri)
+    return; /* ignore directory's meta data */
   for (i = 0; i < p->max; i++)
     {
       if (GNUNET_CONTAINER_meta_data_test_equal (p->md[i],
@@ -67,8 +69,9 @@ processor (void *cls,
 static int
 testDirectory (unsigned int i)
 {
+  struct GNUNET_FS_DirectoryBuilder *db;
   char *data;
-  unsigned long long dlen;
+  size_t dlen;
   struct GNUNET_FS_Uri **uris;
   struct GNUNET_CONTAINER_MetaData **mds;
   struct GNUNET_CONTAINER_MetaData *meta;
@@ -79,10 +82,27 @@ testDirectory (unsigned int i)
   char uri[512];
   char txt[128];
   int ret = 0;
+  struct GNUNET_TIME_Absolute start;
+  char *s;
 
   cls.max = i;
   uris = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri*) * i);
   mds = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_MetaData*) * i);
+  meta = GNUNET_CONTAINER_meta_data_create ();
+  GNUNET_CONTAINER_meta_data_insert (meta, 
+                                    "<test>",
+                                    EXTRACTOR_METATYPE_TITLE,
+                                    EXTRACTOR_METAFORMAT_UTF8,
+                                    "text/plain",
+                                    "A title",
+                                    strlen("A title")+1);
+  GNUNET_CONTAINER_meta_data_insert (meta, 
+                                    "<test>",
+                                    EXTRACTOR_METATYPE_AUTHOR_NAME, 
+                                    EXTRACTOR_METAFORMAT_UTF8,
+                                    "text/plain",
+                                    "An author",
+                                    strlen ("An author")+1);
   for (p = 0; p < i; p++)
     {
       mds[p] = GNUNET_CONTAINER_meta_data_create ();
@@ -90,14 +110,18 @@ testDirectory (unsigned int i)
         {
           GNUNET_snprintf (txt, sizeof(txt), "%u -- %u\n", p, q);
           GNUNET_CONTAINER_meta_data_insert (mds[p],
-                                   q %
-                                   EXTRACTOR_getHighestKeywordTypeNumber
-                                   (), txt);
+                                            "<test>",
+                                            q % EXTRACTOR_metatype_get_max (),
+                                            EXTRACTOR_METAFORMAT_UTF8,
+                                            "text/plain",
+                                            txt,
+                                            strlen(txt)+1);
         }
       GNUNET_snprintf (uri,
                        sizeof(uri),
-                       "gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u",
+                       "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u",
                        p);
+      emsg = NULL;
       uris[p] = GNUNET_FS_uri_parse (uri, &emsg);
       if (uris[p] == NULL)
         {
@@ -109,31 +133,35 @@ testDirectory (unsigned int i)
             }
           GNUNET_free (mds);
           GNUNET_free (uris);
+         GNUNET_free (emsg);
+         GNUNET_CONTAINER_meta_data_destroy (meta);
           ABORT ();             /* error in testcase */
         }
+      GNUNET_assert (emsg == NULL);
     }
-  meta = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_TITLE, "A title");
-  GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_AUTHOR, "An author");
-  if (GNUNET_OK !=
-      GNUNET_FS_directory_create (&dlen, &data, i, uris, mds, meta))
+  start = GNUNET_TIME_absolute_get ();
+  db = GNUNET_FS_directory_builder_create (meta);
+  for (p = 0; p < i; p++)
+    GNUNET_FS_directory_builder_add (db, uris[p], mds[p], NULL);
+  GNUNET_FS_directory_builder_finish (db,
+                                     &dlen,
+                                     (void**) &data);
+  s = GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start));
+  fprintf (stdout,
+          "Creating directory with %u entires and total size %llu took %s\n",
+          i,
+          (unsigned long long) dlen,
+          s);
+  GNUNET_free (s);
+  if (i < 100)
     {
-      GNUNET_CONTAINER_meta_data_destroy (meta);
-      for (p = 0; p < i; p++)
-        {
-          GNUNET_CONTAINER_meta_data_destroy (mds[p]);
-          GNUNET_FS_uri_destroy (uris[p]);
-        }
-      GNUNET_free (uris);
-      GNUNET_free (mds);
-      ABORT ();
+      cls.pos = 0;
+      cls.uri = uris;
+      cls.md = mds;
+      GNUNET_FS_directory_list_contents (dlen, data, 0, 
+                                        &processor, &cls);
+      GNUNET_assert (cls.pos == i);
     }
-  cls.pos = 0;
-  cls.uri = uris;
-  cls.md = mds;
-  GNUNET_FS_directory_list_contents (dlen, data, 0, 
-                                    &processor, &cls);
-  GNUNET_assert (cls.pos == i);
   GNUNET_free (data);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   for (p = 0; p < i; p++)
@@ -146,19 +174,22 @@ testDirectory (unsigned int i)
   return ret;
 }
 
+
 int
 main (int argc, char *argv[])
 {
   int failureCount = 0;
   int i;
 
-  for (i = 17; i < 2000; i *= 2)
-    {
-      fprintf (stderr, ".");
-      failureCount += testDirectory (i);
-    }
-  fprintf (stderr, "\n");
-
+  GNUNET_log_setup ("test_fs_directory", 
+#if VERBOSE
+                   "DEBUG",
+#else
+                   "WARNING",
+#endif
+                   NULL);
+  for (i = 17; i < 1000; i *= 2)
+    failureCount += testDirectory (i);    
   if (failureCount != 0)
     return 1;
   return 0;