X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_container_meta_data.c;h=fe1dd79c10e4d653e088abda8c7a01d3adc4b88e;hb=705966df17b43ca8f1481834a80d19cd7cad874b;hp=4920de05ac038c5813fe50504202270db3dcb575;hpb=5d5c1907285fd3eb5e3ce4402a31b4382369dc0c;p=oweals%2Fgnunet.git

diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index 4920de05a..fe1dd79c1 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -41,117 +41,81 @@ testMeta (int i)
 
   m = GNUNET_CONTAINER_meta_data_create ();
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_insert (m,
-					 "<test>",
-					 EXTRACTOR_METATYPE_TITLE, 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 "TestTitle",
-					 strlen("TestTitle")+1))
+      GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_TITLE,
+                                         EXTRACTOR_METAFORMAT_UTF8,
+                                         "text/plain", "TestTitle",
+                                         strlen ("TestTitle") + 1))
     ABORT (m);
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_insert (m, 
-					 "<test>",
-					 EXTRACTOR_METATYPE_AUTHOR_NAME, 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 "TestTitle",
-					 strlen ("TestTitle")+1))
+      GNUNET_CONTAINER_meta_data_insert (m, "<test>",
+                                         EXTRACTOR_METATYPE_AUTHOR_NAME,
+                                         EXTRACTOR_METAFORMAT_UTF8,
+                                         "text/plain", "TestTitle",
+                                         strlen ("TestTitle") + 1))
     ABORT (m);
-  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m, 
-						      "<test>",
-						      EXTRACTOR_METATYPE_TITLE, 
-						      EXTRACTOR_METAFORMAT_UTF8,
-						      "text/plain",
-						      "TestTitle",
-						      strlen ("TestTitle")+1)) /* dup! */
+  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "TestTitle", strlen ("TestTitle") + 1))   /* dup! */
     ABORT (m);
-  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m,
-						      "<test>",
-						      EXTRACTOR_METATYPE_AUTHOR_NAME,
-						      EXTRACTOR_METAFORMAT_UTF8,
-						      "text/plain",
-						      "TestTitle",
-						      strlen ("TestTitle")+1))        /* dup! */
+  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_AUTHOR_NAME, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "TestTitle", strlen ("TestTitle") + 1))     /* dup! */
     ABORT (m);
   if (2 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL))
     ABORT (m);
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_delete (m,
-					 EXTRACTOR_METATYPE_AUTHOR_NAME,
-					 "TestTitle",
-					 strlen("TestTitle")+1))
+      GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_AUTHOR_NAME,
+                                         "TestTitle", strlen ("TestTitle") + 1))
     ABORT (m);
-  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m,
-						      EXTRACTOR_METATYPE_AUTHOR_NAME, 
-						      "TestTitle",
-						      strlen ("TestTitle")+1))        /* already gone */
+  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_AUTHOR_NAME, "TestTitle", strlen ("TestTitle") + 1))        /* already gone */
     ABORT (m);
   if (1 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL))
     ABORT (m);
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_delete (m, 
-					 EXTRACTOR_METATYPE_TITLE,
-					 "TestTitle",
-					 strlen ("TestTitle")+1))
+      GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_TITLE,
+                                         "TestTitle", strlen ("TestTitle") + 1))
     ABORT (m);
-  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, 
-						      EXTRACTOR_METATYPE_TITLE, 
-						      "TestTitle",
-						      strlen ("TestTitle")+1)) /* already gone */
+  if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_TITLE, "TestTitle", strlen ("TestTitle") + 1))      /* already gone */
     ABORT (m);
   if (0 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL))
     ABORT (m);
   for (j = 0; j < i; j++)
