pidgin/pidgin

test_purplepath: replace g_get_home_dir with g_get_user_*_dir functions

2022-01-13, ivanhoe
53b46590623f
Parents 0343173db2f6
Children 5535c6fdd135
test_purplepath: replace g_get_home_dir with g_get_user_*_dir functions
2 files changed, 11 insertions(+), 38 deletions(-)
  • +1 -4
    libpurple/tests/meson.build
  • +10 -34
    libpurple/tests/test_purplepath.c
    • --- a/libpurple/tests/meson.build Thu Jan 13 20:35:28 2022 -0600
    +++ b/libpurple/tests/meson.build Thu Jan 13 20:35:29 2022 -0600
    @@ -39,8 +39,5 @@
    dependencies : [libpurple_dep, glib],
    link_with: test_ui,
    )
    - test(prog, e, env: [
    - 'XDG_CACHE_HOME=',
    - 'XDG_CONFIG_HOME=',
    - 'XDG_DATA_HOME='])
    + test(prog, e)
    endforeach
    --- a/libpurple/tests/test_purplepath.c Thu Jan 13 20:35:28 2022 -0600
    +++ b/libpurple/tests/test_purplepath.c Thu Jan 13 20:35:29 2022 -0600
    @@ -2,36 +2,23 @@
    #include <purple.h>
    -#ifndef _WIN32
    -#define HOME g_get_home_dir()
    -#else
    -#define HOME g_getenv("APPDATA")
    -#endif
    -
    static void
    test_purplepath_home_dir(void) {
    - g_assert_cmpstr(HOME, ==, purple_home_dir());
    -}
    + const gchar *home_dir;
    -static void
    -test_purplepath_user_dir(void) {
    - gchar *user_dir;
    -
    - user_dir = g_build_filename(HOME, ".purple", NULL);
    - g_assert_cmpstr(user_dir, ==, purple_user_dir());
    - g_free(user_dir);
    +#ifndef _WIN32
    + home_dir = g_get_home_dir();
    +#else
    + home_dir = g_getenv("APPDATA");
    +#endif
    + g_assert_cmpstr(home_dir, ==, purple_home_dir());
    }
    static void
    test_purplepath_cache_dir(void) {
    gchar *cache_dir;
    -#ifndef _WIN32
    - cache_dir = g_build_filename(g_get_home_dir(), ".cache", "purple", NULL);
    -#else
    - cache_dir = g_build_filename(g_getenv("LOCALAPPDATA"), "Microsoft",
    - "Windows", "INetCache","purple", NULL);
    -#endif
    + cache_dir = g_build_filename(g_get_user_cache_dir(), "purple", NULL);
    g_assert_cmpstr(cache_dir, ==, purple_cache_dir());
    g_free(cache_dir);
    }
    @@ -40,11 +27,7 @@
    test_purplepath_config_dir(void) {
    gchar *config_dir;
    -#ifndef _WIN32
    - config_dir = g_build_filename(g_get_home_dir(), ".config", "purple", NULL);
    -#else
    - config_dir = g_build_filename(g_getenv("LOCALAPPDATA"), "purple", NULL);
    -#endif
    + config_dir = g_build_filename(g_get_user_config_dir(), "purple", NULL);
    g_assert_cmpstr(config_dir, ==, purple_config_dir());
    g_free(config_dir);
    }
    @@ -53,12 +36,7 @@
    test_purplepath_data_dir(void) {
    gchar *data_dir;
    -#ifndef _WIN32
    - data_dir = g_build_filename(g_get_home_dir(), ".local", "share", "purple",
    - NULL);
    -#else
    - data_dir = g_build_filename(g_getenv("LOCALAPPDATA"), "purple", NULL);
    -#endif
    + data_dir = g_build_filename(g_get_user_data_dir(), "purple", NULL);
    g_assert_cmpstr(data_dir, ==, purple_data_dir());
    g_free(data_dir);
    }
    @@ -69,8 +47,6 @@
    g_test_add_func("/purplepath/homedir",
    test_purplepath_home_dir);
    - g_test_add_func("/purplepath/userdir",
    - test_purplepath_user_dir);
    g_test_add_func("/purplepath/cachedir",
    test_purplepath_cache_dir);
    g_test_add_func("/purplepath/configdir",