fix

[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 31a9869f3e2713e7ff1a555ccc589905d2202359..7b297f15d1f95fd89286d087ee0758bd66f41abb 100644 (file)
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -89,9 +89,20 @@ testDirectory (unsigned int 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, EXTRACTOR_TITLE, "A title");
-  GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_AUTHOR, "An author");
-  db = GNUNET_FS_directory_builder_create (meta);
+  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 ();
@@ -99,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://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u",
                        p);
+      emsg = NULL;
       uris[p] = GNUNET_FS_uri_parse (uri, &emsg);
       if (uris[p] == NULL)
         {
@@ -118,21 +133,27 @@ testDirectory (unsigned int i)
             }
           GNUNET_free (mds);
           GNUNET_free (uris);
+         GNUNET_free (emsg);
+         GNUNET_CONTAINER_meta_data_destroy (meta);
           ABORT ();             /* error in testcase */
         }
-      GNUNET_FS_directory_builder_add (db, uris[p], mds[p], NULL);
+      GNUNET_assert (emsg == NULL);
     }
   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 took %s\n",
+          "Creating directory with %u entires and total size %llu took %s\n",
           i,
+          (unsigned long long) dlen,
           s);
   GNUNET_free (s);
-  if (i < 1000)
+  if (i < 100)
     {
       cls.pos = 0;
       cls.uri = uris;
@@ -167,10 +188,8 @@ main (int argc, char *argv[])
                    "WARNING",
 #endif
                    NULL);
-  for (i = 17; i < 10000; i *= 2)
+  for (i = 17; i < 1000; i *= 2)
     failureCount += testDirectory (i);    
-  fprintf (stderr, "\n");
-
   if (failureCount != 0)
     return 1;
   return 0;