gst/gstxml.c: Improve and detypofy docs.

Original commit message from CVS:
* gst/gstxml.c:
Improve and detypofy docs.
* tests/check/Makefile.am:
* tests/check/gst/.cvsignore:
* tests/check/gst/gstxml.c: (GST_START_TEST), (gst_xml_suite):
Add a basic test suite for GstXML.

diff --git a/ChangeLog b/ChangeLog
index 621af01..a403ae4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-29  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/gstxml.c:
+         Improve and detypofy docs.
+
+       * tests/check/Makefile.am:
+       * tests/check/gst/.cvsignore:
+       * tests/check/gst/gstxml.c: (GST_START_TEST), (gst_xml_suite):
+         Add a basic test suite for GstXML.
+
 2006-08-29  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstelement.c: (activate_pads), (clear_caps),

diff --git a/gst/gstxml.c b/gst/gstxml.c
index d6462c9..a790aee 100644 (file)
--- a/gst/gstxml.c
+++ b/gst/gstxml.c
@@ -377,9 +377,12 @@ gst_xml_object_loaded (GstObject * private, GstObject * object, xmlNodePtr self,
  * gst_xml_get_topelements:
  * @xml: The GstXML to get the elements from
  *
- * Retrive a list of toplevel elements.
+ * Retrieve a list of toplevel elements.
  *
- * Returns: a GList of elements
+ * Returns: a GList of top-level elements. The caller does not own a copy
+ * of the list and must not free or modify the list. The caller also does not
+ * own a reference to any of the elements in the list and should obtain its own
+ * reference using gst_object_ref() if necessary.
  */
 GList *
 gst_xml_get_topelements (GstXML * xml)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 362fd70..9f12059 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -33,6 +33,12 @@ else
 PARSE_CHECKS = pipelines/simple-launch-lines pipelines/cleanup pipelines/parse-launch
 endif
 
+if GST_DISABLE_LOADSAVE
+LOADSAVE_CHECKS = 
+else
+LOADSAVE_CHECKS = gst/gstxml
+endif
+
 # if it's calling gst_element_factory_make(), it will probably not work without
 # a registry
 if GST_DISABLE_REGISTRY
@@ -76,6 +82,7 @@ check_PROGRAMS =                              \
        gst/gsttag                              \
        gst/gsttask                             \
        gst/gstvalue                            \
+       $(LOADSAVE_CHECKS)          \
        generic/states                          \
        $(PARSE_CHECKS)                         \
        $(REGISTRY_CHECKS)                      \

diff --git a/tests/check/gst/.gitignore b/tests/check/gst/.gitignore
index 3f781d2..69c4c0f 100644 (file)
--- a/tests/check/gst/.gitignore
+++ b/tests/check/gst/.gitignore
@@ -26,3 +26,4 @@ gstquery
 gsttask
 *.check.xml
 gstinfo
+gstxml

diff --git a/tests/check/gst/gstxml.c b/tests/check/gst/gstxml.c
new file mode 100755 (executable)
index 0000000..ed38d22
--- /dev/null
+++ b/tests/check/gst/gstxml.c
@@ -0,0 +1,87 @@
+/* GStreamer
+ * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
+ *
+ * gstxml.c: Unit test for GstXML
+ *
+ * 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 <gst/check/gstcheck.h>
+#include <string.h>
+
+#define XML_PIPELINE                                             \
+  "<?xml version=\"1.0\"?>"                                      \
+  "<gstreamer xmlns:gst=\"http://gstreamer.net/gst-core/1.0/\">" \
+  "  <gst:element>"                                              \
+  "    <gst:name>test-pipeline</gst:name>"                       \
+  "    <gst:type>pipeline</gst:type>"                            \
+  "    <gst:param>"                                              \
+  "      <gst:name>name</gst:name>"                              \
+  "      <gst:value>test-pipeline</gst:value>"                   \
+  "    </gst:param>"                                             \
+  "  </gst:element>"                                             \
+  "</gstreamer>"
+
+
+GST_START_TEST (test_pipeline_from_xml)
+{
+  GstElement *element;
+  GstXML *xml;
+  GList *elements;
+
+  xml = gst_xml_new ();
+  fail_unless (xml != NULL);
+  ASSERT_OBJECT_REFCOUNT (xml, "GstXML object after creating it", 1);
+
+  fail_unless (gst_xml_parse_memory (xml, (guchar *) XML_PIPELINE,
+          strlen (XML_PIPELINE), NULL));
+
+  elements = gst_xml_get_topelements (xml);
+  fail_unless (elements != NULL);
+  fail_unless (g_list_length (elements) == 1);
+
+  element = GST_ELEMENT (elements->data);
+  fail_unless (element != NULL);
+  fail_unless (GST_IS_PIPELINE (element));
+  fail_unless_equals_string (GST_OBJECT_NAME (element), "test-pipeline");
+
+  ASSERT_OBJECT_REFCOUNT (element, "pipeline owned by GstXML", 1);
+  gst_object_ref (element);
+  ASSERT_OBJECT_REFCOUNT (element, "pipeline after we obtained a ref", 2);
+
+  gst_object_unref (xml);
+
+  ASSERT_OBJECT_REFCOUNT (element, "pipeline after GstXML was unrefed", 1);
+  gst_object_unref (element);
+}
+
+GST_END_TEST;
+
+static Suite *
+gst_xml_suite (void)
+{
+  Suite *s = suite_create ("GstXML");
+  TCase *tc_chain = tcase_create ("xml");
+
+  tcase_set_timeout (tc_chain, 20);
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_pipeline_from_xml);
+  return s;
+}
+
+GST_CHECK_MAIN (gst_xml);