diff --git a/tests/check/ges/backgroundsource.c b/tests/check/ges/backgroundsource.c index 537cafa5dd..40308669c4 100644 --- a/tests/check/ges/backgroundsource.c +++ b/tests/check/ges/backgroundsource.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -34,21 +35,6 @@ GST_START_TEST (test_test_source_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_test_source_properties) { GESTrack *track; diff --git a/tests/check/ges/filesource.c b/tests/check/ges/filesource.c index 76cedd51f4..c858627ffa 100644 --- a/tests/check/ges/filesource.c +++ b/tests/check/ges/filesource.c @@ -17,6 +17,8 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" + #include #include @@ -72,21 +74,6 @@ GST_START_TEST (test_filesource_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_filesource_properties) { GESTrack *track; diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c index 291eaefe96..9ce926b723 100644 --- a/tests/check/ges/layer.c +++ b/tests/check/ges/layer.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -41,23 +42,6 @@ my_fill_track_func (GESTimelineObject * object, return TRUE; } -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur; \ - guint32 pprio; \ - gboolean pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_layer_properties) { GESTimeline *timeline; diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c index 8f7463e64b..a6e4edfd23 100644 --- a/tests/check/ges/overlays.c +++ b/tests/check/ges/overlays.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -34,20 +35,6 @@ GST_START_TEST (test_overlay_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - } - - GST_START_TEST (test_overlay_properties) { GESTrack *track; diff --git a/tests/check/ges/test-utils.h b/tests/check/ges/test-utils.h index ac96d4f1c6..798ae77409 100644 --- a/tests/check/ges/test-utils.h +++ b/tests/check/ges/test-utils.h @@ -28,6 +28,20 @@ gchar * ges_test_get_audio_only_uri (void); gchar * ges_test_get_audio_video_uri (void); gchar * ges_test_file_uri (const gchar *filename); +#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ + guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ + g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ + "media-start", &pmstart, "media-duration", &pmdur, \ + "priority", &pprio, "active", &pact, \ + NULL); \ + assert_equals_uint64 (pstart, start); \ + assert_equals_uint64 (pdur, duration); \ + assert_equals_uint64 (pmstart, mstart); \ + assert_equals_uint64 (pmdur, mduration); \ + assert_equals_int (pprio, priority); \ + assert_equals_int (pact, active); \ + } + #define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ diff --git a/tests/check/ges/text_properties.c b/tests/check/ges/text_properties.c index 3dd20b5774..77782d3d1c 100644 --- a/tests/check/ges/text_properties.c +++ b/tests/check/ges/text_properties.c @@ -17,22 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - } - GST_START_TEST (test_text_properties_in_layer) { GESTimeline *timeline; diff --git a/tests/check/ges/timelineobject.c b/tests/check/ges/timelineobject.c index 629df936a8..e34c7af8c4 100644 --- a/tests/check/ges/timelineobject.c +++ b/tests/check/ges/timelineobject.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -38,23 +39,6 @@ my_fill_track_func (GESTimelineObject * object, return TRUE; } -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur; \ - guint32 pprio; \ - gboolean pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_object_properties) { GESTrack *track; diff --git a/tests/check/ges/titles.c b/tests/check/ges/titles.c index 5159ba1dd4..a3d4f954db 100644 --- a/tests/check/ges/titles.c +++ b/tests/check/ges/titles.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -34,21 +35,6 @@ GST_START_TEST (test_title_source_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_title_source_properties) { GESTrack *track; diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c index f0c2e41fbb..578f376a37 100644 --- a/tests/check/ges/transition.c +++ b/tests/check/ges/transition.c @@ -18,6 +18,7 @@ * Boston, MA 02111-1307, USA. */ +#include "test-utils.h" #include #include @@ -65,21 +66,6 @@ GST_START_TEST (test_transition_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - - GST_START_TEST (test_transition_properties) { GESTrack *track;