From e5fb7275c28256974cf71f4dd51a22df61e62f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 6 Jan 2016 01:06:10 +0000 Subject: [PATCH] tests: fix indentation of various unit tests --- tests/check/libs/audiodecoder.c | 20 ++++----- tests/check/libs/audioencoder.c | 15 ++++--- tests/check/libs/rtp.c | 69 +++++++++++++++++-------------- tests/check/libs/rtpbasepayload.c | 36 +++++----------- 4 files changed, 65 insertions(+), 75 deletions(-) diff --git a/tests/check/libs/audiodecoder.c b/tests/check/libs/audiodecoder.c index cd7bbb4260..5b92caf41f 100644 --- a/tests/check/libs/audiodecoder.c +++ b/tests/check/libs/audiodecoder.c @@ -202,8 +202,8 @@ static GstHarness * setup_audiodecodertester (GstStaticPadTemplate * sinktemplate, GstStaticPadTemplate * srctemplate) { - GstHarness * h; - GstElement * dec; + GstHarness *h; + GstElement *dec; if (sinktemplate == NULL) sinktemplate = &sinktemplate_default; @@ -215,9 +215,7 @@ setup_audiodecodertester (GstStaticPadTemplate * sinktemplate, gst_harness_set_src_caps (h, gst_caps_new_simple ("audio/x-test-custom", - "channels", G_TYPE_INT, 2, - "rate", G_TYPE_INT, 44100, - NULL)); + "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100, NULL)); gst_object_unref (dec); return h; @@ -337,8 +335,7 @@ GST_START_TEST (audiodecoder_negotiation_with_gap_event) GstHarness *h = setup_audiodecodertester (NULL, NULL); /* push a gap event to force audiodecoder to push a caps event */ - fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, - GST_SECOND))); + fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, GST_SECOND))); fail_unless_equals_int (0, gst_harness_buffers_in_queue (h)); check_audiodecoder_negotiation (h); @@ -355,8 +352,7 @@ GST_START_TEST (audiodecoder_delayed_negotiation_with_gap_event) ((GstAudioDecoderTester *) h->element)->setoutputformat_on_decoding = TRUE; /* push a gap event to force audiodecoder to push a caps event */ - fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, - GST_SECOND))); + fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, GST_SECOND))); fail_unless_equals_int (0, gst_harness_buffers_in_queue (h)); check_audiodecoder_negotiation (h); @@ -372,8 +368,7 @@ GST_START_TEST (audiodecoder_first_data_is_gap) GstHarness *h = setup_audiodecodertester (NULL, NULL); /* push a gap */ - fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, - GST_SECOND))); + fail_unless (gst_harness_push_event (h, gst_event_new_gap (0, GST_SECOND))); /* make sure the usual events have been received */ { @@ -426,7 +421,8 @@ _audiodecoder_flush_events (gboolean send_buffers) tags = gst_tag_list_new (GST_TAG_TRACK_NUMBER, i, NULL); fail_unless (gst_harness_push_event (h, gst_event_new_tag (tags))); } else { - fail_unless (gst_harness_push (h, create_test_buffer (i)) == GST_FLOW_OK); + fail_unless (gst_harness_push (h, + create_test_buffer (i)) == GST_FLOW_OK); } } } else { diff --git a/tests/check/libs/audioencoder.c b/tests/check/libs/audioencoder.c index cdcb531910..614440d914 100644 --- a/tests/check/libs/audioencoder.c +++ b/tests/check/libs/audioencoder.c @@ -138,8 +138,8 @@ gst_audio_encoder_tester_init (GstAudioEncoderTester * tester) static GstHarness * setup_audioencodertester (void) { - GstHarness * h; - GstElement * enc; + GstHarness *h; + GstElement *enc; static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -157,11 +157,10 @@ setup_audioencodertester (void) gst_harness_set_src_caps (h, gst_caps_new_simple ("audio/x-raw", - "rate", G_TYPE_INT, TEST_AUDIO_RATE, - "channels", G_TYPE_INT, TEST_AUDIO_CHANNELS, - "format", G_TYPE_STRING, TEST_AUDIO_FORMAT, - "layout", G_TYPE_STRING, "interleaved", - NULL)); + "rate", G_TYPE_INT, TEST_AUDIO_RATE, + "channels", G_TYPE_INT, TEST_AUDIO_CHANNELS, + "format", G_TYPE_STRING, TEST_AUDIO_FORMAT, + "layout", G_TYPE_STRING, "interleaved", NULL)); gst_object_unref (enc); return h; @@ -196,7 +195,7 @@ GST_START_TEST (audioencoder_playback) guint64 i; guint buffers_available; - GstHarness * h = setup_audioencodertester (); + GstHarness *h = setup_audioencodertester (); /* push buffers, the data is actually a number so we can track them */ for (i = 0; i < NUM_BUFFERS; i++) { diff --git a/tests/check/libs/rtp.c b/tests/check/libs/rtp.c index 602a9a1edd..d69357ab2f 100644 --- a/tests/check/libs/rtp.c +++ b/tests/check/libs/rtp.c @@ -832,7 +832,7 @@ GST_START_TEST (test_rtcp_validate_with_padding) /* Compound packet with padding in the last packet. Padding is included in * the length of the last packet. */ guint8 rtcp_pkt[] = { - 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ + 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -840,21 +840,22 @@ GST_START_TEST (test_rtcp_validate_with_padding) 0x3b, 0x79, 0x31, 0x50, 0xbe, 0x19, 0x12, 0xa8, 0xbb, 0xce, 0x9e, 0x3e, - 0xA0, 0xCA, 0x00, 0x0A, /* P=1, Type SDES, length = 10 (includes padding) */ + 0xA0, 0xCA, 0x00, 0x0A, /* P=1, Type SDES, length = 10 (includes padding) */ 0x97, 0x6d, 0x21, 0x6a, - 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ + 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ + 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ - 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ + 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ + 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ }; fail_unless (gst_rtcp_buffer_validate_data (rtcp_pkt, sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtcp_validate_with_padding_wrong_padlength) @@ -862,7 +863,7 @@ GST_START_TEST (test_rtcp_validate_with_padding_wrong_padlength) /* Compound packet with padding in the last packet. Padding is included in * the length of the last packet. */ guint8 rtcp_pkt[] = { - 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ + 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -870,21 +871,22 @@ GST_START_TEST (test_rtcp_validate_with_padding_wrong_padlength) 0x3b, 0x79, 0x31, 0x50, 0xbe, 0x19, 0x12, 0xa8, 0xbb, 0xce, 0x9e, 0x3e, - 0xA0, 0xCA, 0x00, 0x0A, /* P=1, Type SDES, length = 10 (includes padding) */ + 0xA0, 0xCA, 0x00, 0x0A, /* P=1, Type SDES, length = 10 (includes padding) */ 0x97, 0x6d, 0x21, 0x6a, - 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ + 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ + 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ - 0x00, 0x00, 0x00, 0x03 /* RTCP padding (wrong length) */ + 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ + 0x00, 0x00, 0x00, 0x03 /* RTCP padding (wrong length) */ }; fail_if (gst_rtcp_buffer_validate_data (rtcp_pkt, sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtcp_validate_with_padding_excluded_from_length) @@ -892,7 +894,7 @@ GST_START_TEST (test_rtcp_validate_with_padding_excluded_from_length) /* Compound packet with padding in the last packet. Padding is not included * in the length. */ guint8 rtcp_pkt[] = { - 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ + 0x80, 0xC9, 0x00, 0x07, /* Type RR, length = 7 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -900,21 +902,22 @@ GST_START_TEST (test_rtcp_validate_with_padding_excluded_from_length) 0x3b, 0x79, 0x31, 0x50, 0xbe, 0x19, 0x12, 0xa8, 0xbb, 0xce, 0x9e, 0x3e, - 0xA0, 0xCA, 0x00, 0x09, /* P=1, Type SDES, length = 9 (excludes padding) */ + 0xA0, 0xCA, 0x00, 0x09, /* P=1, Type SDES, length = 9 (excludes padding) */ 0x97, 0x6d, 0x21, 0x6a, - 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ + 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ + 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ - 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ + 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ + 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ }; fail_if (gst_rtcp_buffer_validate_data (rtcp_pkt, sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtcp_validate_with_padding_set_in_first_packet) @@ -922,7 +925,7 @@ GST_START_TEST (test_rtcp_validate_with_padding_set_in_first_packet) /* Compound packet with padding in the last packet but with the pad bit set on first packet */ guint8 rtcp_pkt[] = { - 0xA0, 0xC9, 0x00, 0x07, /* P=1, Type RR, length = 7 */ + 0xA0, 0xC9, 0x00, 0x07, /* P=1, Type RR, length = 7 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -930,28 +933,29 @@ GST_START_TEST (test_rtcp_validate_with_padding_set_in_first_packet) 0x3b, 0x79, 0x31, 0x50, 0xbe, 0x19, 0x12, 0xa8, 0xbb, 0xce, 0x9e, 0x3e, - 0x80, 0xCA, 0x00, 0x0a, /* Type SDES, length = 10 (include padding) */ + 0x80, 0xCA, 0x00, 0x0a, /* Type SDES, length = 10 (include padding) */ 0x97, 0x6d, 0x21, 0x6a, - 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ + 0x01, 0x0F, 0x00, 0x00, /* Type 1 (CNAME), length 15 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ + 0x00, 0x02, 0x09, 0x00, /* Type 2 (NAME), length 9 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ - 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ + 0x00, 0x00, 0x00, 0x00, /* Type 0 (no length, 2 unused bytes) */ + 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ }; fail_if (gst_rtcp_buffer_validate_data (rtcp_pkt, sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtcp_validate_reduced_without_padding) { /* Reduced size packet without padding */ guint8 rtcp_pkt[] = { - 0x80, 0xcd, 0x00, 0x07, /* Type FB, length = 8 */ + 0x80, 0xcd, 0x00, 0x07, /* Type FB, length = 8 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -961,15 +965,17 @@ GST_START_TEST (test_rtcp_validate_reduced_without_padding) 0xbb, 0xce, 0x9e, 0x3e, }; - fail_unless (gst_rtcp_buffer_validate_data_reduced (rtcp_pkt, sizeof (rtcp_pkt))); + fail_unless (gst_rtcp_buffer_validate_data_reduced (rtcp_pkt, + sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtcp_validate_reduced_with_padding) { /* Reduced size packet with padding. */ guint8 rtcp_pkt[] = { - 0xA0, 0xcd, 0x00, 0x08, /* P=1, Type FB, length = 8 */ + 0xA0, 0xcd, 0x00, 0x08, /* P=1, Type FB, length = 8 */ 0x97, 0x6d, 0x21, 0x6a, 0x4d, 0x16, 0xaf, 0x14, 0x10, 0x1f, 0xd9, 0x91, @@ -977,11 +983,12 @@ GST_START_TEST (test_rtcp_validate_reduced_with_padding) 0x3b, 0x79, 0x31, 0x50, 0xbe, 0x19, 0x12, 0xa8, 0xbb, 0xce, 0x9e, 0x3e, - 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ + 0x00, 0x00, 0x00, 0x04 /* RTCP padding */ }; fail_if (gst_rtcp_buffer_validate_data_reduced (rtcp_pkt, sizeof (rtcp_pkt))); } + GST_END_TEST; GST_START_TEST (test_rtp_ntp64_extension) @@ -1218,8 +1225,10 @@ rtp_suite (void) tcase_add_test (tc_chain, test_rtcp_reduced_buffer); tcase_add_test (tc_chain, test_rtcp_validate_with_padding); tcase_add_test (tc_chain, test_rtcp_validate_with_padding_wrong_padlength); - tcase_add_test (tc_chain, test_rtcp_validate_with_padding_excluded_from_length); - tcase_add_test (tc_chain, test_rtcp_validate_with_padding_set_in_first_packet); + tcase_add_test (tc_chain, + test_rtcp_validate_with_padding_excluded_from_length); + tcase_add_test (tc_chain, + test_rtcp_validate_with_padding_set_in_first_packet); tcase_add_test (tc_chain, test_rtcp_validate_reduced_without_padding); tcase_add_test (tc_chain, test_rtcp_validate_reduced_with_padding); tcase_add_test (tc_chain, test_rtp_ntp64_extension); diff --git a/tests/check/libs/rtpbasepayload.c b/tests/check/libs/rtpbasepayload.c index cb38be38bf..09f5ca0893 100644 --- a/tests/check/libs/rtpbasepayload.c +++ b/tests/check/libs/rtpbasepayload.c @@ -1783,30 +1783,23 @@ GST_START_TEST (rtp_base_payload_framerate_attribute) State *state; state = create_payloader ("video/x-raw,framerate=(fraction)1/4", &sinktmpl, - "perfect-rtptime", FALSE, - NULL); + "perfect-rtptime", FALSE, NULL); set_state (state, GST_STATE_PLAYING); - push_buffer (state, - "pts", 0 * GST_SECOND, - NULL); + push_buffer (state, "pts", 0 * GST_SECOND, NULL); set_state (state, GST_STATE_NULL); validate_buffers_received (1); - validate_buffer (0, - "pts", 0 * GST_SECOND, - NULL); + validate_buffer (0, "pts", 0 * GST_SECOND, NULL); validate_events_received (3); validate_normal_start_events (0); - validate_event (1, "caps", - "a-framerate", "0.25", - NULL); + validate_event (1, "caps", "a-framerate", "0.25", NULL); destroy_payloader (state); } @@ -1823,33 +1816,26 @@ GST_START_TEST (rtp_base_payload_max_framerate_attribute) { State *state; - state = create_payloader ( - "video/x-raw,framerate=(fraction)0/1,max-framerate=(fraction)1/8", - &sinktmpl, - "perfect-rtptime", FALSE, - NULL); + state = + create_payloader + ("video/x-raw,framerate=(fraction)0/1,max-framerate=(fraction)1/8", + &sinktmpl, "perfect-rtptime", FALSE, NULL); set_state (state, GST_STATE_PLAYING); - push_buffer (state, - "pts", 0 * GST_SECOND, - NULL); + push_buffer (state, "pts", 0 * GST_SECOND, NULL); set_state (state, GST_STATE_NULL); validate_buffers_received (1); - validate_buffer (0, - "pts", 0 * GST_SECOND, - NULL); + validate_buffer (0, "pts", 0 * GST_SECOND, NULL); validate_events_received (3); validate_normal_start_events (0); - validate_event (1, "caps", - "a-framerate", "0.125", - NULL); + validate_event (1, "caps", "a-framerate", "0.125", NULL); destroy_payloader (state); }