tests: don't include element header files

This commit is contained in:
Wim Taymans 2012-03-21 13:19:50 +01:00
parent dd819ddc6b
commit 8e13d30a5a
2 changed files with 12 additions and 25 deletions

View file

@ -26,9 +26,6 @@
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
/* FIXME: remove this header once formats are refactored */
#include "gst/tcp/gstmultifdsink.h"
static GstPad *mysrcpad; static GstPad *mysrcpad;
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@ -509,9 +506,9 @@ GST_START_TEST (test_burst_client_bytes)
fail_unless_num_handles (sink, 0); fail_unless_num_handles (sink, 0);
g_signal_emit_by_name (sink, "add", pfd1[1]); g_signal_emit_by_name (sink, "add", pfd1[1]);
fail_unless_num_handles (sink, 1); fail_unless_num_handles (sink, 1);
g_signal_emit_by_name (sink, "add_full", pfd2[1], GST_SYNC_METHOD_BURST, g_signal_emit_by_name (sink, "add_full", pfd2[1], 3,
GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200); GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200);
g_signal_emit_by_name (sink, "add_full", pfd3[1], GST_SYNC_METHOD_BURST, g_signal_emit_by_name (sink, "add_full", pfd3[1], 3,
GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
fail_unless_num_handles (sink, 3); fail_unless_num_handles (sink, 3);
@ -601,11 +598,9 @@ GST_START_TEST (test_burst_client_bytes_keyframe)
/* now add the clients */ /* now add the clients */
g_signal_emit_by_name (sink, "add", pfd1[1]); g_signal_emit_by_name (sink, "add", pfd1[1]);
g_signal_emit_by_name (sink, "add_full", pfd2[1], g_signal_emit_by_name (sink, "add_full", pfd2[1],
GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90);
GST_FORMAT_BYTES, (guint64) 90);
g_signal_emit_by_name (sink, "add_full", pfd3[1], g_signal_emit_by_name (sink, "add_full", pfd3[1],
GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
GST_FORMAT_BYTES, (guint64) 50);
/* push last buffer to make client fds ready for reading */ /* push last buffer to make client fds ready for reading */
for (i = 9; i < 10; i++) { for (i = 9; i < 10; i++) {
@ -694,11 +689,9 @@ GST_START_TEST (test_burst_client_bytes_with_keyframe)
/* now add the clients */ /* now add the clients */
g_signal_emit_by_name (sink, "add", pfd1[1]); g_signal_emit_by_name (sink, "add", pfd1[1]);
g_signal_emit_by_name (sink, "add_full", pfd2[1], g_signal_emit_by_name (sink, "add_full", pfd2[1],
GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90);
(guint64) 50, GST_FORMAT_BYTES, (guint64) 90);
g_signal_emit_by_name (sink, "add_full", pfd3[1], g_signal_emit_by_name (sink, "add_full", pfd3[1],
GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
(guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
/* push last buffer to make client fds ready for reading */ /* push last buffer to make client fds ready for reading */
for (i = 9; i < 10; i++) { for (i = 9; i < 10; i++) {

View file

@ -28,8 +28,6 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
#include "gst/tcp/gstmultisocketsink.h"
static GstPad *mysrcpad; static GstPad *mysrcpad;
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@ -546,9 +544,9 @@ GST_START_TEST (test_burst_client_bytes)
fail_unless_num_handles (sink, 0); fail_unless_num_handles (sink, 0);
g_signal_emit_by_name (sink, "add", socket[0]); g_signal_emit_by_name (sink, "add", socket[0]);
fail_unless_num_handles (sink, 1); fail_unless_num_handles (sink, 1);
g_signal_emit_by_name (sink, "add_full", socket[2], GST_SYNC_METHOD_BURST, g_signal_emit_by_name (sink, "add_full", socket[2], 3,
GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200); GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200);
g_signal_emit_by_name (sink, "add_full", socket[4], GST_SYNC_METHOD_BURST, g_signal_emit_by_name (sink, "add_full", socket[4], 3,
GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
fail_unless_num_handles (sink, 3); fail_unless_num_handles (sink, 3);
@ -636,11 +634,9 @@ GST_START_TEST (test_burst_client_bytes_keyframe)
/* now add the clients */ /* now add the clients */
g_signal_emit_by_name (sink, "add", socket[0]); g_signal_emit_by_name (sink, "add", socket[0]);
g_signal_emit_by_name (sink, "add_full", socket[2], g_signal_emit_by_name (sink, "add_full", socket[2],
GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90);
GST_FORMAT_BYTES, (guint64) 90);
g_signal_emit_by_name (sink, "add_full", socket[4], g_signal_emit_by_name (sink, "add_full", socket[4],
GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
GST_FORMAT_BYTES, (guint64) 50);
/* push last buffer to make client fds ready for reading */ /* push last buffer to make client fds ready for reading */
for (i = 9; i < 10; i++) { for (i = 9; i < 10; i++) {
@ -730,11 +726,9 @@ GST_START_TEST (test_burst_client_bytes_with_keyframe)
/* now add the clients */ /* now add the clients */
g_signal_emit_by_name (sink, "add", socket[0]); g_signal_emit_by_name (sink, "add", socket[0]);
g_signal_emit_by_name (sink, "add_full", socket[2], g_signal_emit_by_name (sink, "add_full", socket[2],
GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90);
GST_FORMAT_BYTES, (guint64) 90);
g_signal_emit_by_name (sink, "add_full", socket[4], g_signal_emit_by_name (sink, "add_full", socket[4],
GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50);
GST_FORMAT_BYTES, (guint64) 50);
/* push last buffer to make client fds ready for reading */ /* push last buffer to make client fds ready for reading */
for (i = 9; i < 10; i++) { for (i = 9; i < 10; i++) {