From e103b93694be98b5b7bfcfbb22ef0be014079f1a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 26 Jul 2010 18:40:17 -0400 Subject: [PATCH] Drop an unneeded if --- gio/gnetworkaddress.c | 3 +- gio/tests/g-icon.c | 112 +++++++++++++++++++++++++++++++++++++- gio/tests/icons.c | 122 ------------------------------------------ 3 files changed, 112 insertions(+), 125 deletions(-) delete mode 100644 gio/tests/icons.c diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c index 8f5bfa28e..0093be769 100644 --- a/gio/gnetworkaddress.c +++ b/gio/gnetworkaddress.c @@ -159,8 +159,7 @@ g_network_address_set_property (GObject *object, switch (prop_id) { case PROP_HOSTNAME: - if (addr->priv->hostname) - g_free (addr->priv->hostname); + g_free (addr->priv->hostname); addr->priv->hostname = g_value_dup_string (value); break; diff --git a/gio/tests/g-icon.c b/gio/tests/g-icon.c index 5fe457134..d739fff71 100644 --- a/gio/tests/g-icon.c +++ b/gio/tests/g-icon.c @@ -232,6 +232,113 @@ test_g_icon_serialize (void) g_object_unref (icon5); } +static void +test_themed_icon (void) +{ + GIcon *icon1, *icon2, *icon3; + const gchar *const *names; + const gchar *names2[] = { "first", "testicon", "last", NULL }; + gchar *str; + + icon1 = g_themed_icon_new ("testicon"); + + names = g_themed_icon_get_names (G_THEMED_ICON (icon1)); + g_assert_cmpint (g_strv_length ((gchar **)names), ==, 1); + g_assert_cmpstr (names[0], ==, "testicon"); + + g_themed_icon_prepend_name (G_THEMED_ICON (icon1), "first"); + g_themed_icon_append_name (G_THEMED_ICON (icon1), "last"); + names = g_themed_icon_get_names (G_THEMED_ICON (icon1)); + g_assert_cmpint (g_strv_length ((gchar **)names), ==, 3); + g_assert_cmpstr (names[0], ==, "first"); + g_assert_cmpstr (names[1], ==, "testicon"); + g_assert_cmpstr (names[2], ==, "last"); + g_assert_cmpuint (g_icon_hash (icon1), ==, 3193088045); + + icon2 = g_themed_icon_new_from_names ((gchar**)names2, -1); + g_assert (g_icon_equal (icon1, icon2)); + + str = g_icon_to_string (icon2); + icon3 = g_icon_new_for_string (str, NULL); + g_assert (g_icon_equal (icon2, icon3)); + g_free (str); + + g_object_unref (icon1); + g_object_unref (icon2); + g_object_unref (icon3); +} + +static void +test_emblemed_icon (void) +{ + GIcon *icon1, *icon2, *icon3, *icon4; + GEmblem *emblem, *emblem1, *emblem2; + GList *emblems; + + icon1 = g_themed_icon_new ("testicon"); + icon2 = g_themed_icon_new ("testemblem"); + emblem1 = g_emblem_new (icon2); + emblem2 = g_emblem_new_with_origin (icon2, G_EMBLEM_ORIGIN_TAG); + + icon3 = g_emblemed_icon_new (icon1, emblem1); + emblems = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon3)); + g_assert_cmpint (g_list_length (emblems), ==, 1); + g_assert (g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon3)) == icon1); + + icon4 = g_emblemed_icon_new (icon1, emblem1); + g_emblemed_icon_add_emblem (G_EMBLEMED_ICON (icon4), emblem2); + emblems = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon4)); + g_assert_cmpint (g_list_length (emblems), ==, 2); + + g_assert (!g_icon_equal (icon3, icon4)); + + emblem = emblems->data; + g_assert (g_emblem_get_icon (emblem) == icon2); + g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_UNKNOWN); + + emblem = emblems->next->data; + g_assert (g_emblem_get_icon (emblem) == icon2); + g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_TAG); + + g_object_unref (icon1); + g_object_unref (icon2); + g_object_unref (icon3); + g_object_unref (icon4); + + g_object_unref (emblem1); + g_object_unref (emblem2); +} + +static void +test_file_icon (void) +{ + GFile *file; + GIcon *icon; + GIcon *icon2; + GError *error; + GInputStream *stream; + gchar *str; + + file = g_file_new_for_path (SRCDIR "/icons.c"); + icon = g_file_icon_new (file); + g_object_unref (file); + + error = NULL; + stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), 20, NULL, NULL, &error); + g_assert (stream != NULL); + g_assert_no_error (error); + + g_object_unref (stream); + + str = g_icon_to_string (icon); + icon2 = g_icon_new_for_string (str, NULL); + g_assert (g_icon_equal (icon, icon2)); + g_free (str); + + g_object_unref (icon); + g_object_unref (icon2); +} + int main (int argc, char *argv[]) @@ -239,7 +346,10 @@ main (int argc, g_type_init (); g_test_init (&argc, &argv, NULL); - g_test_add_func ("/g-icon/serialize", test_g_icon_serialize); + g_test_add_func ("/icons/serialize", test_g_icon_serialize); + g_test_add_func ("/icons/themed", test_themed_icon); + g_test_add_func ("/icons/emblemed", test_emblemed_icon); + g_test_add_func ("/icons/file", test_file_icon); return g_test_run(); } diff --git a/gio/tests/icons.c b/gio/tests/icons.c deleted file mode 100644 index 33adbfd31..000000000 --- a/gio/tests/icons.c +++ /dev/null @@ -1,122 +0,0 @@ -#include - -static void -test_themed_icon (void) -{ - GIcon *icon1, *icon2, *icon3; - const gchar *const *names; - const gchar *names2[] = { "first", "testicon", "last", NULL }; - gchar *str; - - icon1 = g_themed_icon_new ("testicon"); - - names = g_themed_icon_get_names (G_THEMED_ICON (icon1)); - g_assert_cmpint (g_strv_length ((gchar **)names), ==, 1); - g_assert_cmpstr (names[0], ==, "testicon"); - - g_themed_icon_prepend_name (G_THEMED_ICON (icon1), "first"); - g_themed_icon_append_name (G_THEMED_ICON (icon1), "last"); - names = g_themed_icon_get_names (G_THEMED_ICON (icon1)); - g_assert_cmpint (g_strv_length ((gchar **)names), ==, 3); - g_assert_cmpstr (names[0], ==, "first"); - g_assert_cmpstr (names[1], ==, "testicon"); - g_assert_cmpstr (names[2], ==, "last"); - g_assert_cmpuint (g_icon_hash (icon1), ==, 3193088045); - - icon2 = g_themed_icon_new_from_names ((gchar**)names2, -1); - g_assert (g_icon_equal (icon1, icon2)); - - str = g_icon_to_string (icon2); - icon3 = g_icon_new_for_string (str, NULL); - g_assert (g_icon_equal (icon2, icon3)); - g_free (str); - - g_object_unref (icon1); - g_object_unref (icon2); - g_object_unref (icon3); -} - -static void -test_emblemed_icon (void) -{ - GIcon *icon1, *icon2, *icon3, *icon4; - GEmblem *emblem, *emblem1, *emblem2; - GList *emblems; - - icon1 = g_themed_icon_new ("testicon"); - icon2 = g_themed_icon_new ("testemblem"); - emblem1 = g_emblem_new (icon2); - emblem2 = g_emblem_new_with_origin (icon2, G_EMBLEM_ORIGIN_TAG); - - icon3 = g_emblemed_icon_new (icon1, emblem1); - emblems = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon3)); - g_assert_cmpint (g_list_length (emblems), ==, 1); - g_assert (g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon3)) == icon1); - - icon4 = g_emblemed_icon_new (icon1, emblem1); - g_emblemed_icon_add_emblem (G_EMBLEMED_ICON (icon4), emblem2); - emblems = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon4)); - g_assert_cmpint (g_list_length (emblems), ==, 2); - - g_assert (!g_icon_equal (icon3, icon4)); - - emblem = emblems->data; - g_assert (g_emblem_get_icon (emblem) == icon2); - g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_UNKNOWN); - - emblem = emblems->next->data; - g_assert (g_emblem_get_icon (emblem) == icon2); - g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_TAG); - - g_object_unref (icon1); - g_object_unref (icon2); - g_object_unref (icon3); - g_object_unref (icon4); - - g_object_unref (emblem1); - g_object_unref (emblem2); -} - -static void -test_file_icon (void) -{ - GFile *file; - GIcon *icon; - GIcon *icon2; - GError *error; - GInputStream *stream; - gchar *str; - - file = g_file_new_for_path (SRCDIR "/icons.c"); - icon = g_file_icon_new (file); - g_object_unref (file); - - error = NULL; - stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), 20, NULL, NULL, &error); - g_assert (stream != NULL); - g_assert_no_error (error); - - g_object_unref (stream); - - str = g_icon_to_string (icon); - icon2 = g_icon_new_for_string (str, NULL); - g_assert (g_icon_equal (icon, icon2)); - g_free (str); - - g_object_unref (icon); - g_object_unref (icon2); -} - -int -main (int argc, char *argv[]) -{ - g_type_init (); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/icons/themed", test_themed_icon); - g_test_add_func ("/icons/emblemed", test_emblemed_icon); - g_test_add_func ("/icons/file", test_file_icon); - - return g_test_run (); -}