From eee8b0db8835716e81e9c42c1f9ee58dbb04e2f1 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Tue, 15 Oct 2013 18:01:38 +0200 Subject: [PATCH] tests: Check gst_rtsp_url_parse return value See https://bugzilla.gnome.org/show_bug.cgi?id=710202 --- tests/check/gst/media.c | 12 ++++++++---- tests/check/gst/mediafactory.c | 15 ++++++++++----- tests/check/gst/rtspserver.c | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tests/check/gst/media.c b/tests/check/gst/media.c index 6b4b2a0..ca2c324 100644 --- a/tests/check/gst/media.c +++ b/tests/check/gst/media.c @@ -34,7 +34,8 @@ GST_START_TEST (test_launch) factory = gst_rtsp_media_factory_new (); fail_if (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -135,7 +136,8 @@ GST_START_TEST (test_media_prepare) /* test non-reusable media first */ factory = gst_rtsp_media_factory_new (); fail_if (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -161,7 +163,8 @@ GST_START_TEST (test_media_prepare) /* test reusable media */ factory = gst_rtsp_media_factory_new (); fail_if (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -279,7 +282,8 @@ GST_START_TEST (test_media_take_pipeline) GstElement *pipeline; factory = gst_rtsp_media_factory_new (); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( fakesrc ! text/plain ! rtpgstpay name=pay0 )"); diff --git a/tests/check/gst/mediafactory.c b/tests/check/gst/mediafactory.c index ab791cd..37b56aa 100644 --- a/tests/check/gst/mediafactory.c +++ b/tests/check/gst/mediafactory.c @@ -29,7 +29,8 @@ GST_START_TEST (test_parse_error) factory = gst_rtsp_media_factory_new (); gst_rtsp_media_factory_set_launch (factory, "foo"); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); ASSERT_CRITICAL (gst_rtsp_media_factory_create_element (factory, url)); ASSERT_CRITICAL (gst_rtsp_media_factory_construct (factory, url)); @@ -47,7 +48,8 @@ GST_START_TEST (test_launch) factory = gst_rtsp_media_factory_new (); fail_if (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -71,7 +73,8 @@ GST_START_TEST (test_launch_construct) factory = gst_rtsp_media_factory_new (); fail_if (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -103,7 +106,8 @@ GST_START_TEST (test_shared) gst_rtsp_media_factory_set_shared (factory, TRUE); fail_unless (gst_rtsp_media_factory_is_shared (factory)); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )"); @@ -141,7 +145,8 @@ GST_START_TEST (test_addresspool) factory = gst_rtsp_media_factory_new (); gst_rtsp_media_factory_set_shared (factory, TRUE); - gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url); + fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test", + &url) == GST_RTSP_OK); gst_rtsp_media_factory_set_launch (factory, "( videotestsrc ! rtpvrawpay pt=96 name=pay0 " diff --git a/tests/check/gst/rtspserver.c b/tests/check/gst/rtspserver.c index fb932df..54effd9 100644 --- a/tests/check/gst/rtspserver.c +++ b/tests/check/gst/rtspserver.c @@ -203,7 +203,7 @@ connect_to_server (gint port, const gchar * mount_point) address = gst_rtsp_server_get_address (server); uri_string = g_strdup_printf ("rtsp://%s:%d%s", address, port, mount_point); g_free (address); - gst_rtsp_url_parse (uri_string, &url); + fail_unless (gst_rtsp_url_parse (uri_string, &url) == GST_RTSP_OK); g_free (uri_string); fail_unless (gst_rtsp_connection_create (url, &conn) == GST_RTSP_OK); -- 2.7.4