X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Funicode_ut.c;h=8875cdc6b2f5b6b8e419c54111cad669784bc576;hb=a11c081da3dfbef309cd21ab54b7b2582d0c9f35;hp=84fc9a3b5374d94606859721bf5560768e069931;hpb=abb93cb0e548fbf3b6d88e044b52bb8bc8773577;p=oweals%2Fu-boot.git

diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index 84fc9a3b53..8875cdc6b2 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -50,7 +50,17 @@ static const char j1[] = {0x6a, 0x31, 0xa1, 0x6c, 0x00};
 static const char j2[] = {0x6a, 0x32, 0xc3, 0xc3, 0x6c, 0x00};
 static const char j3[] = {0x6a, 0x33, 0xf0, 0x90, 0xf0, 0x00};
 
-static int ut_u16_strdup(struct unit_test_state *uts)
+static int unicode_test_u16_strlen(struct unit_test_state *uts)
+{
+	ut_asserteq(6, u16_strlen(c1));
+	ut_asserteq(8, u16_strlen(c2));
+	ut_asserteq(3, u16_strlen(c3));
+	ut_asserteq(6, u16_strlen(c4));
+	return 0;
+}
+UNICODE_TEST(unicode_test_u16_strlen);
+
+static int unicode_test_u16_strdup(struct unit_test_state *uts)
 {
 	u16 *copy = u16_strdup(c4);
 
@@ -59,9 +69,9 @@ static int ut_u16_strdup(struct unit_test_state *uts)
 	free(copy);
 	return 0;
 }
-UNICODE_TEST(ut_u16_strdup);
+UNICODE_TEST(unicode_test_u16_strdup);
 
-static int ut_u16_strcpy(struct unit_test_state *uts)
+static int unicode_test_u16_strcpy(struct unit_test_state *uts)
 {
 	u16 *r;
 	u16 copy[10];
@@ -71,11 +81,11 @@ static int ut_u16_strcpy(struct unit_test_state *uts)
 	ut_assert(!memcmp(copy, c1, sizeof(c1)));
 	return 0;
 }
-UNICODE_TEST(ut_u16_strcpy);
+UNICODE_TEST(unicode_test_u16_strcpy);
 
 /* U-Boot uses UTF-16 strings in the EFI context only. */
 #if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
-static int ut_string16(struct unit_test_state *uts)
+static int unicode_test_string16(struct unit_test_state *uts)
 {
 	char buf[20];
 
@@ -113,10 +123,10 @@ static int ut_string16(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_string16);
+UNICODE_TEST(unicode_test_string16);
 #endif
 
-static int ut_utf8_get(struct unit_test_state *uts)
+static int unicode_test_utf8_get(struct unit_test_state *uts)
 {
 	const char *s;
 	s32 code;
@@ -152,9 +162,9 @@ static int ut_utf8_get(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_get);
+UNICODE_TEST(unicode_test_utf8_get);
 
-static int ut_utf8_put(struct unit_test_state *uts)
+static int unicode_test_utf8_put(struct unit_test_state *uts)
 {
 	char buffer[8] = { 0, };
 	char *pos;
@@ -190,9 +200,9 @@ static int ut_utf8_put(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_put);
+UNICODE_TEST(unicode_test_utf8_put);
 
-static int ut_utf8_utf16_strlen(struct unit_test_state *uts)
+static int unicode_test_utf8_utf16_strlen(struct unit_test_state *uts)
 {
 	ut_asserteq(6, utf8_utf16_strlen(d1));
 	ut_asserteq(8, utf8_utf16_strlen(d2));
@@ -206,9 +216,9 @@ static int ut_utf8_utf16_strlen(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_utf16_strlen);
+UNICODE_TEST(unicode_test_utf8_utf16_strlen);
 
-static int ut_utf8_utf16_strnlen(struct unit_test_state *uts)
+static int unicode_test_utf8_utf16_strnlen(struct unit_test_state *uts)
 {
 	ut_asserteq(3, utf8_utf16_strnlen(d1, 3));
 	ut_asserteq(6, utf8_utf16_strnlen(d1, 13));
@@ -224,7 +234,7 @@ static int ut_utf8_utf16_strnlen(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_utf16_strnlen);
+UNICODE_TEST(unicode_test_utf8_utf16_strnlen);
 
 /**
  * ut_u16_strcmp() - Compare to u16 strings.
@@ -234,7 +244,7 @@ UNICODE_TEST(ut_utf8_utf16_strnlen);
  * @count:	number of u16 to compare
  * Return:	-1 if a1 < a2, 0 if a1 == a2, 1 if a1 > a2
  */
-static int ut_u16_strcmp(const u16 *a1, const u16 *a2, size_t count)
+static int unicode_test_u16_strcmp(const u16 *a1, const u16 *a2, size_t count)
 {
 	for (; (*a1 || *a2) && count; ++a1, ++a2, --count) {
 		if (*a1 < *a2)
@@ -245,7 +255,7 @@ static int ut_u16_strcmp(const u16 *a1, const u16 *a2, size_t count)
 	return 0;
 }
 
-static int ut_utf8_utf16_strcpy(struct unit_test_state *uts)
+static int unicode_test_utf8_utf16_strcpy(struct unit_test_state *uts)
 {
 	u16 buf[16];
 	u16 *pos;
@@ -253,44 +263,44 @@ static int ut_utf8_utf16_strcpy(struct unit_test_state *uts)
 	pos = buf;
 	utf8_utf16_strcpy(&pos, d1);
 	ut_asserteq(6, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, c1, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c1, SIZE_MAX));
 
 	pos = buf;
 	utf8_utf16_strcpy(&pos, d2);
 	ut_asserteq(8, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, c2, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c2, SIZE_MAX));
 
 	pos = buf;
 	utf8_utf16_strcpy(&pos, d3);
 	ut_asserteq(3, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, c3, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c3, SIZE_MAX));
 
 	pos = buf;
 	utf8_utf16_strcpy(&pos, d4);
 	ut_asserteq(6, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, c4, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c4, SIZE_MAX));
 
 	/* Illegal utf-8 strings */
 	pos = buf;
 	utf8_utf16_strcpy(&pos, j1);
 	ut_asserteq(4, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, L"j1?l", SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, L"j1?l", SIZE_MAX));
 
 	pos = buf;
 	utf8_utf16_strcpy(&pos, j2);
 	ut_asserteq(4, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, L"j2?l", SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, L"j2?l", SIZE_MAX));
 
 	pos = buf;
 	utf8_utf16_strcpy(&pos, j3);
 	ut_asserteq(3, pos - buf);
-	ut_assert(!ut_u16_strcmp(buf, L"j3?", SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, L"j3?", SIZE_MAX));
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_utf16_strcpy);
+UNICODE_TEST(unicode_test_utf8_utf16_strcpy);
 