-    {
-      GNUNET_snprintf (val, 
-		       sizeof(val),
-		       "%s.%d",
-                       "A teststring that should compress well.", j);
-      if (GNUNET_OK !=
-          GNUNET_CONTAINER_meta_data_insert (m,
-					     "<test>",
-					     EXTRACTOR_METATYPE_UNKNOWN, 
-					     EXTRACTOR_METAFORMAT_UTF8,
-					     "text/plain",
-					     val,
-					     strlen(val)+1))
-	ABORT (m);        
-    }
+  {
+    GNUNET_snprintf (val, sizeof (val), "%s.%d",
+                     "A teststring that should compress well.", j);
+    if (GNUNET_OK !=
+        GNUNET_CONTAINER_meta_data_insert (m, "<test>",
+                                           EXTRACTOR_METATYPE_UNKNOWN,
+                                           EXTRACTOR_METAFORMAT_UTF8,
+                                           "text/plain", val, strlen (val) + 1))
+      ABORT (m);
+  }
   if (i != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL))
     ABORT (m);
 
-  size =
-    GNUNET_CONTAINER_meta_data_get_serialized_size (m);
+  size = GNUNET_CONTAINER_meta_data_get_serialized_size (m);
   sval = NULL;
-  if (size != GNUNET_CONTAINER_meta_data_serialize (m,
-						    &sval, size,
-                                                    GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
-    {
-      GNUNET_free_non_null (sval);
-      ABORT (m);
-    }
+  if (size !=
+      GNUNET_CONTAINER_meta_data_serialize (m, &sval, size,
+                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
+  {
+    GNUNET_free_non_null (sval);
+    ABORT (m);
+  }
   GNUNET_CONTAINER_meta_data_destroy (m);
   m = GNUNET_CONTAINER_meta_data_deserialize (sval, size);
   GNUNET_free (sval);
   if (m == NULL)
     ABORT (m);
   for (j = 0; j < i; j++)
+  {
+    GNUNET_snprintf (val, sizeof (val), "%s.%d",
+                     "A teststring that should compress well.", j);
+    if (GNUNET_OK !=
+        GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_UNKNOWN, val,
+                                           strlen (val) + 1))
     {
-      GNUNET_snprintf (val, 
-		       sizeof(val), "%s.%d",
-                       "A teststring that should compress well.", j);
-      if (GNUNET_OK !=
-          GNUNET_CONTAINER_meta_data_delete (m,
-					     EXTRACTOR_METATYPE_UNKNOWN, 
-					     val,
-					     strlen(val)+1))
-        {
-          ABORT (m);
-        }
+      ABORT (m);
     }
+  }
   if (0 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL))
-    ABORT (m);    
+    ABORT (m);
   GNUNET_CONTAINER_meta_data_destroy (m);
   return 0;
 }
@@ -167,26 +131,22 @@ testMetaMore (int i)
 
   meta = GNUNET_CONTAINER_meta_data_create ();
   for (q = 0; q <= i; q++)
-    {
-      GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
-      GNUNET_CONTAINER_meta_data_insert (meta,
-					 "<test>",
-                                         q % EXTRACTOR_metatype_get_max(), 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 txt,
-					 strlen (txt)+1);
-    }
-  size =
-    GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
+  {
+    GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
+    GNUNET_CONTAINER_meta_data_insert (meta, "<test>",
+                                       q % EXTRACTOR_metatype_get_max (),
+                                       EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+                                       txt, strlen (txt) + 1);
+  }
+  size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
   data = GNUNET_malloc (size * 4);
-  if (size != GNUNET_CONTAINER_meta_data_serialize (meta,
-                                                    &data, size * 4,
-                                                    GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
-    {
-      GNUNET_free (data);
-      ABORT (meta);
-    }
+  if (size !=
+      GNUNET_CONTAINER_meta_data_serialize (meta, &data, size * 4,
+                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
+  {
+    GNUNET_free (data);
+    ABORT (meta);
+  }
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_free (data);
   return 0;
@@ -201,26 +161,23 @@ testMetaLink ()
 
   m = GNUNET_CONTAINER_meta_data_create ();
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_insert (m, 
-					 "<test>",
-					 EXTRACTOR_METATYPE_UNKNOWN, 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 "link",
-					 strlen("link")+1))
+      GNUNET_CONTAINER_meta_data_insert (m, "<test>",
+                                         EXTRACTOR_METATYPE_UNKNOWN,
+                                         EXTRACTOR_METAFORMAT_UTF8,
+                                         "text/plain", "link",
+                                         strlen ("link") + 1))
     ABORT (m);
   if (GNUNET_OK !=
-      GNUNET_CONTAINER_meta_data_insert (m,
-					 "<test>",
-					 EXTRACTOR_METATYPE_FILENAME,
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-                                         "lib-link.m4",
-					 strlen ("lib-link.m4")+1))
+      GNUNET_CONTAINER_meta_data_insert (m, "<test>",
+                                         EXTRACTOR_METATYPE_FILENAME,
+                                         EXTRACTOR_METAFORMAT_UTF8,
+                                         "text/plain", "lib-link.m4",
+                                         strlen ("lib-link.m4") + 1))
     ABORT (m);
   val = NULL;
-  size = GNUNET_CONTAINER_meta_data_serialize (m, &val, (size_t) -1,
-					       GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
+  size =
+      GNUNET_CONTAINER_meta_data_serialize (m, &val, (size_t) - 1,
+                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
   GNUNET_CONTAINER_meta_data_destroy (m);
   m = GNUNET_CONTAINER_meta_data_deserialize (val, size);
   GNUNET_free (val);
@@ -231,122 +188,136 @@ testMetaLink ()
 }
 
 int
-check()
+check ()
 {
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_CONTAINER_MetaData *meta2;
   int q;
   int i = 100;
   char txt[128];
+  char *str;
+  unsigned char *thumb;
 
   meta = GNUNET_CONTAINER_meta_data_create ();
   meta2 = GNUNET_CONTAINER_meta_data_create ();
   for (q = 0; q <= i; q++)
-    {
-      GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
-      GNUNET_CONTAINER_meta_data_insert (meta,
-					 "<test>",
-                                         EXTRACTOR_METATYPE_UNKNOWN, 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 "TestTitle",
-					 strlen ("TestTitle")+1);
-      GNUNET_CONTAINER_meta_data_insert (meta2,
-					 "<test>",
-                                         EXTRACTOR_METATYPE_UNKNOWN, 
-					 EXTRACTOR_METAFORMAT_UTF8,
-					 "text/plain",
-					 "TestTitle",
-					 strlen ("TestTitle")+1);
-    }
-  
+  {
+    GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
+    GNUNET_CONTAINER_meta_data_insert (meta, "<test>",
+                                       EXTRACTOR_METATYPE_UNKNOWN,
+                                       EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+                                       "TestTitle", strlen ("TestTitle") + 1);
+    GNUNET_CONTAINER_meta_data_insert (meta2, "<test>",
+                                       EXTRACTOR_METATYPE_UNKNOWN,
+                                       EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+                                       "TestTitle", strlen ("TestTitle") + 1);
+  }
+
   //check meta_data_test_equal
-  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    } 
+  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal (meta, meta2))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
 
   //check meta_data_clear
-  GNUNET_CONTAINER_meta_data_clear(meta2);
-  if (0 != GNUNET_CONTAINER_meta_data_iterate(meta2,NULL,NULL))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }
-  //check equal branch in meta_data_test_equal
-  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal(meta,meta))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }  
-  //check "count" branch in meta_data_test_equal
-  if (GNUNET_NO != GNUNET_CONTAINER_meta_data_test_equal(meta,meta2))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }   
+  GNUNET_CONTAINER_meta_data_clear (meta2);
+  if (0 != GNUNET_CONTAINER_meta_data_iterate (meta2, NULL, NULL))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
+  // check equal branch in meta_data_test_equal
+  if (GNUNET_YES != GNUNET_CONTAINER_meta_data_test_equal (meta, meta))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
+  // check "count" branch in meta_data_test_equal
+  if (GNUNET_NO != GNUNET_CONTAINER_meta_data_test_equal (meta, meta2))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
 
