1 files changed, 3 insertions, 139 deletions

diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index f18014719..90f0121d4 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -25,6 +25,7 @@
  */
 
 
+
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #define TESTSTRING "testString"
@@ -39,25 +40,18 @@ test_normal_rw (void)
   void *buffer;
   size_t buffer_size = 0;
   char *filename = GNUNET_DISK_mktemp ("gnunet-bio");
-  struct GNUNET_CONTAINER_MetaData *mdW;
-  struct GNUNET_CONTAINER_MetaData *mdR = NULL;
   char *rString = NULL;
   int64_t wNum = TESTNUMBER64;
   int64_t rNum = 0;
 
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
-
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_string ("test-normal-rw-string", TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-normal-rw-metadata", mdW),
     GNUNET_BIO_write_spec_int64 ("test-normal-rw-int64", &wNum),
     GNUNET_BIO_write_spec_end (),
   };
 
   struct GNUNET_BIO_ReadSpec rs[] = {
     GNUNET_BIO_read_spec_string ("test-normal-rw-string", &rString, 200),
-    GNUNET_BIO_read_spec_meta_data ("test-normal-rw-metadata", &mdR),
     GNUNET_BIO_read_spec_int64 ("test-normal-rw-int64", &rNum),
     GNUNET_BIO_read_spec_end (),
   };
@@ -73,11 +67,8 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
   GNUNET_free (filename);
 
@@ -97,14 +88,10 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
   GNUNET_free (buffer);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdW);
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   return 0;
 }
 
@@ -200,45 +187,6 @@ test_bigstring_rw (void)
 
 
 static int
-test_bigmeta_rw (void)
-{
-  static char meta[1024 * 1024 * 10];
-  struct GNUNET_BIO_WriteHandle *wh;
-  struct GNUNET_BIO_ReadHandle *rh;
-  char *filename = GNUNET_DISK_mktemp ("gnunet_bio");
-  struct GNUNET_CONTAINER_MetaData *mdR = NULL;
-
-  memset (meta, 'b', sizeof (meta));
-  meta[sizeof (meta) - 1] = '\0';
-
-  wh = GNUNET_BIO_write_open_file (filename);
-  GNUNET_assert (NULL != wh);
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_int32 (wh,
-                                                      "test-bigmeta-rw-int32",
-                                                      sizeof (meta)));
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write (wh,
-                                                "test-bigmeta-rw-bytes",
-                                                meta,
-                                                sizeof (meta)));
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_close (wh, NULL));
-
-  rh = GNUNET_BIO_read_open_file (filename);
-  GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-bigmeta-rw-metadata",
-                                            &mdR));
-  GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
-
-  GNUNET_assert (NULL == mdR);
-
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
-  GNUNET_free (filename);
-  return 0;
-}
-
-
-static int
 test_directory_r (void)
 {
 #ifdef LINUX
@@ -267,12 +215,12 @@ test_nullfile_rw (void)
   memset (filename, 'a', sizeof (filename));
   filename[sizeof (filename) - 1] = '\0';
 
-  GNUNET_log_skip (2, GNUNET_NO);
+  GNUNET_log_skip (1, GNUNET_NO);
   wh = GNUNET_BIO_write_open_file (filename);
   GNUNET_log_skip (0, GNUNET_YES);
   GNUNET_assert (NULL == wh);
 
-  GNUNET_log_skip (2, GNUNET_NO);
+  GNUNET_log_skip (1, GNUNET_NO);
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_log_skip (0, GNUNET_YES);
   GNUNET_assert (NULL == rh);
@@ -290,11 +238,6 @@ test_fullfile_rw (void)
   struct GNUNET_BIO_ReadHandle *rh;
   char *rString = NULL;
   char rResult[200];
-  struct GNUNET_CONTAINER_MetaData *mdW;
-  struct GNUNET_CONTAINER_MetaData *mdR = NULL;
-
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
 
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_object ("test-fullfile-rw-bytes",
@@ -302,8 +245,6 @@ test_fullfile_rw (void)
                                   strlen (TESTSTRING)),
     GNUNET_BIO_write_spec_string ("test-fullfile-rw-string",
                                   TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-fullfile-rw-metadata",
-                                     mdW),
     GNUNET_BIO_write_spec_end (),
   };
 
@@ -314,8 +255,6 @@ test_fullfile_rw (void)
     GNUNET_BIO_read_spec_string ("test-fullfile-rw-string",
                                  &rString,
                                  200),
-    GNUNET_BIO_read_spec_meta_data ("test-fullfile-rw-metadata",
-                                    &mdR),
     GNUNET_BIO_read_spec_end (),
   };
 
@@ -330,7 +269,6 @@ test_fullfile_rw (void)
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == rString);
-  GNUNET_assert (NULL == mdR);
 #endif
   return 0;
 }
@@ -368,69 +306,6 @@ test_fakestring_rw (void)
 
 
 static int
-test_fakemeta_rw (void)
-{
-  struct GNUNET_BIO_WriteHandle *wh;
-  struct GNUNET_BIO_ReadHandle *rh;
-  char *filename = GNUNET_DISK_mktemp ("gnunet_bio");
-  struct GNUNET_CONTAINER_MetaData *mdR = NULL;
-
-  wh = GNUNET_BIO_write_open_file (filename);
-  GNUNET_assert (NULL != wh);
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_int32 (wh,
-                                                      "test-fakestring-rw-int32",
-                                                      2));
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_close (wh, NULL));
-
-  rh = GNUNET_BIO_read_open_file (filename);
-  GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakestring-rw-metadata",
-                                            &mdR));
-  GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
-
-  GNUNET_assert (NULL == mdR);
-
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
-  GNUNET_free (filename);
-  return 0;
-}
-
-
-static int
-test_fakebigmeta_rw (void)
-{
-  struct GNUNET_BIO_WriteHandle *wh;
-  struct GNUNET_BIO_ReadHandle *rh;
-  char *filename = GNUNET_DISK_mktemp ("gnunet_bio");
-  struct GNUNET_CONTAINER_MetaData *mdR = NULL;
-  int32_t wNum = 1024 * 1024 * 10;
-
-  wh = GNUNET_BIO_write_open_file (filename);
-  GNUNET_assert (NULL != wh);
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_int32 (wh,
-                                                      "test-fakebigmeta-rw-int32",
-                                                      wNum));
-  GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_close (wh, NULL));
-
-  rh = GNUNET_BIO_read_open_file (filename);
-  GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakebigmeta-rw-metadata",
-                                            &mdR));
-  GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
-
-  GNUNET_assert (NULL == mdR);
-
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
-  GNUNET_free (filename);
-  return 0;
-}
-
-
-static int
 check_string_rw (void)
 {
   GNUNET_assert (0 == test_nullstring_rw ());
@@ -442,16 +317,6 @@ check_string_rw (void)
 
 
 static int
-check_metadata_rw (void)
-{
-  GNUNET_assert (0 == test_fakebigmeta_rw ());
-  GNUNET_assert (0 == test_fakemeta_rw ());
-  GNUNET_assert (0 == test_bigmeta_rw ());
-  return 0;
-}
-
-
-static int
 check_file_rw (void)
 {
   GNUNET_assert (0 == test_normal_rw ());
@@ -467,7 +332,6 @@ main (int argc, char *argv[])
 {
   GNUNET_log_setup ("test-bio", "WARNING", NULL);
   GNUNET_assert (0 == check_file_rw ());
-  GNUNET_assert (0 == check_metadata_rw ());
   GNUNET_assert (0 == check_string_rw ());
   return 0;
 }