rtponvif: split unit tests in several files

Split the unit tests for rtponviftimestamp and rtponvifparse
elements in separate files.
Setup and cleanup the element and pads in fixures. Make the tests work
with CK_FORK=no as well, by cleaning up the 'buffers' list when needed.
Make unit tests work when run in valgrind by unreffing all buffers,
and by not allocating any payload in RTP buffers. Since we're not
doing anything with the payload part, but we're memcmp-aring the
complete buffer memory, valgrind complained about non-initialized
memory being used.

https://bugzilla.gnome.org/show_bug.cgi?id=757688

tests/check/Makefile.am

@@ -268,7 +268,8 @@ check_PROGRAMS = \
 	elements/mxfdemux \
 	elements/mxfmux \
 	elements/pcapparse \
-	elements/rtponvif \
+	elements/rtponvifparse \
+	elements/rtponviftimestamp \
 	elements/id3mux \
 	pipelines/mxf \
 	$(check_mimic) \
@@ -458,8 +459,11 @@ libs_insertbin_LDADD = \
 libs_insertbin_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 
-elements_rtponvif_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_rtponvifparse_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_rtponvif_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstrtp-$(GST_API_VERSION) $(LDADD)
+elements_rtponvifparse_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstrtp-$(GST_API_VERSION) $(LDADD)
+
+elements_rtponviftimestamp_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_rtponviftimestamp_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstrtp-$(GST_API_VERSION) $(LDADD)
 
 EXTRA_DIST = gst-plugins-bad.supp $(uvch264_dist_data)
 

tests/check/elements/rtponvifparse.c

