maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Unicode tests.

Browse Source
This commit is contained in:
Michael Jumper 2013-08-05 19:26:47 -07:00
parent 3137f54178
commit 8e08a72eda
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/util/guac_unicode.c
View File

@ -43,20 +43,22 @@
void test_guac_unicode() { void test_guac_unicode() {
/* Test character length */ /* Test character length */
CU_ASSERT_EQUAL(1, guac_utf8_charsize(UTF8_1[1])); CU_ASSERT_EQUAL(1, guac_utf8_charsize(UTF8_1b[0]));
CU_ASSERT_EQUAL(2, guac_utf8_charsize(UTF8_2[1])); CU_ASSERT_EQUAL(2, guac_utf8_charsize(UTF8_2b[0]));
CU_ASSERT_EQUAL(3, guac_utf8_charsize(UTF8_3[1])); CU_ASSERT_EQUAL(3, guac_utf8_charsize(UTF8_3b[0]));
CU_ASSERT_EQUAL(4, guac_utf8_charsize(UTF8_4[1])); CU_ASSERT_EQUAL(4, guac_utf8_charsize(UTF8_4b[0]));
/* Test string length */ /* Test string length */
CU_ASSERT_EQUAL(0, guac_utf8_strlen("")); CU_ASSERT_EQUAL(0, guac_utf8_strlen(""));
CU_ASSERT_EQUAL(4, guac_utf8_strlen(UTF8_4)); CU_ASSERT_EQUAL(1, guac_utf8_strlen(UTF8_4b));
CU_ASSERT_EQUAL(5, guac_utf8_strlen(UTF8_1 UTF8_3 UTF8_1)); CU_ASSERT_EQUAL(2, guac_utf8_strlen(UTF8_4b UTF8_1b));
CU_ASSERT_EQUAL(5, guac_utf8_strlen("hello")); CU_ASSERT_EQUAL(2, guac_utf8_strlen(UTF8_2b UTF8_3b));
CU_ASSERT_EQUAL(6, guac_utf8_strlen(UTF8_2 UTF8_1 UTF8_3)); CU_ASSERT_EQUAL(3, guac_utf8_strlen(UTF8_1b UTF8_3b UTF8_4b));
CU_ASSERT_EQUAL(8, guac_utf8_strlen(UTF8_8)); CU_ASSERT_EQUAL(3, guac_utf8_strlen(UTF8_2b UTF8_1b UTF8_3b));
CU_ASSERT_EQUAL(9, guac_utf8_strlen("guacamole")); CU_ASSERT_EQUAL(3, guac_utf8_strlen(UTF8_4b UTF8_2b UTF8_1b));
CU_ASSERT_EQUAL(11, guac_utf8_strlen(UTF8_2 UTF8_1 UTF8_8)); CU_ASSERT_EQUAL(3, guac_utf8_strlen(UTF8_3b UTF8_4b UTF8_2b));
CU_ASSERT_EQUAL(5, guac_utf8_strlen("hello"));
CU_ASSERT_EQUAL(9, guac_utf8_strlen("guacamole"));
/*int guac_utf8_write(int codepoint, char* utf8, int length); /*int guac_utf8_write(int codepoint, char* utf8, int length);
int guac_utf8_read(const char* utf8, int length, int* codepoint);*/ int guac_utf8_read(const char* utf8, int length, int* codepoint);*/

9
tests/util/util_suite.h
View File

@ -40,11 +40,10 @@
/* Unicode (UTF-8) strings */ /* Unicode (UTF-8) strings */
#define UTF8_1 "\xe7\x8a\xac" /* One character */ #define UTF8_1b "g" /* One byte */
#define UTF8_2 UTF8_1 "\xf0\x90\xac\x80" /* Two characters */ #define UTF8_2b "\xc4\xa3" /* Two bytes */
#define UTF8_3 UTF8_2 "z" /* Three characters */ #define UTF8_3b "\xe7\x8a\xac" /* Three bytes */
#define UTF8_4 UTF8_3 "\xc3\xa1" /* Four characters */ #define UTF8_4b "\xf0\x90\x84\xa3" /* Four bytes */
#define UTF8_8 UTF8_4 UTF8_4 /* Eight characters */
int register_util_suite(); int register_util_suite();