-  //check meta_data_add_publication_date
-  GNUNET_CONTAINER_meta_data_add_publication_date(meta2);
-  
-  //check meta_data_merge
-  GNUNET_CONTAINER_meta_data_clear(meta2);
-  GNUNET_CONTAINER_meta_data_merge(meta2,meta);
-  if (100 == GNUNET_CONTAINER_meta_data_iterate(meta2,NULL,NULL))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }  
-  
-  //check meta_data_get_by_type
-  GNUNET_CONTAINER_meta_data_clear(meta2);
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta2,EXTRACTOR_METATYPE_UNKNOWN) != NULL)
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);      
-    } 
-  
-  char* str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_UNKNOWN);
+  // check meta_data_add_publication_date
+  GNUNET_CONTAINER_meta_data_add_publication_date (meta2);
+
+  // check meta_data_merge
+  GNUNET_CONTAINER_meta_data_clear (meta2);
+  GNUNET_CONTAINER_meta_data_merge (meta2, meta);
+  if (100 == GNUNET_CONTAINER_meta_data_iterate (meta2, NULL, NULL))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
+
+  // check meta_data_get_by_type
+  GNUNET_CONTAINER_meta_data_clear (meta2);
+  if (NULL !=
+      (str =
+       GNUNET_CONTAINER_meta_data_get_by_type (meta2,
+                                               EXTRACTOR_METATYPE_UNKNOWN)))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    GNUNET_free (str);
+    ABORT (meta);
+  }
+
+  str =
+      GNUNET_CONTAINER_meta_data_get_by_type (meta, EXTRACTOR_METATYPE_UNKNOWN);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);      
-    } 
-  //check branch
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_PUBLICATION_DATE) != NULL)
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);      
-    } 
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    GNUNET_free (str);
+    ABORT (meta);
+  }
+  GNUNET_free (str);
+
+  // check branch
+  if (NULL !=
+      (str =
+       GNUNET_CONTAINER_meta_data_get_by_type (meta,
+                                               EXTRACTOR_METATYPE_PUBLICATION_DATE)))
+  {
+    GNUNET_free (str);
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
 
   //check meta_data_get_first_by_types
-  str = GNUNET_CONTAINER_meta_data_get_first_by_types(meta,
-						      EXTRACTOR_METATYPE_UNKNOWN,
-						      -1);
+  str =
+      GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+                                                     EXTRACTOR_METATYPE_UNKNOWN,
+                                                     -1);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);      
-    } 
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    GNUNET_free (str);
+    ABORT (meta);
+  }
+  GNUNET_free (str);
 
   //check meta_data_get_thumbnail