@@ -0,0 +1,246 @@
+/*
+ * onviftimestamp.c
+ *
+ * Copyright (C) 2014 Axis Communications AB
+ *  Author: Guillaume Desmottes <guillaume.desmottes@collabora.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gst/check/gstcheck.h>
+#include <gst/rtp/gstrtpbuffer.h>
+
+/* For ease of programming we use globals to keep refs for our floating
+ * src and sink pads we create; otherwise we always have to do get_pad,
+ * get_peer, and then remove references in every test function */
+static GstPad *mysrcpad, *mysinkpad;
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-rtp")
+    );
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-rtp")
+    );
+
+#define NTP_OFFSET (guint64) 1245
+#define TIMESTAMP 42
+
+static void
+setup_element (GstElement * element)
+{
+  mysrcpad = gst_check_setup_src_pad (element, &srctemplate);
+  mysinkpad = gst_check_setup_sink_pad (element, &sinktemplate);
+  gst_pad_set_active (mysrcpad, TRUE);
+  gst_pad_set_active (mysinkpad, TRUE);
+
+  fail_unless (gst_element_set_state (element,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+}
+
+static void
+cleanup_element (GstElement * element)
+{
+  fail_unless (gst_element_set_state (element,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  gst_pad_set_active (mysrcpad, FALSE);
+  if (mysinkpad)
+    gst_pad_set_active (mysinkpad, FALSE);
+  gst_check_teardown_src_pad (element);
+  gst_check_teardown_sink_pad (element);
+  gst_check_teardown_element (element);
+  mysrcpad = NULL;
+  mysinkpad = NULL;
+}
+
+static guint64
+convert_to_ntp (guint64 t)
+{
+  guint64 ntptime;
+
+  /* convert to NTP time. upper 32 bits should contain the seconds
+   * and the lower 32 bits, the fractions of a second. */
+  ntptime = gst_util_uint64_scale (t, (G_GINT64_CONSTANT (1) << 32),
+      GST_SECOND);
+
+  return ntptime;
+}
+
+/* Create a copy of @buffer_in having the RTP extension */
+static GstBuffer *
+create_extension_buffer (GstBuffer * buffer_in, gboolean clean_point,
+    gboolean end_contiguous, gboolean discont)
+{
+  GstBuffer *buffer_out;
+  GstRTPBuffer rtpbuffer_out = GST_RTP_BUFFER_INIT;
+  guint8 *data;
+  guint8 flags = 0;
+
+  buffer_out = gst_buffer_copy (buffer_in);
+
+  fail_unless (gst_rtp_buffer_map (buffer_out, GST_MAP_READWRITE,
+          &rtpbuffer_out));
+
+  /* extension */
+  gst_rtp_buffer_set_extension_data (&rtpbuffer_out, 0xABAC, 3);
+  fail_unless (gst_rtp_buffer_get_extension (&rtpbuffer_out));
+  gst_rtp_buffer_get_extension_data (&rtpbuffer_out, NULL, (gpointer) & data,
+      NULL);
+
+  /* NTP timestamp */
+  GST_WRITE_UINT64_BE (data, convert_to_ntp (buffer_in->pts + NTP_OFFSET));
+
+  /* C E D mbz */
+  if (clean_point)
+    flags |= (1 << 7);
+  if (end_contiguous)
+    flags |= (1 << 6);
+  if (discont)
+    flags |= (1 << 5);
+
+  GST_WRITE_UINT8 (data + 8, flags);
+
+  /* CSeq */
+  GST_WRITE_UINT8 (data + 9, 0x78);
+
+  memset (data + 10, 0, 4);
+
+  gst_rtp_buffer_unmap (&rtpbuffer_out);
+
+  return buffer_out;
+}
+
+static GstElement *
+setup_rtponvifparse (gboolean set_e_bit)
+{
+  GstElement *parse;
+
+  GST_DEBUG ("setup_rtponvifparse");
+  parse = gst_check_setup_element ("rtponvifparse");
+
+  setup_element (parse);
+
+  return parse;
+}
+
+static void
+cleanup_rtponvifparse (GstElement * parse)
+{
+  GST_DEBUG ("cleanup_rtponvifparse");
+
+  cleanup_element (parse);
+}
+
+static void
+test_parse (gboolean clean_point, gboolean discont)
+{
+  GstElement *parse;
+  GstBuffer *rtp, *buf;
+  GstSegment segment;
+
+  parse = setup_rtponvifparse (FALSE);
+
+  rtp = gst_rtp_buffer_new_allocate (4, 0, 0);
+  buf = create_extension_buffer (rtp, clean_point, FALSE, discont);
+  gst_buffer_unref (rtp);
+
+  /* stream start */
+  fail_unless (gst_pad_push_event (mysrcpad,
+          gst_event_new_stream_start ("test")));
+
+  /* Push a segment */
+  gst_segment_init (&segment, GST_FORMAT_TIME);
+  fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_segment (&segment)));
+
+  /* Push buffer */
+  fail_unless (gst_pad_push (mysrcpad, buf) == GST_FLOW_OK,
+      "failed pushing buffer");
+
+  g_assert_cmpuint (g_list_length (buffers), ==, 1);
+  buf = buffers->data;
+
+  if (clean_point)
+    g_assert (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT));
+  else
+    g_assert (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT));
+
+  if (discont)
+    g_assert (GST_BUFFER_IS_DISCONT (buf));
+  else
+    g_assert (!GST_BUFFER_IS_DISCONT (buf));
+
+  g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
+  g_list_free (buffers);
+  buffers = NULL;
+
+  ASSERT_OBJECT_REFCOUNT (parse, "rtponvifparse", 1);
+  cleanup_rtponvifparse (parse);
+}
+
+GST_START_TEST (test_parse_no_flag)
+{
+  test_parse (FALSE, FALSE);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_clean_point)
+{
+  test_parse (TRUE, FALSE);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_discont)
+{
+  test_parse (FALSE, TRUE);
+}
+
+GST_END_TEST;
+
+static Suite *
+onviftimestamp_suite (void)
+{
+  Suite *s = suite_create ("onviftimestamp");
+  TCase *tc_chain;
+
+  tc_chain = tcase_create ("parse");
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_parse_no_flag);
+  tcase_add_test (tc_chain, test_parse_clean_point);
+  tcase_add_test (tc_chain, test_parse_discont);
+
+  return s;
+}
+
+int
+main (int argc, char **argv)
+{
+  int nf;
+  Suite *s = onviftimestamp_suite ();
+  SRunner *sr = srunner_create (s);
+
+  gst_check_init (&argc, &argv);
+
+  srunner_run_all (sr, CK_NORMAL);
+  nf = srunner_ntests_failed (sr);
+  srunner_free (sr);
+
+  return nf;
+}

