luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix a FIXME in the appmonitor test

Browse Source 
The test thought that calling `g_app_info_get()` was a bit of a hack,
but actually it (or calling another `g_app_info_*()` function) is the
right way to use the `GAppInfoMonitor` API.

See the documentation improvements a couple of commits back for details.

The remaining FIXME higher up in the test should probably be fixed by
getting `g_app_info_monitor_get()` to arm the signal. That requires
changes in `g_app_info_monitor_get()` to call `desktop_file_dir_init()`.
That will have to happen another time.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #799
This commit is contained in:
Philip Withnall 2023-03-22 14:42:22 +00:00
parent 9279f3b0f9
commit c0ca3f995b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/tests/appmonitor.c
View File

@ -22,6 +22,10 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gstdio.h> #include <gstdio.h>
#ifdef G_OS_UNIX
#include <gio/gdesktopappinfo.h>
#endif
typedef struct typedef struct
{ {
gchar *applications_dir; gchar *applications_dir;
@ -45,6 +49,7 @@ teardown (Fixture *fixture,
g_clear_pointer (&fixture->applications_dir, g_free); g_clear_pointer (&fixture->applications_dir, g_free);
} }
#ifdef G_OS_UNIX
static gboolean static gboolean
create_app (gpointer data) create_app (gpointer data)
{ {
@ -90,19 +95,17 @@ quit_loop (gpointer data)
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
#endif /* G_OS_UNIX */
static void static void
test_app_monitor (Fixture *fixture, test_app_monitor (Fixture *fixture,
gconstpointer user_data) gconstpointer user_data)
{ {
#ifdef G_OS_UNIX
gchar *app_path; gchar *app_path;
GAppInfoMonitor *monitor; GAppInfoMonitor *monitor;
GMainLoop *loop; GMainLoop *loop;
GDesktopAppInfo *app = NULL;
#ifdef G_OS_WIN32
g_test_skip (".desktop monitor on win32");
return;
#endif
app_path = g_build_filename (fixture->applications_dir, "app.desktop", NULL); app_path = g_build_filename (fixture->applications_dir, "app.desktop", NULL);
@ -121,8 +124,11 @@ test_app_monitor (Fixture *fixture,
g_assert_true (changed_fired); g_assert_true (changed_fired);
changed_fired = FALSE; changed_fired = FALSE;
/* FIXME: this shouldn't be required */ /* Check that the app is now queryable. This has the side-effect of re-arming
g_list_free_full (g_app_info_get_all (), g_object_unref); * the #GAppInfoMonitor::changed signal for the next part of the test. */
app = g_desktop_app_info_new ("app.desktop");
g_assert_nonnull (app);
g_clear_object (&app);
g_timeout_add_seconds (3, quit_loop, loop); g_timeout_add_seconds (3, quit_loop, loop);
@ -138,6 +144,9 @@ test_app_monitor (Fixture *fixture,
g_object_unref (monitor); g_object_unref (monitor);
g_free (app_path); g_free (app_path);
#else /* if !G_OS_UNIX */
g_test_skip (".desktop monitor on win32");
#endif /* !G_OS_UNIX */
} }
int int