-int ut_utf8_utf16_strncpy(struct unit_test_state *uts)
+static int unicode_test_utf8_utf16_strncpy(struct unit_test_state *uts)
 {
 	u16 buf[16];
 	u16 *pos;
@@ -300,41 +310,41 @@ int ut_utf8_utf16_strncpy(struct unit_test_state *uts)
 	utf8_utf16_strncpy(&pos, d1, 4);
 	ut_asserteq(4, pos - buf);
 	ut_assert(!buf[4]);
-	ut_assert(!ut_u16_strcmp(buf, c1, 4));
+	ut_assert(!unicode_test_u16_strcmp(buf, c1, 4));
 
 	pos = buf;
 	memset(buf, 0, sizeof(buf));
 	utf8_utf16_strncpy(&pos, d2, 10);
 	ut_asserteq(8, pos - buf);
 	ut_assert(buf[4]);
-	ut_assert(!ut_u16_strcmp(buf, c2, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c2, SIZE_MAX));
 
 	pos = buf;
 	memset(buf, 0, sizeof(buf));
 	utf8_utf16_strncpy(&pos, d3, 2);
 	ut_asserteq(2, pos - buf);
 	ut_assert(!buf[2]);
-	ut_assert(!ut_u16_strcmp(buf, c3, 2));
+	ut_assert(!unicode_test_u16_strcmp(buf, c3, 2));
 
 	pos = buf;
 	memset(buf, 0, sizeof(buf));
 	utf8_utf16_strncpy(&pos, d4, 2);
 	ut_asserteq(4, pos - buf);
 	ut_assert(!buf[4]);
-	ut_assert(!ut_u16_strcmp(buf, c4, 4));
+	ut_assert(!unicode_test_u16_strcmp(buf, c4, 4));
 
 	pos = buf;
 	memset(buf, 0, sizeof(buf));
 	utf8_utf16_strncpy(&pos, d4, 10);
 	ut_asserteq(6, pos - buf);
 	ut_assert(buf[5]);
-	ut_assert(!ut_u16_strcmp(buf, c4, SIZE_MAX));
+	ut_assert(!unicode_test_u16_strcmp(buf, c4, SIZE_MAX));
 
 	return 0;
 }
-UNICODE_TEST(ut_utf8_utf16_strncpy);
+UNICODE_TEST(unicode_test_utf8_utf16_strncpy);
 