tests/check/elements/rtponviftimestamp.c

@@ -24,7 +24,9 @@
 /* For ease of programming we use globals to keep refs for our floating
  * src and sink pads we create; otherwise we always have to do get_pad,
  * get_peer, and then remove references in every test function */
-static GstPad *mysrcpad, *mysinkpad;
+static GstElement *element;
+static GstPad *mysrcpad;
+static GstPad *mysinkpad;
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -37,60 +39,37 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp")
     );
 
-#define NTP_OFFSET (guint64) 1245
+#define NTP_OFFSET ((guint64) 1245)
-#define TIMESTAMP 42
+#define TIMESTAMP ((GstClockTime) 42)
 
 static void
-setup_element (GstElement * element)
+setup (void)
 {
-  mysrcpad = gst_check_setup_src_pad (element, &srctemplate);
+  element = gst_check_setup_element ("rtponviftimestamp");
+
   mysinkpad = gst_check_setup_sink_pad (element, &sinktemplate);
-  gst_pad_set_active (mysrcpad, TRUE);
   gst_pad_set_active (mysinkpad, TRUE);
 
-  fail_unless (gst_element_set_state (element,
+  mysrcpad = gst_check_setup_src_pad (element, &srctemplate);
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+  gst_pad_set_active (mysrcpad, TRUE);
-      "could not set to playing");
 }
 
-static GstElement *
-setup_rtponviftimestamp (gboolean set_e_bit)
-{
-  GstElement *timestamp;
-
-  GST_DEBUG ("setup_rtponviftimestamp");
-  timestamp = gst_check_setup_element ("rtponviftimestamp");
-
-  g_object_set (timestamp, "ntp-offset", NTP_OFFSET, "cseq", 0x12345678,
-      "set-e-bit", set_e_bit, NULL);
-
-  setup_element (timestamp);
-
-  return timestamp;
-}
 
 static void
-cleanup_element (GstElement * element)
+cleanup (void)
 {
-  fail_unless (gst_element_set_state (element,
+  gst_check_drop_buffers ();
-          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
 
   gst_pad_set_active (mysrcpad, FALSE);
-  if (mysinkpad)
-    gst_pad_set_active (mysinkpad, FALSE);
   gst_check_teardown_src_pad (element);
-  gst_check_teardown_sink_pad (element);
-  gst_check_teardown_element (element);
   mysrcpad = NULL;
+
+  gst_pad_set_active (mysinkpad, FALSE);
+  gst_check_teardown_sink_pad (element);
   mysinkpad = NULL;
-}
 
-static void
+  gst_check_teardown_element (element);
-cleanup_rtponviftimestamp (GstElement * timestamp)
+  element = NULL;
-{
-  GST_DEBUG ("cleanup_rtponviftimestamp");
-
-  cleanup_element (timestamp);
 }
 
 static void
@@ -101,18 +80,17 @@ check_buffer_equal (GstBuffer * buf, GstBuffer * expected)
   fail_if (buf == NULL);
   fail_if (expected == NULL);
 
-  gst_buffer_map (buf, &info_buf, GST_MAP_READ);
+  fail_unless (gst_buffer_map (buf, &info_buf, GST_MAP_READ));
-  gst_buffer_map (expected, &info_expected, GST_MAP_READ);
+  fail_unless (gst_buffer_map (expected, &info_expected, GST_MAP_READ));
 
   GST_LOG ("buffer: size %" G_GSIZE_FORMAT, info_buf.size);
   GST_LOG ("expected: size %" G_GSIZE_FORMAT, info_expected.size);
   GST_MEMDUMP ("buffer", info_buf.data, info_buf.size);
   GST_MEMDUMP ("expected", info_expected.data, info_expected.size);
 
-  fail_unless (info_buf.size == info_expected.size,
+  fail_unless_equals_uint64 (info_buf.size, info_expected.size);
-      "size of the buffers are not the same");
+  fail_unless_equals_int (memcmp (info_buf.data, info_expected.data,
-  fail_unless (memcmp (info_buf.data, info_expected.data, info_buf.size) == 0,
+          info_buf.size), 0);
-      "data is not the same");
 
   gst_buffer_unmap (buf, &info_buf);
   gst_buffer_unmap (expected, &info_expected);
@@ -120,13 +98,14 @@ check_buffer_equal (GstBuffer * buf, GstBuffer * expected)
 
 /* Create a RTP buffer without the extension */
 static GstBuffer *
-create_rtp_buffer (guint64 timestamp, gboolean clean_point, gboolean discont)
+create_rtp_buffer (GstClockTime timestamp, gboolean clean_point,
+    gboolean discont)
 {
   GstBuffer *buffer_in;
   GstRTPBuffer rtpbuffer_in = GST_RTP_BUFFER_INIT;
 
-  buffer_in = gst_rtp_buffer_new_allocate (4, 0, 0);
+  buffer_in = gst_rtp_buffer_new_allocate (0, 0, 0);
-  buffer_in->pts = timestamp;
+  GST_BUFFER_PTS (buffer_in) = timestamp;
 
   if (!clean_point)
     GST_BUFFER_FLAG_SET (buffer_in, GST_BUFFER_FLAG_DELTA_UNIT);
@@ -141,7 +120,7 @@ create_rtp_buffer (guint64 timestamp, gboolean clean_point, gboolean discont)
 }
 
 static guint64
-convert_to_ntp (guint64 t)
+convert_to_ntp (GstClockTime t)
 {
   guint64 ntptime;
 
@@ -169,10 +148,10 @@ create_extension_buffer (GstBuffer * buffer_in, gboolean clean_point,
           &rtpbuffer_out));
 
   /* extension */
-  gst_rtp_buffer_set_extension_data (&rtpbuffer_out, 0xABAC, 3);
+  fail_unless (gst_rtp_buffer_set_extension_data (&rtpbuffer_out, 0xABAC, 3));
   fail_unless (gst_rtp_buffer_get_extension (&rtpbuffer_out));
-  gst_rtp_buffer_get_extension_data (&rtpbuffer_out, NULL, (gpointer) & data,
+  fail_unless (gst_rtp_buffer_get_extension_data (&rtpbuffer_out, NULL,
-      NULL);
+          (gpointer) & data, NULL));
 
   /* NTP timestamp */
   GST_WRITE_UINT64_BE (data, convert_to_ntp (buffer_in->pts + NTP_OFFSET));
@@ -200,57 +179,45 @@ create_extension_buffer (GstBuffer * buffer_in, gboolean clean_point,
 static void
 do_one_buffer_test_apply (gboolean clean_point, gboolean discont)
 {
-  GstElement *apply;
   GstBuffer *buffer_in, *buffer_out;
-  GstSegment segment;
 
-  apply = setup_rtponviftimestamp (FALSE);
+  g_object_set (element, "ntp-offset", NTP_OFFSET, "cseq", 0x12345678,
+      "set-e-bit", FALSE, NULL);
+
+  ASSERT_SET_STATE (element, GST_STATE_PLAYING, GST_STATE_CHANGE_SUCCESS);
 
   buffer_in = create_rtp_buffer (TIMESTAMP, clean_point, discont);
   buffer_out = create_extension_buffer (buffer_in, clean_point, FALSE, discont);
 
-  /* stream start */
+  /* push initial events */
-  fail_unless (gst_pad_push_event (mysrcpad,
+  gst_check_setup_events (mysrcpad, element, NULL, GST_FORMAT_TIME);
-          gst_event_new_stream_start ("test")));
-
-  /* Push a segment */
-  gst_segment_init (&segment, GST_FORMAT_TIME);
-  fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_segment (&segment)));
 
   /* Push buffer */
-  fail_unless (gst_pad_push (mysrcpad, buffer_in) == GST_FLOW_OK,
+  fail_unless_equals_int (gst_pad_push (mysrcpad, buffer_in), GST_FLOW_OK);
-      "failed pushing buffer");
 
-  check_buffer_equal (buffers->data, buffer_out);
+  check_buffer_equal ((GstBuffer *) buffers->data, buffer_out);
+  gst_buffer_unref (buffer_out);
 
-  g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
+  ASSERT_SET_STATE (element, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS);
-  g_list_free (buffers);
-  buffers = NULL;
-
-  ASSERT_OBJECT_REFCOUNT (apply, "rtponviftimestamp", 1);
-  cleanup_rtponviftimestamp (apply);
 }
 
 static void
 do_two_buffers_test_apply (gboolean end_contiguous)
 {
-  GstElement *apply;
   GstBuffer *buffer_in, *buffer_out;
-  GstSegment segment;
+  GList *node;
 
-  apply = setup_rtponviftimestamp (TRUE);
+  g_object_set (element, "ntp-offset", NTP_OFFSET, "cseq", 0x12345678,
+      "set-e-bit", TRUE, NULL);
+
+  ASSERT_SET_STATE (element, GST_STATE_PLAYING, GST_STATE_CHANGE_SUCCESS);
 
   buffer_in = create_rtp_buffer (TIMESTAMP, FALSE, FALSE);
   buffer_out = create_extension_buffer (buffer_in, FALSE, end_contiguous,
       FALSE);
 
-  /* stream start */
+  /* push initial events */
-  fail_unless (gst_pad_push_event (mysrcpad,
+  gst_check_setup_events (mysrcpad, element, NULL, GST_FORMAT_TIME);
-          gst_event_new_stream_start ("test")));
-
-  /* Push a segment */
-  gst_segment_init (&segment, GST_FORMAT_TIME);
-  fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_segment (&segment)));
 
   /* Push buffer */
   fail_unless (gst_pad_push (mysrcpad, buffer_in) == GST_FLOW_OK,
@@ -258,36 +225,34 @@ do_two_buffers_test_apply (gboolean end_contiguous)
 
   /* The buffer hasn't been pushed it as the element is waiting for the next
    * buffer. */
-  g_assert_cmpuint (g_list_length (buffers), ==, 0);
+  fail_unless_equals_int (g_list_length (buffers), 0);
 
   /* A second buffer is pushed, it has the DISCONT flag if we want that the
    * first one has the 'E' bit set. */
   buffer_in = create_rtp_buffer (TIMESTAMP + 1, FALSE, end_contiguous);
 
-  fail_unless (gst_pad_push (mysrcpad, buffer_in) == GST_FLOW_OK,
+  fail_unless_equals_int (gst_pad_push (mysrcpad, buffer_in), GST_FLOW_OK);
-      "failed pushing buffer");
 
   /* The first buffer has now been pushed out */
-  g_assert_cmpuint (g_list_length (buffers), ==, 1);
+  fail_unless_equals_int (g_list_length (buffers), 1);
 
-  check_buffer_equal (buffers->data, buffer_out);
+  node = g_list_last (buffers);
-
+  check_buffer_equal ((GstBuffer *) node->data, buffer_out);
-  g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
+  gst_buffer_unref (buffer_out);
-  g_list_free (buffers);
-  buffers = NULL;
 
   /* Push EOS */
   fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_eos ()));
 
   /* The second buffer has been pushed out */
