check/gst/gstghostpad.c (test_ghost_pads): Merge from the state change patch.

Original commit message from CVS:
2005-10-10  Andy Wingo  <wingo@pobox.com>

* check/gst/gstghostpad.c (test_ghost_pads): Merge from the state
change patch.
This commit is contained in:
Andy Wingo 2005-10-10 10:57:40 +00:00
parent 81b2269099
commit d2e605454e
3 changed files with 17 additions and 8 deletions

View file

@ -1,5 +1,8 @@
2005-10-10 Andy Wingo <wingo@pobox.com>
* check/gst/gstghostpad.c (test_ghost_pads): Merge from the state
change patch.
* check/gst/gstbin.c: Merge in some style fixes and additional
checks from Wim's state change patch.

View file

@ -195,6 +195,7 @@ GST_START_TEST (test_ghost_pads)
{
GstElement *b1, *b2, *src, *i1, *sink;
GstPad *gsink, *gsrc, *gisrc, *gisink, *isink, *isrc, *fsrc, *fsink;
GstStateChangeReturn ret;
b1 = gst_element_factory_make ("pipeline", NULL);
b2 = gst_element_factory_make ("bin", NULL);
@ -246,11 +247,13 @@ GST_START_TEST (test_ghost_pads)
assert_gstrefcount (gisink, 2); /* parent */
assert_gstrefcount (isrc, 3); /* parent and gsrc */
fail_unless (gst_element_set_state (b1,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
ret = gst_element_set_state (b1, GST_STATE_PLAYING);
ret = gst_element_get_state (b1, NULL, NULL, NULL);
fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
fail_unless (gst_element_set_state (b1,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
ret = gst_element_set_state (b1, GST_STATE_NULL);
ret = gst_element_get_state (b1, NULL, NULL, NULL);
fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
gst_object_unref (b1);
/* unreffing the bin will unref all elements, which will unlink and unparent

View file

@ -195,6 +195,7 @@ GST_START_TEST (test_ghost_pads)
{
GstElement *b1, *b2, *src, *i1, *sink;
GstPad *gsink, *gsrc, *gisrc, *gisink, *isink, *isrc, *fsrc, *fsink;
GstStateChangeReturn ret;
b1 = gst_element_factory_make ("pipeline", NULL);
b2 = gst_element_factory_make ("bin", NULL);
@ -246,11 +247,13 @@ GST_START_TEST (test_ghost_pads)
assert_gstrefcount (gisink, 2); /* parent */
assert_gstrefcount (isrc, 3); /* parent and gsrc */
fail_unless (gst_element_set_state (b1,
GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
ret = gst_element_set_state (b1, GST_STATE_PLAYING);
ret = gst_element_get_state (b1, NULL, NULL, NULL);
fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
fail_unless (gst_element_set_state (b1,
GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
ret = gst_element_set_state (b1, GST_STATE_NULL);
ret = gst_element_get_state (b1, NULL, NULL, NULL);
fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
gst_object_unref (b1);
/* unreffing the bin will unref all elements, which will unlink and unparent