From e45372895dd31033726c0ddfa1f7ff55a52d907c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 23 Nov 2013 18:15:04 -0500 Subject: [PATCH] Fix desktop-app-info test The recent change to the search scoring algorithm made nautilus and konqueror switch places in the search results. Update the test to reflect that. --- gio/tests/desktop-app-info.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c index ddaa429db..241d331a6 100644 --- a/gio/tests/desktop-app-info.c +++ b/gio/tests/desktop-app-info.c @@ -527,7 +527,9 @@ assert_strings_equivalent (const gchar *expected, if (g_str_equal (expected_words[i], result_words[j])) goto got_it; - g_error ("Unable to find expected string '%s' in result '%s'", expected_words[i], result); + g_test_message ("Unable to find expected string '%s' in result '%s'", expected_words[i], result); + g_test_fail (); + got_it: continue; } @@ -679,12 +681,12 @@ test_search (void) "Access and organize files\n", TRUE, TRUE, NULL, NULL); /* make sure localised searching works properly */ - assert_search ("foliumi", "kde4-konqbrowser.desktop\n" - "nautilus.desktop\n" + assert_search ("foliumi", "nautilus.desktop\n" + "kde4-konqbrowser.desktop\n" "eog.desktop\n", TRUE, FALSE, "en_US.UTF-8", "eo"); /* the user's eog.desktop has no translations... */ - assert_search ("foliumi", "kde4-konqbrowser.desktop\n" - "nautilus.desktop\n", TRUE, TRUE, "en_US.UTF-8", "eo"); + assert_search ("foliumi", "nautilus.desktop\n" + "kde4-konqbrowser.desktop\n", TRUE, TRUE, "en_US.UTF-8", "eo"); } int