-  g_assert_cmpuint (g_list_length (buffers), ==, 1);
+  fail_unless_equals_int (g_list_length (buffers), 2);
 
   /* Latest buffer always has the 'E' flag */
   buffer_out = create_extension_buffer (buffer_in, FALSE, TRUE, end_contiguous);
-  check_buffer_equal (buffers->data, buffer_out);
+  node = g_list_last (buffers);
+  check_buffer_equal ((GstBuffer *) node->data, buffer_out);
+  gst_buffer_unref (buffer_out);
 
-  ASSERT_OBJECT_REFCOUNT (apply, "rtponviftimestamp", 1);
+  ASSERT_SET_STATE (element, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS);
-  cleanup_rtponviftimestamp (apply);
 }
 
 GST_START_TEST (test_apply_discont)
@@ -325,94 +290,6 @@ GST_START_TEST (test_apply_e_bit)
 
 GST_END_TEST;
 
-static GstElement *
-setup_rtponvifparse (gboolean set_e_bit)
-{
-  GstElement *parse;
-
-  GST_DEBUG ("setup_rtponvifparse");
-  parse = gst_check_setup_element ("rtponvifparse");
-
-  setup_element (parse);
-
-  return parse;
-}
-
-static void
-cleanup_rtponvifparse (GstElement * parse)
-{
-  GST_DEBUG ("cleanup_rtponvifparse");
-
-  cleanup_element (parse);
-}
-
-static void
-test_parse (gboolean clean_point, gboolean discont)
-{
-  GstElement *parse;
-  GstBuffer *rtp, *buf;
-  GstSegment segment;
-
-  parse = setup_rtponvifparse (FALSE);
-
-  rtp = gst_rtp_buffer_new_allocate (4, 0, 0);
-  buf = create_extension_buffer (rtp, clean_point, FALSE, discont);
-  gst_buffer_unref (rtp);
-
-  /* stream start */
-  fail_unless (gst_pad_push_event (mysrcpad,
-          gst_event_new_stream_start ("test")));
-
-  /* Push a segment */
-  gst_segment_init (&segment, GST_FORMAT_TIME);
-  fail_unless (gst_pad_push_event (mysrcpad, gst_event_new_segment (&segment)));
-
-  /* Push buffer */
-  fail_unless (gst_pad_push (mysrcpad, buf) == GST_FLOW_OK,
-      "failed pushing buffer");
-
-  g_assert_cmpuint (g_list_length (buffers), ==, 1);
-  buf = buffers->data;
-
-  if (clean_point)
-    g_assert (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT));
-  else
-    g_assert (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT));
-
-  if (discont)
-    g_assert (GST_BUFFER_IS_DISCONT (buf));
-  else
-    g_assert (!GST_BUFFER_IS_DISCONT (buf));
-
-  g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
-  g_list_free (buffers);
-  buffers = NULL;
-
-  ASSERT_OBJECT_REFCOUNT (parse, "rtponvifparse", 1);
-  cleanup_rtponvifparse (parse);
-}
-
-GST_START_TEST (test_parse_no_flag)
-{
-  test_parse (FALSE, FALSE);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_parse_clean_point)
-{
-  test_parse (TRUE, FALSE);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_parse_discont)
-{
-  test_parse (FALSE, TRUE);
-}
-
-GST_END_TEST;
-
 static Suite *
 onviftimestamp_suite (void)
 {
@@ -420,19 +297,16 @@ onviftimestamp_suite (void)
   TCase *tc_chain;
 
   tc_chain = tcase_create ("apply");
+
   suite_add_tcase (s, tc_chain);
+  tcase_add_checked_fixture (tc_chain, setup, cleanup);
+
   tcase_add_test (tc_chain, test_apply_discont);
   tcase_add_test (tc_chain, test_apply_not_discont);
   tcase_add_test (tc_chain, test_apply_clean_point);
   tcase_add_test (tc_chain, test_apply_no_e_bit);
   tcase_add_test (tc_chain, test_apply_e_bit);
 
-  tc_chain = tcase_create ("parse");
-  suite_add_tcase (s, tc_chain);
-  tcase_add_test (tc_chain, test_parse_no_flag);
-  tcase_add_test (tc_chain, test_parse_clean_point);
-  tcase_add_test (tc_chain, test_parse_discont);
-
   return s;
 }