summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJonas Holmberg <jonashg@axis.com>2013-07-01 11:10:00 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-07-01 15:54:11 +0200
commit0ea8748c6b1cfdeb35b5fc71f4d6abb2bfc8b3c1 (patch)
treed8018acc7e32b28e5e65ca55c9c5e7f13a184333 /tests
parent948a9d2f2b728f5fb60be45d47a818cebeb60c7d (diff)
check: Added gst_check_setup_events_with_stream_id()
Added a new function gst_check_setup_events_with_stream_id(), since gst_check_setup_events() does not work with multiple pads. https://bugzilla.gnome.org/show_bug.cgi?id=703377
Diffstat (limited to 'tests')
-rw-r--r--tests/check/elements/funnel.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/check/elements/funnel.c b/tests/check/elements/funnel.c
index 29ce15b41..7ab604569 100644
--- a/tests/check/elements/funnel.c
+++ b/tests/check/elements/funnel.c
@@ -36,10 +36,6 @@ struct TestData
static void
setup_test_objects (struct TestData *td, GstPadChainFunction chain_func)
{
- GstSegment segment;
-
- gst_segment_init (&segment, GST_FORMAT_BYTES);
-
td->mycaps = gst_caps_new_empty_simple ("test/test");
td->funnel = gst_element_factory_make ("funnel", NULL);
@@ -64,16 +60,13 @@ setup_test_objects (struct TestData *td, GstPadChainFunction chain_func)
td->mysrc1 = gst_pad_new ("src1", GST_PAD_SRC);
gst_pad_set_active (td->mysrc1, TRUE);
-
- gst_pad_push_event (td->mysrc1, gst_event_new_stream_start ("test"));
- gst_pad_set_caps (td->mysrc1, td->mycaps);
- gst_pad_push_event (td->mysrc1, gst_event_new_segment (&segment));
+ gst_check_setup_events_with_stream_id (td->mysrc1, td->funnel, td->mycaps,
+ GST_FORMAT_BYTES, "test1");
td->mysrc2 = gst_pad_new ("src2", GST_PAD_SRC);
gst_pad_set_active (td->mysrc2, TRUE);
- gst_pad_push_event (td->mysrc2, gst_event_new_stream_start ("test"));
- gst_pad_set_caps (td->mysrc2, td->mycaps);
- gst_pad_push_event (td->mysrc2, gst_event_new_segment (&segment));
+ gst_check_setup_events_with_stream_id (td->mysrc2, td->funnel, td->mycaps,
+ GST_FORMAT_BYTES, "test2");
fail_unless (GST_PAD_LINK_SUCCESSFUL (gst_pad_link (td->funnelsrc,
td->mysink)));