#include <string.h>
static void
-test_g_icon_serialize (void)
+test_g_icon_to_string (void)
{
GIcon *icon;
GIcon *icon2;
GFile *location;
char *data;
GError *error;
+ gint origin;
+ GIcon *i;
+ GFile *file;
error = NULL;
uri = "file:///some/native/path/to/an/icon.png";
location = g_file_new_for_uri (uri);
icon = g_file_icon_new (location);
+
+ g_object_get (icon, "file", &file, NULL);
+ g_assert (file == location);
+ g_object_unref (file);
+
data = g_icon_to_string (icon);
- g_assert_cmpstr (data, ==, "/some/native/path/to/an/icon.png");
+ g_assert_cmpstr (data, ==, G_DIR_SEPARATOR_S "some" G_DIR_SEPARATOR_S "native" G_DIR_SEPARATOR_S "path" G_DIR_SEPARATOR_S "to" G_DIR_SEPARATOR_S "an" G_DIR_SEPARATOR_S "icon.png");
icon2 = g_icon_new_for_string (data, &error);
g_assert_no_error (error);
g_assert (g_icon_equal (icon, icon2));
location = g_file_new_for_uri (uri);
icon = g_file_icon_new (location);
data = g_icon_to_string (icon);
- g_assert_cmpstr (data, ==, "/some/native/path/to/an/icon with spaces.png");
+ g_assert_cmpstr (data, ==, G_DIR_SEPARATOR_S "some" G_DIR_SEPARATOR_S "native" G_DIR_SEPARATOR_S "path" G_DIR_SEPARATOR_S "to" G_DIR_SEPARATOR_S "an" G_DIR_SEPARATOR_S "icon with spaces.png");
icon2 = g_icon_new_for_string (data, &error);
g_assert_no_error (error);
g_assert (g_icon_equal (icon, icon2));
icon = g_icon_new_for_string ("/path/to/somewhere with whitespace.png", &error);
g_assert_no_error (error);
data = g_icon_to_string (icon);
- g_assert_cmpstr (data, ==, "/path/to/somewhere with whitespace.png");
+ g_assert_cmpstr (data, ==, G_DIR_SEPARATOR_S "path" G_DIR_SEPARATOR_S "to" G_DIR_SEPARATOR_S "somewhere with whitespace.png");
g_free (data);
location = g_file_new_for_commandline_arg ("/path/to/somewhere with whitespace.png");
icon2 = g_file_icon_new (location);
icon5 = g_icon_new_for_string (data, &error);
g_assert_no_error (error);
g_assert (g_icon_equal (icon4, icon5));
+
+ g_object_get (emblem1, "origin", &origin, "icon", &i, NULL);
+ g_assert (origin == G_EMBLEM_ORIGIN_DEVICE);
+ g_assert (i == icon2);
+ g_object_unref (i);
+
+ g_object_unref (emblem1);
+ g_object_unref (emblem2);
+ g_object_unref (icon);
+ g_object_unref (icon2);
+ g_object_unref (icon3);
+ g_object_unref (icon4);
+ g_object_unref (icon5);
+ g_free (data);
+}
+
+static void
+test_g_icon_serialize (void)
+{
+ GIcon *icon;
+ GIcon *icon2;
+ GIcon *icon3;
+ GIcon *icon4;
+ GIcon *icon5;
+ GEmblem *emblem1;
+ GEmblem *emblem2;
+ GFile *location;
+ GVariant *data;
+ gint origin;
+ GIcon *i;
+
+ /* Check that we can deserialize from well-known specified formats */
+ data = g_variant_new_string ("network-server%");
+ icon = g_icon_deserialize (g_variant_ref_sink (data));
+ g_variant_unref (data);
+ icon2 = g_themed_icon_new ("network-server%");
+ g_assert (g_icon_equal (icon, icon2));
+ g_object_unref (icon);
+ g_object_unref (icon2);
+
+ data = g_variant_new_string ("/path/to/somewhere.png");
+ icon = g_icon_deserialize (g_variant_ref_sink (data));
+ g_variant_unref (data);
+ location = g_file_new_for_commandline_arg ("/path/to/somewhere.png");
+ icon2 = g_file_icon_new (location);
+ g_assert (g_icon_equal (icon, icon2));
+ g_object_unref (icon);
+ g_object_unref (icon2);
+ g_object_unref (location);
+
+ data = g_variant_new_string ("/path/to/somewhere with whitespace.png");
+ icon = g_icon_deserialize (g_variant_ref_sink (data));
+ g_variant_unref (data);
+ location = g_file_new_for_commandline_arg ("/path/to/somewhere with whitespace.png");
+ icon2 = g_file_icon_new (location);
+ g_assert (g_icon_equal (icon, icon2));
+ g_object_unref (location);
+ g_object_unref (icon2);
+ location = g_file_new_for_commandline_arg ("/path/to/somewhere%20with%20whitespace.png");
+ icon2 = g_file_icon_new (location);
+ g_assert (!g_icon_equal (icon, icon2));
+ g_object_unref (location);
+ g_object_unref (icon2);
+ g_object_unref (icon);
+
+ data = g_variant_new_string ("sftp:///path/to/somewhere.png");
+ icon = g_icon_deserialize (g_variant_ref_sink (data));
+ g_variant_unref (data);
+ location = g_file_new_for_commandline_arg ("sftp:///path/to/somewhere.png");
+ icon2 = g_file_icon_new (location);
+ g_assert (g_icon_equal (icon, icon2));
+ g_object_unref (icon);
+ g_object_unref (icon2);
+ g_object_unref (location);
+
+ /* Check that GThemedIcon serialization works */
+
+ icon = g_themed_icon_new ("network-server");
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "computer");
+ data = g_icon_serialize (icon);
+ icon2 = g_icon_deserialize (data);
+ g_assert (g_icon_equal (icon, icon2));
+ g_variant_unref (data);
+ g_object_unref (icon);
+ g_object_unref (icon2);
+
+ icon = g_themed_icon_new ("icon name with whitespace");
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "computer");
+ data = g_icon_serialize (icon);
+ icon2 = g_icon_deserialize (data);
+ g_assert (g_icon_equal (icon, icon2));
+ g_variant_unref (data);
+ g_object_unref (icon);
+ g_object_unref (icon2);
+
+ icon = g_themed_icon_new_with_default_fallbacks ("network-server-xyz");
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "computer");
+ data = g_icon_serialize (icon);
+ icon2 = g_icon_deserialize (data);
+ g_assert (g_icon_equal (icon, icon2));
+ g_variant_unref (data);
+ g_object_unref (icon);
+ g_object_unref (icon2);
+
+ /* Check that GEmblemedIcon serialization works */
+
+ icon = g_themed_icon_new ("face-smirk");
+ icon2 = g_themed_icon_new ("emblem-important");
+ g_themed_icon_append_name (G_THEMED_ICON (icon2), "emblem-shared");
+ location = g_file_new_for_uri ("file:///some/path/somewhere.png");
+ icon3 = g_file_icon_new (location);
+ g_object_unref (location);
+ emblem1 = g_emblem_new_with_origin (icon2, G_EMBLEM_ORIGIN_DEVICE);
+ emblem2 = g_emblem_new_with_origin (icon3, G_EMBLEM_ORIGIN_LIVEMETADATA);
+ icon4 = g_emblemed_icon_new (icon, emblem1);
+ g_emblemed_icon_add_emblem (G_EMBLEMED_ICON (icon4), emblem2);
+ data = g_icon_serialize (icon4);
+ icon5 = g_icon_deserialize (data);
+ g_assert (g_icon_equal (icon4, icon5));
+
+ g_object_get (emblem1, "origin", &origin, "icon", &i, NULL);
+ g_assert (origin == G_EMBLEM_ORIGIN_DEVICE);
+ g_assert (i == icon2);
+ g_object_unref (i);
+
g_object_unref (emblem1);
g_object_unref (emblem2);
g_object_unref (icon);
g_object_unref (icon3);
g_object_unref (icon4);
g_object_unref (icon5);
+ g_variant_unref (data);
}
static void
test_themed_icon (void)
{
- GIcon *icon1, *icon2, *icon3;
+ GIcon *icon1, *icon2, *icon3, *icon4;
const gchar *const *names;
const gchar *names2[] = { "first", "testicon", "last", NULL };
gchar *str;
gboolean fallbacks;
+ GVariant *variant;
icon1 = g_themed_icon_new ("testicon");
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), ==, 3193088045U);
+ g_assert_cmpuint (g_icon_hash (icon1), ==, 2400773466U);
icon2 = g_themed_icon_new_from_names ((gchar**)names2, -1);
g_assert (g_icon_equal (icon1, icon2));
g_assert (g_icon_equal (icon2, icon3));
g_free (str);
+ variant = g_icon_serialize (icon3);
+ icon4 = g_icon_deserialize (variant);
+ g_assert (g_icon_equal (icon3, icon4));
+ g_assert (g_icon_hash (icon3) == g_icon_hash (icon4));
+ g_variant_unref (variant);
+
g_object_unref (icon1);
g_object_unref (icon2);
g_object_unref (icon3);
+ g_object_unref (icon4);
}
static void
test_emblemed_icon (void)
{
- GIcon *icon1, *icon2, *icon3, *icon4;
+ GIcon *icon;
+ GIcon *icon1, *icon2, *icon3, *icon4, *icon5;
GEmblem *emblem, *emblem1, *emblem2;
GList *emblems;
+ GVariant *variant;
icon1 = g_themed_icon_new ("testicon");
icon2 = g_themed_icon_new ("testemblem");
g_assert (!g_icon_equal (icon3, icon4));
+ variant = g_icon_serialize (icon4);
+ icon5 = g_icon_deserialize (variant);
+ g_assert (g_icon_equal (icon4, icon5));
+ g_assert (g_icon_hash (icon4) == g_icon_hash (icon5));
+ g_variant_unref (variant);
+
emblem = emblems->data;
g_assert (g_emblem_get_icon (emblem) == icon2);
- g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_UNKNOWN);
+ g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_TAG);
emblem = emblems->next->data;
g_assert (g_emblem_get_icon (emblem) == icon2);
- g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_TAG);
+ g_assert (g_emblem_get_origin (emblem) == G_EMBLEM_ORIGIN_UNKNOWN);
+
+ g_emblemed_icon_clear_emblems (G_EMBLEMED_ICON (icon4));
+ g_assert (g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon4)) == NULL);
+
+ g_assert (g_icon_hash (icon4) != g_icon_hash (icon2));
+ g_object_get (icon4, "gicon", &icon, NULL);
+ g_assert (icon == icon1);
+ g_object_unref (icon);
g_object_unref (icon1);
g_object_unref (icon2);
g_object_unref (icon3);
g_object_unref (icon4);
+ g_object_unref (icon5);
g_object_unref (emblem1);
g_object_unref (emblem2);
}
static void
+load_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer data)
+{
+ GLoadableIcon *icon = G_LOADABLE_ICON (source_object);
+ GMainLoop *loop = data;
+ GError *error = NULL;
+ GInputStream *stream;
+
+ stream = g_loadable_icon_load_finish (icon, res, NULL, &error);
+ g_assert_no_error (error);
+ g_assert (G_IS_INPUT_STREAM (stream));
+ g_object_unref (stream);
+ g_main_loop_quit (loop);
+}
+
+static void
+loadable_icon_tests (GLoadableIcon *icon)
+{
+ GError *error = NULL;
+ GInputStream *stream;
+ GMainLoop *loop;
+
+ stream = g_loadable_icon_load (icon, 20, NULL, NULL, &error);
+ g_assert_no_error (error);
+ g_assert (G_IS_INPUT_STREAM (stream));
+ g_object_unref (stream);
+
+ loop = g_main_loop_new (NULL, FALSE);
+ g_loadable_icon_load_async (icon, 20, NULL, load_cb, loop);
+ g_main_loop_run (loop);
+ g_main_loop_unref (loop);
+}
+
+static void
test_file_icon (void)
{
GFile *file;
GIcon *icon;
GIcon *icon2;
- GError *error;
- GInputStream *stream;
+ GIcon *icon3;
+ GIcon *icon4;
gchar *str;
+ GVariant *variant;
- file = g_file_new_for_path (SRCDIR "/g-icon.c");
+ file = g_file_new_for_path (g_test_get_filename (G_TEST_DIST, "g-icon.c", NULL));
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);
+ loadable_icon_tests (G_LOADABLE_ICON (icon));
str = g_icon_to_string (icon);
icon2 = g_icon_new_for_string (str, NULL);
g_assert (g_icon_equal (icon, icon2));
g_free (str);
+ file = g_file_new_for_path ("/\1\2\3/\244");
+ icon4 = g_file_icon_new (file);
+
+ variant = g_icon_serialize (icon4);
+ icon3 = g_icon_deserialize (variant);
+ g_assert (g_icon_equal (icon4, icon3));
+ g_assert (g_icon_hash (icon4) == g_icon_hash (icon3));
+ g_variant_unref (variant);
+
g_object_unref (icon);
g_object_unref (icon2);
+ g_object_unref (icon3);
+ g_object_unref (icon4);
+ g_object_unref (file);
+}
+
+static void
+test_bytes_icon (void)
+{
+ GBytes *bytes;
+ GBytes *bytes2;
+ GIcon *icon;
+ GIcon *icon2;
+ GIcon *icon3;
+ GVariant *variant;
+ const gchar *data = "1234567890987654321";
+
+ bytes = g_bytes_new_static (data, strlen (data));
+ icon = g_bytes_icon_new (bytes);
+ icon2 = g_bytes_icon_new (bytes);
+
+ g_assert (g_bytes_icon_get_bytes (G_BYTES_ICON (icon)) == bytes);
+ g_assert (g_icon_equal (icon, icon2));
+ g_assert (g_icon_hash (icon) == g_icon_hash (icon2));
+
+ g_object_get (icon, "bytes", &bytes2, NULL);
+ g_assert (bytes == bytes2);
+ g_bytes_unref (bytes2);
+
+ variant = g_icon_serialize (icon);
+ icon3 = g_icon_deserialize (variant);
+ g_assert (g_icon_equal (icon, icon3));
+ g_assert (g_icon_hash (icon) == g_icon_hash (icon3));
+
+ loadable_icon_tests (G_LOADABLE_ICON (icon));
+
+ g_variant_unref (variant);
+ g_object_unref (icon);
+ g_object_unref (icon2);
+ g_object_unref (icon3);
+ g_bytes_unref (bytes);
}
int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
+ g_test_add_func ("/icons/to-string", test_g_icon_to_string);
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);
+ g_test_add_func ("/icons/bytes", test_bytes_icon);
return g_test_run();
}