diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-06-18 09:37:16 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-06-18 09:37:16 +0100 |
commit | adb004f03525c41d6fc4f6ba9f137f33386f64bb (patch) | |
tree | 3ed508be2416a8f12313f6b2bca68a5a582426fe | |
parent | eb750694048e0bcb28fec9c647ec2f6ada4c2fda (diff) | |
parent | 36a3cb5f96cdeba361d22c31e3d0e3995843374d (diff) |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
tests/insanity-test-gst-decoder.c
tests/insanity-test-gst-demuxer.c
tests/insanity-test-gst-dvd.c
tests/insanity-test-gst-stream-switch.c
-rw-r--r-- | lib/insanity-gst/insanitygstpipelinetest.c | 14 | ||||
-rw-r--r-- | tests/insanity-http-server.c | 2 | ||||
-rw-r--r-- | tests/insanity-test-gst-decoder.c | 23 | ||||
-rw-r--r-- | tests/insanity-test-gst-demuxer.c | 30 | ||||
-rw-r--r-- | tests/insanity-test-gst-discoverer.c | 6 | ||||
-rw-r--r-- | tests/insanity-test-gst-dvd.c | 20 | ||||
-rw-r--r-- | tests/insanity-test-gst-hls.c | 25 | ||||
-rw-r--r-- | tests/insanity-test-gst-http.c | 9 | ||||
-rw-r--r-- | tests/insanity-test-gst-play.c | 5 | ||||
-rw-r--r-- | tests/insanity-test-gst-rtsp.c | 22 | ||||
-rw-r--r-- | tests/insanity-test-gst-seek.c | 20 | ||||
-rw-r--r-- | tests/insanity-test-gst-stream-switch.c | 10 | ||||
-rw-r--r-- | tests/insanity-test-gst-subtitles.c | 8 |
13 files changed, 100 insertions, 94 deletions
diff --git a/lib/insanity-gst/insanitygstpipelinetest.c b/lib/insanity-gst/insanitygstpipelinetest.c index d63c70d..6254dda 100644 --- a/lib/insanity-gst/insanitygstpipelinetest.c +++ b/lib/insanity-gst/insanitygstpipelinetest.c @@ -545,6 +545,9 @@ insanity_gst_pipeline_test_stop (InsanityTest * test) INSANITY_GST_PIPELINE_TEST (test)->priv; GstState state, pending; + insanity_test_validate_checklist_item (test, "no-errors-seen", + priv->error_count == 0, NULL); + if (priv->wait_timeout_id) { g_source_remove (priv->wait_timeout_id); priv->wait_timeout_id = 0; @@ -588,9 +591,6 @@ insanity_gst_pipeline_test_teardown (InsanityTest * test) InsanityGstPipelineTest *ptest = INSANITY_GST_PIPELINE_TEST (test); InsanityGstPipelineTestPrivateData *priv = ptest->priv; - insanity_test_validate_checklist_item (test, "no-errors-seen", - priv->error_count == 0, NULL); - if (priv->bus) { gst_object_unref (priv->bus); priv->bus = NULL; @@ -694,13 +694,13 @@ insanity_gst_pipeline_test_init (InsanityGstPipelineTest * gsttest) /* Add our own items, etc */ insanity_test_add_checklist_item (test, "valid-pipeline", - "The test pipeline was properly created", NULL); + "The test pipeline was properly created", NULL, TRUE); insanity_test_add_checklist_item (test, "pipeline-change-state", - "The initial state_change happened succesfully", NULL); + "The initial state_change happened succesfully", NULL, TRUE); insanity_test_add_checklist_item (test, "reached-initial-state", - "The pipeline reached the initial GstElementState", NULL); + "The pipeline reached the initial GstElementState", NULL, TRUE); insanity_test_add_checklist_item (test, "no-errors-seen", - "No errors were emitted from the pipeline", NULL); + "No errors were emitted from the pipeline", NULL, FALSE); insanity_test_add_extra_info (test, "errors", "List of errors emitted by the pipeline"); diff --git a/tests/insanity-http-server.c b/tests/insanity-http-server.c index 0c8b182..eb7f826 100644 --- a/tests/insanity-http-server.c +++ b/tests/insanity-http-server.c @@ -602,7 +602,7 @@ http_server_start (InsanityHttpServer * srv) /* We add the server-started as a checklist item of the test */ insanity_test_add_checklist_item (test, "server-started", - "The internal HTTP server was started", NULL); + "The internal HTTP server was started", NULL, FALSE); priv->port = 0; priv->ssl_port = 0; diff --git a/tests/insanity-test-gst-decoder.c b/tests/insanity-test-gst-decoder.c index 9e84907..c4a4b27 100644 --- a/tests/insanity-test-gst-decoder.c +++ b/tests/insanity-test-gst-decoder.c @@ -1196,30 +1196,31 @@ main (int argc, char **argv) /* Checklist */ insanity_test_add_checklist_item (test, "testing-decoder-or-parser", "Whether the element we are testing (referenced with the decoder-name)" - " argument is a decoder or a parser and thus can be tested here", NULL); + " argument is a decoder or a parser and thus can be tested here", NULL, + FALSE); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "seekable-detection", - "The demuxer detects if a stream is seekable or not", NULL); + "The demuxer detects if a stream is seekable or not", NULL, FALSE); insanity_test_add_checklist_item (test, "duration-detection", - "The demuxer detects duration of the stream properly", NULL); + "The demuxer detects duration of the stream properly", NULL, FALSE); insanity_test_add_checklist_item (test, "position-detection", - "The demuxer detects the position in the stream properly", NULL); + "The demuxer detects the position in the stream properly", NULL, FALSE); insanity_test_add_checklist_item (test, "segment-clipping", - "Buffers were correctly clipped to the configured segment", NULL); + "Buffers were correctly clipped to the configured segment", NULL, FALSE); insanity_test_add_checklist_item (test, "first-segment", "The demuxer sends a" - " first segment with proper values before " "first buffers", NULL); + " first segment with proper values before " "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "seqnum-management", "The events" - "we receive have the seqnum it should have", NULL); + "we receive have the seqnum it should have", NULL, FALSE); insanity_test_add_checklist_item (test, "fast-forward", "The demuxer could " - " properly play the stream fast-forward" "first buffers", NULL); + " properly play the stream fast-forward" "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "fast-backward", "The demuxer could " - " properly play the stream fast-backward" "first buffers", NULL); + " properly play the stream fast-backward" "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "backward-playback", "The demuxer could " " properly play the stream backward" "first buffers", - NULL); + NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (ptest, &create_pipeline, NULL, NULL); diff --git a/tests/insanity-test-gst-demuxer.c b/tests/insanity-test-gst-demuxer.c index 84dd2db..c9fcbfe 100644 --- a/tests/insanity-test-gst-demuxer.c +++ b/tests/insanity-test-gst-demuxer.c @@ -1548,37 +1548,37 @@ main (int argc, char **argv) /* Checklist */ insanity_test_add_checklist_item (test, "testing-demuxer", "Whether the element we are testing (referenced with the demuxer " - "argument) is indeed a demuxer and thus can be tested here", NULL); + "argument) is indeed a demuxer and thus can be tested here", NULL, FALSE); insanity_test_add_checklist_item (test, "stream-detection", "The demuxer " - "detects the various stream and sets the caps properly", NULL); + "detects the various stream and sets the caps properly", NULL, FALSE); insanity_test_add_checklist_item (test, "frames-detection", "The demuxer " - "detects the frames and its metadatas properly", NULL); + "detects the frames and its metadatas properly", NULL, FALSE); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "seekable-detection", - "The demuxer detects if a stream is seekable or not", NULL); + "The demuxer detects if a stream is seekable or not", NULL, FALSE); insanity_test_add_checklist_item (test, "duration-detection", - "The demuxer detects duration of the stream properly", NULL); + "The demuxer detects duration of the stream properly", NULL, FALSE); insanity_test_add_checklist_item (test, "position-detection", - "The demuxer detects the position in the stream properly", NULL); + "The demuxer detects the position in the stream properly", NULL, FALSE); insanity_test_add_checklist_item (test, "tag-detection", - "The demuxer detects the tags in the stream properly", NULL); + "The demuxer detects the tags in the stream properly", NULL, FALSE); insanity_test_add_checklist_item (test, "first-segment", "The demuxer sends a" - " first segment with proper values before " "first buffers", NULL); + " first segment with proper values before " "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "seqnum-management", "The events" - "we receive have the seqnum it should have", NULL); + "we receive have the seqnum it should have", NULL, FALSE); insanity_test_add_checklist_item (test, "fast-forward", "The demuxer could " - " properly play the stream fast-forward" "first buffers", NULL); + " properly play the stream fast-forward" "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "fast-backward", "The demuxer could " - " properly play the stream fast-backward" "first buffers", NULL); + " properly play the stream fast-backward" "first buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "segment-seek", "The demuxer could " - " properly segment seeking", NULL); + " properly segment seeking", NULL, FALSE); insanity_test_add_checklist_item (test, "backward-playback", "The demuxer could " " properly play the stream backward" "first buffers", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "unlink-pad-handling", "The demuxer" "properly handles pad is unlinking (errors out if only 1 source pad, keep" - "pushing buffer on other pad otherwize)" "first buffers", NULL); + "pushing buffer on other pad otherwize)" "first buffers", NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (ptest, &demux_test_create_pipeline, NULL, NULL); diff --git a/tests/insanity-test-gst-discoverer.c b/tests/insanity-test-gst-discoverer.c index 009fb49..7db2e0b 100644 --- a/tests/insanity-test-gst-discoverer.c +++ b/tests/insanity-test-gst-discoverer.c @@ -1618,13 +1618,13 @@ main (int argc, char **argv) "Check gst-discoverer's output against previously stored expected results")); insanity_test_add_checklist_item (test, "discoverer-returned-results", - "Discoverer returned something", "Discoverer returned nothing"); + "Discoverer returned something", "Discoverer returned nothing", FALSE); insanity_test_add_checklist_item (test, "comparison-file-parsed", "File with expected values parsed", - "Unable to parse file with expected values"); + "Unable to parse file with expected values", FALSE); insanity_test_add_checklist_item (test, "discoverer-correct", "Discoverer returned correct results", - "Discoverer returned something wrong"); + "Discoverer returned something wrong", FALSE); insanity_test_add_string_argument (test, "uri", "Input file", "URI of file to process", TRUE, "file:///home/user/video.avi"); diff --git a/tests/insanity-test-gst-dvd.c b/tests/insanity-test-gst-dvd.c index 95dc03b..8cd095f 100644 --- a/tests/insanity-test-gst-dvd.c +++ b/tests/insanity-test-gst-dvd.c @@ -841,26 +841,26 @@ main (int argc, char **argv) insanity_test_add_checklist_item (test, "uri-is-dvd", - "The URI is a DVD specific URI", NULL); + "The URI is a DVD specific URI", NULL, FALSE); insanity_test_add_checklist_item (test, "select-root-menu", - "Root menu selection succeded", NULL); + "Root menu selection succeded", NULL, FALSE); insanity_test_add_checklist_item (test, "select-first-menu", - "First menu selection succeded", NULL); + "First menu selection succeded", NULL, FALSE); insanity_test_add_checklist_item (test, "retrieve-angles", - "The DVD gave a list of supported angles", NULL); + "The DVD gave a list of supported angles", NULL, FALSE); insanity_test_add_checklist_item (test, "retrieve-commands", - "The DVD gave a list of supported commands", NULL); + "The DVD gave a list of supported commands", NULL, FALSE); insanity_test_add_checklist_item (test, "seek-to-main-title", - "Seek in title format to the main title", NULL); + "Seek in title format to the main title", NULL, FALSE); insanity_test_add_checklist_item (test, "cycle-angles", - "Cycle through each angle of the selected title in turn", NULL); + "Cycle through each angle of the selected title in turn", NULL, FALSE); insanity_test_add_checklist_item (test, "cycle-unused-commands", "Cycle through a list of unused commands, which should have no effect", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "send-random-commands", - "Send random valid commands, going through menus at random", NULL); + "Send random valid commands, going through menus at random", NULL, FALSE); insanity_test_add_checklist_item (test, "position-queried", - "Stream position could be determined", NULL); + "Stream position could be determined", NULL, FALSE); insanity_test_add_extra_info (test, "seed", "The seed used to generate random commands"); diff --git a/tests/insanity-test-gst-hls.c b/tests/insanity-test-gst-hls.c index 27c5ab9..db53b97 100644 --- a/tests/insanity-test-gst-hls.c +++ b/tests/insanity-test-gst-hls.c @@ -751,31 +751,32 @@ main (int argc, char **argv) insanity_test_add_string_argument (test, "ssl-key-file", "Key file for SSL server", NULL, TRUE, ssl_key_file); insanity_test_add_checklist_item (test, "uri-is-file", - "The URI is a file URI", NULL); + "The URI is a file URI", NULL, FALSE); - insanity_test_add_checklist_item (test, "seek", "A seek succeeded", NULL); + insanity_test_add_checklist_item (test, "seek", "A seek succeeded", NULL, + FALSE); insanity_test_add_checklist_item (test, "duration-known", - "Stream duration could be determined", NULL); + "Stream duration could be determined", NULL, FALSE); insanity_test_add_checklist_item (test, "protocol-is-hls", - "The protocol in use is HLS", NULL); + "The protocol in use is HLS", NULL, FALSE); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "queried-live", - "The stream is live", NULL); + "The stream is live", NULL, FALSE); insanity_test_add_checklist_item (test, "queried-seekable", - "The stream is seekable", NULL); + "The stream is seekable", NULL, FALSE); insanity_test_add_checklist_item (test, "position-queried", - "Stream position could be determined", NULL); + "Stream position could be determined", NULL, FALSE); insanity_test_add_checklist_item (test, "done-buffering", - "Got a buffering message", NULL); + "Got a buffering message", NULL, FALSE); insanity_test_add_checklist_item (test, "segment-seek-time-correct", "Segments were seen after a seek at or near the expected seek target", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "buffer-seek-time-correct", "Buffers were seen after a seek at or near the expected seek target", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "play-in-time", - "Wether the playing time are accurate", NULL); + "Wether the playing time are accurate", NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (ptest, &hls_test_create_pipeline, NULL, NULL); diff --git a/tests/insanity-test-gst-http.c b/tests/insanity-test-gst-http.c index 75f12c8..694bb23 100644 --- a/tests/insanity-test-gst-http.c +++ b/tests/insanity-test-gst-http.c @@ -435,13 +435,14 @@ main (int argc, char **argv) g_value_unset (&vdef); insanity_test_add_checklist_item (test, "uri-is-file", - "The URI is a file URI", NULL); + "The URI is a file URI", NULL, FALSE); - insanity_test_add_checklist_item (test, "seek", "A seek succeeded", NULL); + insanity_test_add_checklist_item (test, "seek", "A seek succeeded", NULL, + FALSE); insanity_test_add_checklist_item (test, "duration-known", - "Stream duration could be determined", NULL); + "Stream duration could be determined", NULL, FALSE); insanity_test_add_checklist_item (test, "position-queried", - "Stream position could be determined", NULL); + "Stream position could be determined", NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (ptest, &http_test_create_pipeline, NULL, NULL); diff --git a/tests/insanity-test-gst-play.c b/tests/insanity-test-gst-play.c index 0f96880..a9e4a45 100644 --- a/tests/insanity-test-gst-play.c +++ b/tests/insanity-test-gst-play.c @@ -195,6 +195,9 @@ play_test_stop (InsanityTest * test) } gst_object_unref (audiosink); gst_object_unref (videosink); + } else { + insanity_test_validate_checklist_item (test, "all-buffers-received", + TRUE, "All sinks received all their buffers"); } return TRUE; } @@ -237,7 +240,7 @@ main (int argc, char **argv) g_value_unset (&vdef); insanity_test_add_checklist_item (test, "all-buffers-received", - "Appsinks (if used) received all buffers", NULL); + "Appsinks (if used) received all buffers", NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (INSANITY_GST_PIPELINE_TEST (test), &play_gst_test_create_pipeline, NULL, diff --git a/tests/insanity-test-gst-rtsp.c b/tests/insanity-test-gst-rtsp.c index c4fc196..7249d3d 100644 --- a/tests/insanity-test-gst-rtsp.c +++ b/tests/insanity-test-gst-rtsp.c @@ -746,27 +746,27 @@ main (int argc, char **argv) "Stream time to playback for before seeking, in seconds", NULL, TRUE, 5); insanity_test_add_checklist_item (test, "valid-setup", - "The setup given in arguments makes sense", NULL); + "The setup given in arguments makes sense", NULL, FALSE); insanity_test_add_checklist_item (test, "server-created", - "The RTSP server was created succesfully", NULL); + "The RTSP server was created succesfully", NULL, FALSE); insanity_test_add_checklist_item (test, "pause", - "The pipeline could be paused", NULL); + "The pipeline could be paused", NULL, FALSE); insanity_test_add_checklist_item (test, "play", - "The pipeline could be played", NULL); + "The pipeline could be played", NULL, FALSE); insanity_test_add_checklist_item (test, "wait", - "The pipeline could stay in playback mode", NULL); + "The pipeline could stay in playback mode", NULL, FALSE); insanity_test_add_checklist_item (test, "seek", "The pipeline could seek", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "protocol-udp-unicast", - "The RTP transport could be set to UDP unicast", NULL); + "The RTP transport could be set to UDP unicast", NULL, FALSE); insanity_test_add_checklist_item (test, "protocol-udp-multicast", - "The RTP transport could be set to UDP multicast", NULL); + "The RTP transport could be set to UDP multicast", NULL, FALSE); insanity_test_add_checklist_item (test, "protocol-tcp", - "The RTP transport could be set to TCP", NULL); + "The RTP transport could be set to TCP", NULL, FALSE); insanity_test_add_checklist_item (test, "protocol-http", - "The RTP transport could be set to HTTP", NULL); + "The RTP transport could be set to HTTP", NULL, FALSE); insanity_test_add_checklist_item (test, "position-queried", - "Stream position could be determined", NULL); + "Stream position could be determined", NULL, FALSE); insanity_test_add_extra_info (test, "launch-line", "The launch line gst-rtsp-server was configued with"); diff --git a/tests/insanity-test-gst-seek.c b/tests/insanity-test-gst-seek.c index 41684c3..66df16b 100644 --- a/tests/insanity-test-gst-seek.c +++ b/tests/insanity-test-gst-seek.c @@ -1163,27 +1163,27 @@ main (int argc, char **argv) g_value_unset (&vdef); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "duration-known", - "Stream duration could be determined", NULL); + "Stream duration could be determined", NULL, FALSE); insanity_test_add_checklist_item (test, "seekable", - "Stream detected as seekable", NULL); + "Stream detected as seekable", NULL, FALSE); insanity_test_add_checklist_item (test, "seek", - "Seek events were accepted by the pipeline", NULL); + "Seek events were accepted by the pipeline", NULL, FALSE); insanity_test_add_checklist_item (test, "buffer-seek-time-correct", "Buffers were seen after a seek at or near the expected seek target", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "segment-seek-time-correct", "Segments were seen after a seek at or near the expected seek target", - NULL); + NULL, FALSE); insanity_test_add_checklist_item (test, "segment-clipping", - "Buffers were correctly clipped to the configured segment", NULL); + "Buffers were correctly clipped to the configured segment", NULL, FALSE); insanity_test_add_checklist_item (test, "buffers-received", - "Appsinks (if used) received some buffers", NULL); + "Appsinks (if used) received some buffers", NULL, FALSE); insanity_test_add_checklist_item (test, "normal-seek", - "Normal seeks performed properly", NULL); + "Normal seeks performed properly", NULL, FALSE); insanity_test_add_checklist_item (test, "trick-seek", - "Trick seeks performed properly", NULL); + "Trick seeks performed properly", NULL, FALSE); insanity_test_add_extra_info (test, "max-seek-error", "The maximum timestamp difference between a seek target and the buffer received after the seek (absolute value in nanoseconds)"); diff --git a/tests/insanity-test-gst-stream-switch.c b/tests/insanity-test-gst-stream-switch.c index 2a88376..33a9d67 100644 --- a/tests/insanity-test-gst-stream-switch.c +++ b/tests/insanity-test-gst-stream-switch.c @@ -1522,15 +1522,15 @@ main (int argc, char **argv) g_value_unset (&vdef); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "found-all-streams", - "Streams were successfully detected by playbin", NULL); + "Streams were successfully detected by playbin", NULL, FALSE); insanity_test_add_checklist_item (test, "stream-switch", - "Streams were successfully switched", NULL); + "Streams were successfully switched", NULL, FALSE); insanity_test_add_checklist_item (test, "streams-constant", - "Streams didn't switch without requesting", NULL); + "Streams didn't switch without requesting", NULL, FALSE); insanity_test_add_checklist_item (test, "unique-markers", - "Streams all had unique markers", NULL); + "Streams all had unique markers", NULL, FALSE); insanity_test_add_extra_info (test, "max-stream-switch-time", "The maximum amount of time taken to perform a stream switch (in nanoseconds)"); diff --git a/tests/insanity-test-gst-subtitles.c b/tests/insanity-test-gst-subtitles.c index 66f6eeb..ce0d444 100644 --- a/tests/insanity-test-gst-subtitles.c +++ b/tests/insanity-test-gst-subtitles.c @@ -1082,13 +1082,13 @@ main (int argc, char **argv) /* Checklist */ insanity_test_add_checklist_item (test, "testing-subtitles", - "Whether we found subtitle in @sublocation", NULL); + "Whether we found subtitle in @sublocation", NULL, FALSE); insanity_test_add_checklist_item (test, "install-probes", - "Probes were installed on the sinks", NULL); + "Probes were installed on the sinks", NULL, FALSE); insanity_test_add_checklist_item (test, "subtitle-rendered", - "The subtitles are properly rendered on top of the video", NULL); + "The subtitles are properly rendered on top of the video", NULL, FALSE); insanity_test_add_checklist_item (test, "first-segment", "The demuxer sends a" - " first segment with proper values before " "first buffers", NULL); + " first segment with proper values before " "first buffers", NULL, FALSE); insanity_gst_pipeline_test_set_create_pipeline_function (ptest, &create_pipeline, NULL, NULL); |