[gst-cvs] tpm gst-phonon: gst-phonon/ gst-phonon/tests/check/gpho/

[<tp...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-phonon
Changes by:     tpm
Date:           Sun Jun 24 2007  16:56:48 UTC

Log message:
* tests/check/gpho/init.c: (GST_START_TEST), (gst_phonon_suite):
* tests/check/gpho/utils.c: (gst_phonon_suite):
Remove unused variables.

Modified files:
    .               : ChangeLog
    tests/check/gpho: init.c utils.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/ChangeLog.diff?r1=1.61&r2=1.62
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/tests/check/gpho/init.c.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/tests/check/gpho/utils.c.diff?r1=1.2&r2=1.3

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-phonon/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- ChangeLog	16 Jun 2007 13:36:10 -0000	1.61
+++ ChangeLog	24 Jun 2007 16:56:34 -0000	1.62
@@ -1,3 +1,9 @@
+2007-06-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/gpho/init.c: (GST_START_TEST), (gst_phonon_suite):
+	* tests/check/gpho/utils.c: (gst_phonon_suite):
+	  Remove unused variables.
 2007-06-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-phonon/Makefile.am:
Index: init.c
RCS file: /cvs/gstreamer/gst-phonon/tests/check/gpho/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c	14 Jun 2007 18:14:29 -0000	1.1
+++ init.c	24 Jun 2007 16:56:34 -0000	1.2
@@ -33,22 +33,30 @@
 GST_START_TEST (test_version)
 {
-  gchar *s;
+  guint major, minor, micro, nano;
+  gchar *s, vstr[32];
+  ASSERT_CRITICAL (gpho_version (&major, &minor, &micro, NULL));
+  ASSERT_CRITICAL (gpho_version (&major, &minor, NULL, &nano));
+  ASSERT_CRITICAL (gpho_version (&major, NULL, &micro, &nano));
+  ASSERT_CRITICAL (gpho_version (NULL, &minor, &micro, &nano));
+  gpho_version (&major, &minor, &micro, &nano);
+  g_snprintf (vstr, sizeof (vstr), "%u.%u.%u", major, minor, micro);
   s = gpho_version_string ();
   fail_unless (s != NULL);
   fail_unless (strlen (s) > 0);
+  fail_unless (strstr (s, vstr) != NULL);
   g_free (s);
 }
 GST_END_TEST;
-Suite *
+static Suite *
 gst_phonon_suite (void)
   Suite *s = suite_create ("gst-phonon");
   TCase *tc_chain = tcase_create ("general");
-  guint major, minor, micro, nano;
   suite_add_tcase (s, tc_chain);
Index: utils.c
RCS file: /cvs/gstreamer/gst-phonon/tests/check/gpho/utils.c,v
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- utils.c	16 Jun 2007 09:30:04 -0000	1.2
+++ utils.c	24 Jun 2007 16:56:34 -0000	1.3
@@ -73,13 +73,17 @@
   /* shouldn't allow NULL strings */
   oldlist = list;
-  ASSERT_CRITICAL (list = gpho_string_list_append (list, NULL););
+  ASSERT_CRITICAL (list = gpho_string_list_append (list, NULL);
+      );
   fail_unless (list == oldlist);
-  ASSERT_CRITICAL (list = gpho_string_list_prepend (list, NULL););
+  ASSERT_CRITICAL (list = gpho_string_list_prepend (list, NULL);
-  ASSERT_CRITICAL (list = gpho_string_list_append_nocopy (list, NULL););
+  ASSERT_CRITICAL (list = gpho_string_list_append_nocopy (list, NULL);
-  ASSERT_CRITICAL (list = gpho_string_list_prepend_nocopy (list, NULL););
+  ASSERT_CRITICAL (list = gpho_string_list_prepend_nocopy (list, NULL);
   /* one item in list, so reversing it should result in the same list */
@@ -126,13 +130,17 @@
   /* make sure compatibility with GList is maintained */
@@ -150,7 +158,6 @@
   Suite *s = suite_create ("gpho-utils");