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

tests: Don't test g_utf8_to_ucs4_fast too rigorously

Browse Source 
The function is documented to assume valid input, and doesn't
guarantee behavior with invalid input. So don't test that.

https://bugzilla.gnome.org/show_bug.cgi?id=754636
This commit is contained in:
Matthias Clasen 2015-09-07 14:59:22 -04:00
parent db3ffe5bf1
commit e773acfe9a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/unicode-encoding.c
View File

@ -77,6 +77,16 @@ utf16_count (gunichar2 *a)
return result; return result;
} }
static void
print_ucs4 (const gchar *prefix, gunichar *ucs4, gint ucs4_len)
{
gint i;
g_print ("%s ", prefix);
for (i = 0; i < ucs4_len; i++)
g_print ("%x ", ucs4[i]);
g_print ("\n");
}
static void static void
process (gint line, process (gint line,
gchar *utf8, gchar *utf8,
@ -137,12 +147,11 @@ process (gint line,
if (status == VALID || status == NOTUNICODE) if (status == VALID || status == NOTUNICODE)
{ {
gunichar *ucs4_result; gunichar *ucs4_result;
gchar *utf8_result;
ucs4_result = g_utf8_to_ucs4 (utf8, -1, &items_read, &items_written, &error); ucs4_result = g_utf8_to_ucs4 (utf8, -1, &items_read, &items_written, &error);
if (!ucs4_result) if (!ucs4_result)
{ {
fail ("line %d: conversion to ucs4 failed: %s\n", line, error->message); fail ("line %d: conversion with status %d to ucs4 failed: %s\n", line, status, error->message);
return; return;
} }
@ -150,18 +159,28 @@ process (gint line,
items_read != strlen (utf8) || items_read != strlen (utf8) ||
items_written != ucs4_len) items_written != ucs4_len)
{ {
fail ("line %d: results of conversion to ucs4 do not match expected.\n", line); fail ("line %d: results of conversion with status %d to ucs4 do not match expected.\n", line, status);
print_ucs4 ("expected: ", ucs4, ucs4_len);
print_ucs4 ("received: ", ucs4_result, items_written);
return; return;
} }
g_free (ucs4_result); g_free (ucs4_result);
}
if (status == VALID)
{
gunichar *ucs4_result;
gchar *utf8_result;
ucs4_result = g_utf8_to_ucs4_fast (utf8, -1, &items_written); ucs4_result = g_utf8_to_ucs4_fast (utf8, -1, &items_written);
if (!ucs4_equal (ucs4_result, ucs4) || if (!ucs4_equal (ucs4_result, ucs4) ||
items_written != ucs4_len) items_written != ucs4_len)
{ {
fail ("line %d: results of fast conversion to ucs4 do not match expected.\n", line); fail ("line %d: results of fast conversion with status %d to ucs4 do not match expected.\n", line, status);
print_ucs4 ("expected: ", ucs4, ucs4_len);
print_ucs4 ("received: ", ucs4_result, items_written);
return; return;
} }