diff --git a/configure.ac b/configure.ac index 5004111c99..101e5e4467 100644 --- a/configure.ac +++ b/configure.ac @@ -676,7 +676,6 @@ tests/seeking/Makefile tests/sched/Makefile tests/threadstate/Makefile testsuite/Makefile -testsuite/bins/Makefile testsuite/bytestream/Makefile testsuite/caps/Makefile testsuite/cleanup/Makefile diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am index 70dda3e8f1..f2e717e777 100644 --- a/tests/old/testsuite/Makefile.am +++ b/tests/old/testsuite/Makefile.am @@ -14,7 +14,7 @@ GST_DEBUG_DIRS = debug endif SUBDIRS = \ - bins bytestream caps cleanup clock \ + bytestream caps cleanup clock \ $(GST_DEBUG_DIRS) \ dlopen dynparams \ elements ghostpads indexers negotiation pad \ @@ -22,7 +22,7 @@ SUBDIRS = \ plugin refcounting schedulers states threads trigger DIST_SUBDIRS = \ - bins bytestream caps cleanup clock \ + bytestream caps cleanup clock \ debug \ dlopen dynparams \ elements ghostpads indexers negotiation pad \ diff --git a/tests/old/testsuite/bins/.gitignore b/tests/old/testsuite/bins/.gitignore deleted file mode 100644 index b529896ae8..0000000000 --- a/tests/old/testsuite/bins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -interface diff --git a/tests/old/testsuite/bins/Makefile.am b/tests/old/testsuite/bins/Makefile.am deleted file mode 100644 index 265f5ca1fa..0000000000 --- a/tests/old/testsuite/bins/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -include ../Rules - -tests_pass = interface -tests_fail = -tests_ignore = diff --git a/tests/old/testsuite/bins/interface.c b/tests/old/testsuite/bins/interface.c deleted file mode 100644 index cefe1c6fde..0000000000 --- a/tests/old/testsuite/bins/interface.c +++ /dev/null @@ -1,87 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -/* tests if gst_bin_iterate_(all_)by_interface works */ - -gint -main (gint argc, gchar * argv[]) -{ - GstBin *bin, *bin2; - GstElement *filesrc; - GstIterator *it; - gpointer item; - - gst_init (&argc, &argv); - - bin = GST_BIN (gst_bin_new (NULL)); - g_assert (bin); - - filesrc = gst_element_factory_make ("filesrc", NULL); - g_assert (filesrc); - g_assert (GST_IS_URI_HANDLER (filesrc)); - gst_bin_add (bin, filesrc); - - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (it != NULL); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - gst_bin_add_many (bin, - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), NULL); - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (it != NULL); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - bin2 = bin; - bin = GST_BIN (gst_bin_new (NULL)); - g_assert (bin); - gst_bin_add_many (bin, - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), - GST_ELEMENT (bin2), gst_element_factory_make ("identity", NULL), NULL); - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - gst_bin_add (bin, gst_element_factory_make ("filesrc", NULL)); - gst_bin_add (bin2, gst_element_factory_make ("filesrc", NULL)); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - g_object_unref (bin); - return 0; -} diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 70dda3e8f1..f2e717e777 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -14,7 +14,7 @@ GST_DEBUG_DIRS = debug endif SUBDIRS = \ - bins bytestream caps cleanup clock \ + bytestream caps cleanup clock \ $(GST_DEBUG_DIRS) \ dlopen dynparams \ elements ghostpads indexers negotiation pad \ @@ -22,7 +22,7 @@ SUBDIRS = \ plugin refcounting schedulers states threads trigger DIST_SUBDIRS = \ - bins bytestream caps cleanup clock \ + bytestream caps cleanup clock \ debug \ dlopen dynparams \ elements ghostpads indexers negotiation pad \ diff --git a/testsuite/bins/.gitignore b/testsuite/bins/.gitignore deleted file mode 100644 index b529896ae8..0000000000 --- a/testsuite/bins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -interface diff --git a/testsuite/bins/Makefile.am b/testsuite/bins/Makefile.am deleted file mode 100644 index 265f5ca1fa..0000000000 --- a/testsuite/bins/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -include ../Rules - -tests_pass = interface -tests_fail = -tests_ignore = diff --git a/testsuite/bins/interface.c b/testsuite/bins/interface.c deleted file mode 100644 index cefe1c6fde..0000000000 --- a/testsuite/bins/interface.c +++ /dev/null @@ -1,87 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -/* tests if gst_bin_iterate_(all_)by_interface works */ - -gint -main (gint argc, gchar * argv[]) -{ - GstBin *bin, *bin2; - GstElement *filesrc; - GstIterator *it; - gpointer item; - - gst_init (&argc, &argv); - - bin = GST_BIN (gst_bin_new (NULL)); - g_assert (bin); - - filesrc = gst_element_factory_make ("filesrc", NULL); - g_assert (filesrc); - g_assert (GST_IS_URI_HANDLER (filesrc)); - gst_bin_add (bin, filesrc); - - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (it != NULL); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - gst_bin_add_many (bin, - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), NULL); - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (it != NULL); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - bin2 = bin; - bin = GST_BIN (gst_bin_new (NULL)); - g_assert (bin); - gst_bin_add_many (bin, - gst_element_factory_make ("identity", NULL), - gst_element_factory_make ("identity", NULL), - GST_ELEMENT (bin2), gst_element_factory_make ("identity", NULL), NULL); - g_assert (gst_bin_get_by_interface (bin, GST_TYPE_URI_HANDLER) == filesrc); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (item == (gpointer) filesrc); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - gst_bin_add (bin, gst_element_factory_make ("filesrc", NULL)); - gst_bin_add (bin2, gst_element_factory_make ("filesrc", NULL)); - it = gst_bin_iterate_all_by_interface (bin, GST_TYPE_URI_HANDLER); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_OK); - g_assert (gst_iterator_next (it, &item) == GST_ITERATOR_DONE); - gst_iterator_free (it); - - g_object_unref (bin); - return 0; -}