1 files changed, 11 insertions, 21 deletions

diff --git a/tests/check/gst/gststructure.c b/tests/check/gst/gststructure.c
index b37bd24430..b19762acc1 100644
--- a/tests/check/gst/gststructure.c
+++ b/tests/check/gst/gststructure.c
@@ -159,11 +159,9 @@ GST_START_TEST (test_from_string)
   fail_unless_equals_int (g_value_get_boolean (val), TRUE);
   gst_structure_free (structure);
 
-  /* This should still work for now (FIXME: 0.11) */
   s = "0.10:decoder-video/mpeg, abc=(boolean)false";
-  structure = gst_structure_from_string (s, NULL);
-  fail_if (structure == NULL, "Could not get structure from string %s", s);
-  gst_structure_free (structure);
+  ASSERT_CRITICAL (structure = gst_structure_from_string (s, NULL));
+  fail_unless (structure == NULL, "Could not get structure from string %s", s);
 
   /* make sure we bail out correctly in case of an error or if parsing fails */
   s = "***foo***, abc=(boolean)false";
@@ -188,22 +186,10 @@ GST_START_TEST (test_to_string)
   ASSERT_CRITICAL (st1 = gst_structure_new ("Foo\nwith-newline", NULL));
   fail_unless (st1 == NULL);
 
-  /* FIXME 0.11: re-enable this */
-#if 0
   ASSERT_CRITICAL (st1 = gst_structure_new ("Foo with whitespace", NULL));
   fail_unless (st1 == NULL);
   ASSERT_CRITICAL (st1 = gst_structure_new ("1st", NULL));
   fail_unless (st1 == NULL);
-#else
-  st1 = gst_structure_new ("Foo with whitespace is still allowed", NULL);
-  fail_unless (st1 != NULL);
-  gst_structure_free (st1);
-
-  /* structure names starting with a number are also still allowed */
-  st1 = gst_structure_new ("1st", NULL);
-  fail_unless (st1 != NULL);
-  gst_structure_free (st1);
-#endif
 }
 
 GST_END_TEST;
@@ -339,8 +325,8 @@ GST_START_TEST (test_structure_new)
   g_error_free (e);
   gst_structure_free (s);
 
-  /* This should still work for now (FIXME 0.11) */
-  gst_structure_free (gst_structure_new ("0.10:decoder-video/mpeg", NULL));
+  ASSERT_CRITICAL (gst_structure_free (gst_structure_new
+          ("0.10:decoder-video/mpeg", NULL)));
 
   /* make sure we bail out correctly in case of an error or if parsing fails */
   ASSERT_CRITICAL (s = gst_structure_new ("^joo\nba\ndoo^",
@@ -509,11 +495,15 @@ GST_START_TEST (test_vararg_getters)
   gint64 i64;
   gchar *c;
   gint i, num, denom;
+  guint8 *data;
 
   buf = gst_buffer_new_and_alloc (3);
-  GST_BUFFER_DATA (buf)[0] = 0xf0;
-  GST_BUFFER_DATA (buf)[1] = 0x66;
-  GST_BUFFER_DATA (buf)[2] = 0x0d;
+
+  data = gst_buffer_map (buf, NULL, NULL, GST_MAP_WRITE);
+  data[0] = 0xf0;
+  data[1] = 0x66;
+  data[2] = 0x0d;
+  gst_buffer_unmap (buf, data, 3);
 
   caps = gst_caps_new_simple ("video/x-foo", NULL);