-static int ut_utf16_get(struct unit_test_state *uts)
+static int unicode_test_utf16_get(struct unit_test_state *uts)
 {
 	const u16 *s;
 	s32 code;
@@ -358,9 +368,9 @@ static int ut_utf16_get(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_get);
+UNICODE_TEST(unicode_test_utf16_get);
 
-static int ut_utf16_put(struct unit_test_state *uts)
+static int unicode_test_utf16_put(struct unit_test_state *uts)
 {
 	u16 buffer[4] = { 0, };
 	u16 *pos;
@@ -386,9 +396,9 @@ static int ut_utf16_put(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_put);
+UNICODE_TEST(unicode_test_utf16_put);
 
-int ut_utf16_strnlen(struct unit_test_state *uts)
+static int unicode_test_utf16_strnlen(struct unit_test_state *uts)
 {
 	ut_asserteq(3, utf16_strnlen(c1, 3));
 	ut_asserteq(6, utf16_strnlen(c1, 13));
@@ -404,9 +414,9 @@ int ut_utf16_strnlen(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_strnlen);
+UNICODE_TEST(unicode_test_utf16_strnlen);
 
-int ut_utf16_utf8_strlen(struct unit_test_state *uts)
+static int unicode_test_utf16_utf8_strlen(struct unit_test_state *uts)
 {
 	ut_asserteq(6, utf16_utf8_strlen(c1));
 	ut_asserteq(9, utf16_utf8_strlen(c2));
@@ -420,9 +430,9 @@ int ut_utf16_utf8_strlen(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_utf8_strlen);
+UNICODE_TEST(unicode_test_utf16_utf8_strlen);
 
-int ut_utf16_utf8_strnlen(struct unit_test_state *uts)
+static int unicode_test_utf16_utf8_strnlen(struct unit_test_state *uts)
 {
 	ut_asserteq(3, utf16_utf8_strnlen(c1, 3));
 	ut_asserteq(6, utf16_utf8_strnlen(c1, 13));
@@ -432,9 +442,9 @@ int ut_utf16_utf8_strnlen(struct unit_test_state *uts)
 	ut_asserteq(12, utf16_utf8_strnlen(c4, 3));
 	return 0;
 }
-UNICODE_TEST(ut_utf16_utf8_strnlen);
+UNICODE_TEST(unicode_test_utf16_utf8_strnlen);
 
-int ut_utf16_utf8_strcpy(struct unit_test_state *uts)
+static int unicode_test_utf16_utf8_strcpy(struct unit_test_state *uts)
 {
 	char buf[16];
 	char *pos;
@@ -477,9 +487,9 @@ int ut_utf16_utf8_strcpy(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_utf8_strcpy);
+UNICODE_TEST(unicode_test_utf16_utf8_strcpy);
 
-int ut_utf16_utf8_strncpy(struct unit_test_state *uts)
+static int unicode_test_utf16_utf8_strncpy(struct unit_test_state *uts)
 {
 	char buf[16];
 	char *pos;
@@ -521,9 +531,9 @@ int ut_utf16_utf8_strncpy(struct unit_test_state *uts)
 
 	return 0;
 }
-UNICODE_TEST(ut_utf16_utf8_strncpy);
+UNICODE_TEST(unicode_test_utf16_utf8_strncpy);
 
-int ut_utf_to_lower(struct unit_test_state *uts)
+static int unicode_test_utf_to_lower(struct unit_test_state *uts)
 {
 	ut_asserteq('@', utf_to_lower('@'));
 	ut_asserteq('a', utf_to_lower('A'));
@@ -538,9 +548,9 @@ int ut_utf_to_lower(struct unit_test_state *uts)
 #endif
 	return 0;
 }
-UNICODE_TEST(ut_utf_to_lower);
+UNICODE_TEST(unicode_test_utf_to_lower);
 
-int ut_utf_to_upper(struct unit_test_state *uts)
+static int unicode_test_utf_to_upper(struct unit_test_state *uts)
 {
 	ut_asserteq('`', utf_to_upper('`'));
 	ut_asserteq('A', utf_to_upper('a'));
@@ -555,7 +565,20 @@ int ut_utf_to_upper(struct unit_test_state *uts)
 #endif
 	return 0;
 }
-UNICODE_TEST(ut_utf_to_upper);
+UNICODE_TEST(unicode_test_utf_to_upper);
+
+static int unicode_test_u16_strncmp(struct unit_test_state *uts)
+{
+	ut_assert(u16_strncmp(L"abc", L"abc", 3) == 0);
+	ut_assert(u16_strncmp(L"abcdef", L"abcghi", 3) == 0);
+	ut_assert(u16_strncmp(L"abcdef", L"abcghi", 6) < 0);
+	ut_assert(u16_strncmp(L"abcghi", L"abcdef", 6) > 0);
+	ut_assert(u16_strcmp(L"abc", L"abc") == 0);
+	ut_assert(u16_strcmp(L"abcdef", L"deghi") < 0);
+	ut_assert(u16_strcmp(L"deghi", L"abcdef") > 0);
+	return 0;
+}
+UNICODE_TEST(unicode_test_u16_strncmp);
 
 int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {