Merge branch '0.10'

[platform/upstream/gstreamer.git] / tests / check / ges / save_and_load.c

diff --git a/tests/check/ges/save_and_load.c b/tests/check/ges/save_and_load.c
index 417aa7d..e7a352e 100644 (file)
--- a/tests/check/ges/save_and_load.c
+++ b/tests/check/ges/save_and_load.c
@@ -23,6 +23,8 @@
 #include <unistd.h>
 #define GetCurrentDir getcwd
 
+#include <gst/audio/audio.h>
+
 #define KEY_FILE_START {\
   if (cmp) g_key_file_free (cmp);\
   cmp = g_key_file_new ();\
@@ -103,7 +105,7 @@ GST_START_TEST (test_keyfile_save)
   KEY_FILE_START;
   KEY ("General", "version", "1");
   KEY ("Track0", "type", "GES_TRACK_TYPE_AUDIO");
-  KEY ("Track0", "caps", "audio/x-raw-int; audio/x-raw-float");
+  KEY ("Track0", "caps", "audio/x-raw");
   KEY ("Layer0", "priority", "0");
   KEY ("Layer0", "type", "simple");
   COMPARE;
@@ -238,16 +240,8 @@ GST_END_TEST;
  * information about the source line where the failing object was created.
  */
 
-#define CMP_FAIL(obj, ...) \
-{\
-  gchar *file, *func;\
-  guint line;\
-  file = g_object_get_data (G_OBJECT(obj), "file");\
-  func = g_object_get_data (G_OBJECT(obj), "function");\
-  line = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT(obj), "line"));\
-  gst_debug_log (GST_CAT_DEFAULT, GST_LEVEL_ERROR, file, func,\
-      line, G_OBJECT(obj), __VA_ARGS__);\
-}
+#define CMP_FAIL(a, ...)       \
+  fail_unless (FALSE, __VA_ARGS__);
 
 /* compare two GObjects for equality. pointer identity and GType short-circuit
  * the comparison. If a and b are not identical pointers and of the same
@@ -289,7 +283,8 @@ ges_objs_equal (GObject * a, GObject * b)
 
     /* ignore name and layer properties */
     if (!g_strcmp0 ("name", (*iter)->name) ||
-        !g_strcmp0 ("layer", (*iter)->name))
+        !g_strcmp0 ("layer", (*iter)->name) ||
+        !g_strcmp0 ("parent", (*iter)->name))
       continue;
 
     /* special case caps property */
@@ -320,7 +315,7 @@ ges_objs_equal (GObject * a, GObject * b)
     g_object_get_property (b, (*iter)->name, &bv);
 
     if (g_param_values_cmp (*iter, &av, &bv) != 0) {
-      const gchar *a_str, *b_str;
+      gchar *a_str, *b_str;
 
       a_str = gst_value_serialize (&av);
       b_str = gst_value_serialize (&bv);
@@ -328,6 +323,9 @@ ges_objs_equal (GObject * a, GObject * b)
       CMP_FAIL (b, "%s's %p and %p differ by property %s (%s != %s)",
           typename, a, b, (*iter)->name, a_str, b_str);
 
+      g_free (a_str);
+      g_free (b_str);
+
       goto fail;
     }
 
@@ -525,7 +523,7 @@ fail:
 static const gchar *data = "\n[General]\n"
     "[Track0]\n"
     "type=GES_TRACK_TYPE_AUDIO\n"
-    "caps=audio/x-raw-int; audio/x-raw-float\n"
+    "caps=audio/x-raw\n"
     "\n"
     "[Layer0]\n"
     "priority=0\n"
@@ -600,7 +598,7 @@ GST_START_TEST (test_keyfile_load)
 
   TIMELINE_BEGIN (expected) {
 
-    TRACK (GES_TRACK_TYPE_AUDIO, "audio/x-raw-float; audio/x-raw-int");
+    TRACK (GES_TRACK_TYPE_AUDIO, "audio/x-raw");
 
     SIMPLE_LAYER_BEGIN (0) {
 
@@ -699,8 +697,9 @@ GST_START_TEST (test_keyfile_identity)
 
   TIMELINE_BEGIN (orig) {
 
-    TRACK (GES_TRACK_TYPE_AUDIO, "audio/x-raw-int,width=32,rate=8000");
-    TRACK (GES_TRACK_TYPE_VIDEO, "video/x-raw-rgb");
+    TRACK (GES_TRACK_TYPE_AUDIO, "audio/x-raw,"
+        "format=(string)" GST_AUDIO_NE (S32) ",rate=8000");
+    TRACK (GES_TRACK_TYPE_VIDEO, "video/x-raw,format=(string)RGB24");
 
     LAYER_BEGIN (5) {