luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-03 19:30:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use g_assert_*() rather than g_assert() in environment.c

Browse Source 
`g_assert()` is compiled out with `G_DISABLE_ASSERT`.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-02-18 01:49:51 +00:00
parent 51b707bdc6
commit 2249da981a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glib/tests/environment.c
View File

@ -33,7 +33,7 @@ test_listenv (void)
gchar **parts; gchar **parts;
parts = g_strsplit (list[i], "=", 2); parts = g_strsplit (list[i], "=", 2);
g_assert (g_hash_table_lookup (table, parts[0]) == NULL); g_assert_null (g_hash_table_lookup (table, parts[0]));
if (g_strcmp0 (parts[0], "")) if (g_strcmp0 (parts[0], ""))
g_hash_table_insert (table, parts[0], parts[1]); g_hash_table_insert (table, parts[0], parts[1]);
g_free (parts); g_free (parts);
@ -147,15 +147,15 @@ test_setenv (void)
var = "NOSUCHENVVAR"; var = "NOSUCHENVVAR";
value = "value1"; value = "value1";
g_assert (g_getenv (var) == NULL); g_assert_null (g_getenv (var));
g_setenv (var, value, FALSE); g_setenv (var, value, FALSE);
g_assert_cmpstr (g_getenv (var), ==, value); g_assert_cmpstr (g_getenv (var), ==, value);
g_assert (g_setenv (var, "value2", FALSE)); g_assert_true (g_setenv (var, "value2", FALSE));
g_assert_cmpstr (g_getenv (var), ==, value); g_assert_cmpstr (g_getenv (var), ==, value);
g_assert (g_setenv (var, "value2", TRUE)); g_assert_true (g_setenv (var, "value2", TRUE));
g_assert_cmpstr (g_getenv (var), ==, "value2"); g_assert_cmpstr (g_getenv (var), ==, "value2");
g_unsetenv (var); g_unsetenv (var);
g_assert (g_getenv (var) == NULL); g_assert_null (g_getenv (var));
} }
static void static void
@ -176,7 +176,7 @@ test_environ_array (void)
} }
value = g_environ_getenv (env, "foo"); value = g_environ_getenv (env, "foo");
g_assert (value == NULL); g_assert_null (value);
if (g_test_undefined ()) if (g_test_undefined ())
{ {
@ -221,7 +221,7 @@ test_environ_array (void)
env = g_environ_unsetenv (env, "foo2"); env = g_environ_unsetenv (env, "foo2");
value = g_environ_getenv (env, "foo2"); value = g_environ_getenv (env, "foo2");
g_assert (value == NULL); g_assert_null (value);
g_strfreev (env); g_strfreev (env);
} }
@ -235,14 +235,14 @@ test_environ_null (void)
env = NULL; env = NULL;
value = g_environ_getenv (env, "foo"); value = g_environ_getenv (env, "foo");
g_assert (value == NULL); g_assert_null (value);
env = g_environ_setenv (NULL, "foo", "bar", TRUE); env = g_environ_setenv (NULL, "foo", "bar", TRUE);
g_assert (env != NULL); g_assert_nonnull (env);
g_strfreev (env); g_strfreev (env);
env = g_environ_unsetenv (NULL, "foo"); env = g_environ_unsetenv (NULL, "foo");
g_assert (env == NULL); g_assert_null (env);
} }
static void static void
@ -261,7 +261,7 @@ test_environ_case (void)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_assert_cmpstr (value, ==, "bar"); g_assert_cmpstr (value, ==, "bar");
#else #else
g_assert (value == NULL); g_assert_null (value);
#endif #endif
env = g_environ_setenv (env, "FOO", "x", TRUE); env = g_environ_setenv (env, "FOO", "x", TRUE);
@ -275,7 +275,7 @@ test_environ_case (void)
env = g_environ_unsetenv (env, "Foo"); env = g_environ_unsetenv (env, "Foo");
value = g_environ_getenv (env, "foo"); value = g_environ_getenv (env, "foo");
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_assert (value == NULL); g_assert_null (value);
#else #else
g_assert_cmpstr (value, ==, "bar"); g_assert_cmpstr (value, ==, "bar");
#endif #endif