From 5fef796126e2c74ccc619528414339cfb5dfcf9c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Oct 2011 01:04:42 -0400 Subject: [PATCH] Misc test coverage improvements https://bugzilla.gnome.org/show_bug.cgi?id=660849 --- glib/tests/array-test.c | 6 +++++- glib/tests/fileutils.c | 3 +++ glib/tests/strfuncs.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c index 69d52b583..ad88568cb 100644 --- a/glib/tests/array-test.c +++ b/glib/tests/array-test.c @@ -396,6 +396,8 @@ pointer_array_free_func (void) s = g_strdup ("frob"); g_ptr_array_add (gparray, s); g_assert (g_ptr_array_remove (gparray, s)); + g_assert (!g_ptr_array_remove (gparray, "nuun")); + g_assert (!g_ptr_array_remove_fast (gparray, "mlo")); g_assert_cmpint (num_free_func_invocations, ==, 2); g_ptr_array_set_size (gparray, 1); g_assert_cmpint (num_free_func_invocations, ==, 3); @@ -406,10 +408,11 @@ pointer_array_free_func (void) g_assert_cmpint (num_free_func_invocations, ==, 4); num_free_func_invocations = 0; - gparray = g_ptr_array_new_with_free_func (my_free_func); + gparray = g_ptr_array_new_full (10, my_free_func); g_ptr_array_add (gparray, g_strdup ("foo")); g_ptr_array_add (gparray, g_strdup ("bar")); g_ptr_array_add (gparray, g_strdup ("baz")); + g_ptr_array_set_size (gparray, 20); g_ptr_array_add (gparray, NULL); gparray2 = g_ptr_array_ref (gparray); strv = (gchar **) g_ptr_array_free (gparray, FALSE); @@ -423,6 +426,7 @@ pointer_array_free_func (void) g_ptr_array_add (gparray, g_strdup ("foo")); g_ptr_array_add (gparray, g_strdup ("bar")); g_ptr_array_add (gparray, g_strdup ("baz")); + g_ptr_array_remove_range (gparray, 1, 1); g_ptr_array_unref (gparray); g_assert_cmpint (num_free_func_invocations, ==, 3); diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c index 5918a40ca..f429fd9d0 100644 --- a/glib/tests/fileutils.c +++ b/glib/tests/fileutils.c @@ -478,6 +478,9 @@ test_mkdir_with_parents (void) g_print ("checking g_mkdir_with_parents() in cwd: %s", cwd); test_mkdir_with_parents_1 (cwd); g_free (cwd); + + g_assert (g_mkdir_with_parents (NULL, 0) == -1); + g_assert (errno == EINVAL); } static void diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c index ff632c751..14e7fd4dc 100644 --- a/glib/tests/strfuncs.c +++ b/glib/tests/strfuncs.c @@ -276,6 +276,8 @@ test_strconcat (void) g_assert (str != NULL); g_assert_cmpstr (str, ==, GLIB_TEST_STRING GLIB_TEST_STRING GLIB_TEST_STRING); g_free (str); + + g_assert (g_strconcat (NULL, "bla", NULL) == NULL); } static void