Use GstClockTime in _get_state() instead of GTimeVal.

[platform/upstream/gstreamer.git] / tests / check / gst / gstelement.c

diff --git a/tests/check/gst/gstelement.c b/tests/check/gst/gstelement.c
index 27bd84e..8d00af9 100644 (file)
--- a/tests/check/gst/gstelement.c
+++ b/tests/check/gst/gstelement.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "../gstcheck.h"
+#include <gst/check/gstcheck.h>
 
 GST_START_TEST (test_add_remove_pad)
 {
@@ -94,8 +94,7 @@ GST_START_TEST (test_error_no_bus)
 
 GST_END_TEST;
 
-/* link and run two elements without putting them in a 
- * pipeline */
+/* link and run two elements without putting them in a pipeline */
 GST_START_TEST (test_link)
 {
   GstElement *src, *sink;
@@ -110,7 +109,7 @@ GST_START_TEST (test_link)
   gst_element_set_state (src, GST_STATE_PAUSED);
 
   /* wait for preroll */
-  gst_element_get_state (sink, NULL, NULL, NULL);
+  gst_element_get_state (sink, NULL, NULL, GST_CLOCK_TIME_NONE);
 
   /* play some more */
   gst_element_set_state (sink, GST_STATE_PLAYING);
@@ -123,7 +122,7 @@ GST_START_TEST (test_link)
   gst_element_set_state (src, GST_STATE_PAUSED);
 
   /* wait for preroll */
-  gst_element_get_state (sink, NULL, NULL, NULL);
+  gst_element_get_state (sink, NULL, NULL, GST_CLOCK_TIME_NONE);
 
   gst_element_set_state (sink, GST_STATE_NULL);
   gst_element_set_state (src, GST_STATE_NULL);
@@ -131,6 +130,22 @@ GST_START_TEST (test_link)
 
 GST_END_TEST;
 
+/* linking two elements without pads should fail */
+GST_START_TEST (test_link_no_pads)
+{
+  GstElement *src, *sink;
+
+  src = gst_bin_new ("src");
+  sink = gst_bin_new ("sink");
+
+  fail_if (gst_element_link (src, sink));
+
+  gst_object_unref (src);
+  gst_object_unref (sink);
+}
+
+GST_END_TEST;
+
 Suite *
 gst_element_suite (void)
 {
@@ -142,6 +157,7 @@ gst_element_suite (void)
   tcase_add_test (tc_chain, test_add_pad_unref_element);
   tcase_add_test (tc_chain, test_error_no_bus);
   tcase_add_test (tc_chain, test_link);
+  tcase_add_test (tc_chain, test_link_no_pads);
 
   return s;
 }