diff options
| -rw-r--r-- | tests/check/gnl/gnlcomposition.c | 6 | ||||
| -rw-r--r-- | tests/check/gnl/gnloperation.c | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/tests/check/gnl/gnlcomposition.c b/tests/check/gnl/gnlcomposition.c index 7115a8d..cb91a0f 100644 --- a/tests/check/gnl/gnlcomposition.c +++ b/tests/check/gnl/gnlcomposition.c @@ -366,8 +366,12 @@ GST_START_TEST (test_no_more_pads_race) g_object_connect (composition, "signal::pad-removed", on_composition_pad_removed_cb, NULL, NULL); + GST_DEBUG ("Adding composition to pipeline"); + gst_bin_add_many (GST_BIN (pipeline), composition, fakesink, NULL); + GST_DEBUG ("Setting pipeline to PAUSED"); + fail_if (gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE); @@ -382,6 +386,8 @@ GST_START_TEST (test_no_more_pads_race) } gst_message_unref (message); + GST_DEBUG ("Adding second source"); + /* FIXME: maybe slow down the videotestsrc steaming thread */ gst_bin_add (GST_BIN (composition), source2); diff --git a/tests/check/gnl/gnloperation.c b/tests/check/gnl/gnloperation.c index ec6ce89..25d25cd 100644 --- a/tests/check/gnl/gnloperation.c +++ b/tests/check/gnl/gnloperation.c @@ -16,6 +16,14 @@ GST_START_TEST (test_simple_operation) comp = gst_element_factory_make_or_warn ("gnlcomposition", "test_composition"); + /* TOPOLOGY + * + * 0 1 2 3 4 5 | Priority + * ---------------------------------------------------------------------------- + * [-- oper --] | 0 + * [------------- source -------------] | 1 + * */ + /* source Start : 0s @@ -1022,7 +1030,7 @@ GST_START_TEST (test_complex_operations) } } - GST_DEBUG ("Setting pipeline to NULL"); + GST_DEBUG ("Setting pipeline to READY"); fail_if (gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY) == GST_STATE_CHANGE_FAILURE); @@ -1031,6 +1039,11 @@ GST_START_TEST (test_complex_operations) GST_DEBUG ("Resetted pipeline to READY"); + /* Elements should all be in the READY state */ + check_state_simple (source1, GST_STATE_READY); + check_state_simple (source2, GST_STATE_READY); + check_state_simple (oper, GST_STATE_READY); + /* Expected segments */ collect->expected_segments = g_list_append (collect->expected_segments, segment_new (1.0, GST_FORMAT_TIME, 0, 2 * GST_SECOND, 0)); @@ -1255,14 +1268,19 @@ GST_START_TEST (test_complex_operations_bis) } } - GST_DEBUG ("Setting pipeline to NULL"); + GST_DEBUG ("Setting pipeline to READY"); fail_if (gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY) == GST_STATE_CHANGE_FAILURE); fail_if (collect->expected_segments != NULL); - GST_DEBUG ("Resetted pipeline to READY"); + GST_DEBUG ("Resetted pipeline to READY, checking state of elements"); + + /* Elements should all be in the READY state */ + check_state_simple (source1, GST_STATE_READY); + check_state_simple (source2, GST_STATE_READY); + check_state_simple (oper, GST_STATE_READY); /* Expected segments */ collect->expected_segments = g_list_append (collect->expected_segments, |