-  unsigned char* thumb;
-
-  if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta, &thumb) != 0)
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }
-
+  if (GNUNET_CONTAINER_meta_data_get_thumbnail (meta, &thumb) != 0)
+  {
+    GNUNET_free (thumb);
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
+  GNUNET_CONTAINER_meta_data_destroy (meta2);
   //check meta_data_duplicate
-  GNUNET_CONTAINER_meta_data_duplicate(meta);
-  if (200 == GNUNET_CONTAINER_meta_data_iterate(meta,NULL,NULL))
-    {
-      GNUNET_CONTAINER_meta_data_destroy(meta2);
-      ABORT(meta);
-    }
-  return 0; 
+  meta2 = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  if (200 == GNUNET_CONTAINER_meta_data_iterate (meta2, NULL, NULL))
+  {
+    GNUNET_CONTAINER_meta_data_destroy (meta2);
+    ABORT (meta);
+  }
+  GNUNET_CONTAINER_meta_data_destroy (meta2);
+  GNUNET_CONTAINER_meta_data_destroy (meta);
+  return 0;
 }
 
 
@@ -363,8 +334,9 @@ main (int argc, char *argv[])
     failureCount += testMetaMore (i);
   failureCount += testMetaLink ();
 
-  int ret = check();
-  if ( ret == 1)
+  int ret = check ();
+
+  if (ret == 1)
     return 1;
 
   if (failureCount != 0)