summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2018-04-24 16:01:36 +0200
committerFlorian Müllner <fmuellner@gnome.org>2018-04-25 14:33:10 +0200
commite962d873e3fb64b3829173fbbe776587582aefb9 (patch)
tree1910baa414f842d541fff9ec096feb6fbb964e66
parent9dc2da8f0750df8041f43d32debc0209bfb2241f (diff)
downloadglib-wip/fmuellner/ci-test.tar.gz
tests: Add .desktop file for non-existent binary ...wip/fmuellner/ci-test
... to test that it is filtered out correctly by g_desktop_app_info_load_from_keyfile(). https://bugzilla.gnome.org/show_bug.cgi?id=795488
-rw-r--r--gio/tests/Makefile.am1
-rw-r--r--gio/tests/desktop-app-info.c5
-rw-r--r--gio/tests/desktop-files/usr/applications/frobnicator.desktop9
-rw-r--r--gio/tests/file.c4
4 files changed, 17 insertions, 2 deletions
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 0c5f6616b..410f11d95 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -300,6 +300,7 @@ usr_desktop_files = \
evince-previewer.desktop \
evince.desktop \
file-roller.desktop \
+ frobnicator.desktop \
gcr-prompter.desktop \
gcr-viewer.desktop \
gedit.desktop \
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
index face99da3..26e6514a2 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.c
@@ -672,6 +672,11 @@ test_search (void)
*/
assert_search ("sh", "gnome-terminal.desktop\n", TRUE, FALSE, NULL, NULL);
+ /* This matches "frobnicator.desktop", but the file should be ignored
+ * because the binary is missing
+ */
+ assert_search ("frobnicator", "", TRUE, FALSE, NULL, NULL);
+
/* Obvious multi-word search */
assert_search ("gno hel", "yelp.desktop\n", TRUE, TRUE, NULL, NULL);
diff --git a/gio/tests/desktop-files/usr/applications/frobnicator.desktop b/gio/tests/desktop-files/usr/applications/frobnicator.desktop
new file mode 100644
index 000000000..0a8dbfa39
--- /dev/null
+++ b/gio/tests/desktop-files/usr/applications/frobnicator.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Frobnicator
+Comment=Frobnicate your life!
+Exec=/does-not-exist
+Icon=frobnicator
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Utilities
diff --git a/gio/tests/file.c b/gio/tests/file.c
index 98eeb85d4..1519448ee 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -962,7 +962,7 @@ test_measure (void)
if (size > 0)
g_assert_cmpuint (num_bytes, ==, size);
g_assert_cmpuint (num_dirs, ==, 6);
- g_assert_cmpuint (num_files, ==, 30);
+ g_assert_cmpuint (num_files, ==, 31);
g_object_unref (file);
g_free (path);
@@ -1056,7 +1056,7 @@ test_measure_async (void)
g_free (path);
data->expected_dirs = 6;
- data->expected_files = 30;
+ data->expected_files = 31;
g_file_measure_disk_usage_async (file,
G_FILE_MEASURE_APPARENT_SIZE,