luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 20:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use g_assert_*() rather than g_assert() in string tests

Browse Source 
It won’t get compiled out with `G_DISABLE_ASSERT`.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2023-02-15 14:41:24 +00:00
parent bc53fff8a3
commit 6a46aabd4c
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
glib/tests/string.c
View File

@ -47,7 +47,7 @@ test_string_chunks (void)
}
tmp_string_2 = g_string_chunk_insert_const (string_chunk, tmp_string);
g_assert (tmp_string_2 != tmp_string);
g_assert_true (tmp_string_2 != tmp_string);
g_assert_cmpstr (tmp_string_2, ==, tmp_string);
tmp_string = g_string_chunk_insert_const (string_chunk, tmp_string);
@ -72,9 +72,9 @@ test_string_chunk_insert (void)
str[1] = g_string_chunk_insert_len (chunk, s1, 8);
str[2] = g_string_chunk_insert (chunk, s2);
g_assert (memcmp (s0, str[0], sizeof s0) == 0);
g_assert (memcmp (s1, str[1], sizeof s1) == 0);
g_assert (memcmp (s2, str[2], sizeof s2) == 0);
g_assert_cmpmem (s0, sizeof s0, str[0], sizeof s0);
g_assert_cmpmem (s1, sizeof s1, str[1], sizeof s1);
g_assert_cmpmem (s2, sizeof s2, str[2], sizeof s2);
g_string_chunk_free (chunk);
}
@ -87,11 +87,11 @@ test_string_new (void)
string1 = g_string_new ("hi pete!");
string2 = g_string_new (NULL);
g_assert (string1 != NULL);
g_assert (string2 != NULL);
g_assert (strlen (string1->str) == string1->len);
g_assert (strlen (string2->str) == string2->len);
g_assert (string2->len == 0);
g_assert_nonnull (string1);
g_assert_nonnull (string2);
g_assert_cmpuint (strlen (string1->str), ==, string1->len);
g_assert_cmpuint (strlen (string2->str), ==, string2->len);
g_assert_cmpuint (string2->len, ==, 0);
g_assert_cmpstr ("hi pete!", ==, string1->str);
g_assert_cmpstr ("", ==, string2->str);
@ -472,9 +472,9 @@ test_string_equal (void)
string1 = g_string_new ("test");
string2 = g_string_new ("te");
g_assert (!g_string_equal(string1, string2));
g_assert_false (g_string_equal (string1, string2));
g_string_append (string2, "st");
g_assert (g_string_equal(string1, string2));
g_assert_true (g_string_equal (string1, string2));
g_string_free (string1, TRUE);
g_string_free (string2, TRUE);
}
@ -487,15 +487,15 @@ test_string_truncate (void)
string = g_string_new ("testing");
g_string_truncate (string, 1000);
g_assert (string->len == strlen("testing"));
g_assert_cmpuint (string->len, ==, strlen("testing"));
g_assert_cmpstr (string->str, ==, "testing");
(g_string_truncate) (string, 4);
g_assert (string->len == 4);
g_assert_cmpuint (string->len, ==, 4);
g_assert_cmpstr (string->str, ==, "test");
g_string_truncate (string, 0);
g_assert (string->len == 0);
g_assert_cmpuint (string->len, ==, 0);
g_assert_cmpstr (string->str, ==, "");
g_string_free (string, TRUE);
@ -510,24 +510,24 @@ test_string_overwrite (void)
string = g_string_new ("testing");
g_string_overwrite (string, 4, " and expand");
g_assert (15 == string->len);
g_assert ('\0' == string->str[15]);
g_assert (g_str_equal ("test and expand", string->str));
g_assert_cmpuint (15, ==, string->len);
g_assert_true ('\0' == string->str[15]);
g_assert_true (g_str_equal ("test and expand", string->str));
g_string_overwrite (string, 5, "NOT-");
g_assert (15 == string->len);
g_assert ('\0' == string->str[15]);
g_assert (g_str_equal ("test NOT-expand", string->str));
g_assert_cmpuint (15, ==, string->len);
g_assert_true ('\0' == string->str[15]);
g_assert_true (g_str_equal ("test NOT-expand", string->str));
g_string_overwrite_len (string, 9, "blablabla", 6);
g_assert (15 == string->len);
g_assert ('\0' == string->str[15]);
g_assert (g_str_equal ("test NOT-blabla", string->str));
g_assert_cmpuint (15, ==, string->len);
g_assert_true ('\0' == string->str[15]);
g_assert_true (g_str_equal ("test NOT-blabla", string->str));
g_string_overwrite_len (string, 4, "BLABL", 0);
g_assert (g_str_equal ("test NOT-blabla", string->str));
g_assert_true (g_str_equal ("test NOT-blabla", string->str));
g_string_overwrite_len (string, 4, "BLABL", -1);
g_assert (g_str_equal ("testBLABLblabla", string->str));
g_assert_true (g_str_equal ("testBLABLblabla", string->str));
g_string_free (string, TRUE);
}
@ -540,15 +540,15 @@ test_string_nul_handling (void)
/* Check handling of embedded ASCII 0 (NUL) characters in GString. */
string1 = g_string_new ("fiddle");
string2 = g_string_new ("fiddle");
g_assert (g_string_equal (string1, string2));
g_assert_true (g_string_equal (string1, string2));
g_string_append_c (string1, '\0');
g_assert (!g_string_equal (string1, string2));
g_assert_false (g_string_equal (string1, string2));
g_string_append_c (string2, '\0');
g_assert (g_string_equal (string1, string2));
g_assert_true (g_string_equal (string1, string2));
g_string_append_c (string1, 'x');
g_string_append_c (string2, 'y');
g_assert (!g_string_equal (string1, string2));
g_assert (string1->len == 8);
g_assert_false (g_string_equal (string1, string2));
g_assert_cmpuint (string1->len, ==, 8);
g_string_append (string1, "yzzy");
g_assert_cmpmem (string1->str, string1->len + 1, "fiddle\0xyzzy", 13);
g_string_insert (string1, 1, "QED");