Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / test / unicode_ut.c

diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index 47532a64df62b8409ac2dd8e8e716ee84ee15b4c..26d96336f36b26b4923f6ff25f1943ca64ed46c2 100644 (file)
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -9,6 +9,8 @@
 #include <charset.h>
 #include <command.h>
 #include <errno.h>
+#include <log.h>
+#include <malloc.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
@@ -65,8 +67,9 @@ static int unicode_test_u16_strdup(struct unit_test_state *uts)
        u16 *copy = u16_strdup(c4);
 
        ut_assert(copy != c4);
-       ut_assert(!memcmp(copy, c4, sizeof(c4)));
+       ut_asserteq_mem(copy, c4, sizeof(c4));
        free(copy);
+
        return 0;
 }
 UNICODE_TEST(unicode_test_u16_strdup);
@@ -78,7 +81,8 @@ static int unicode_test_u16_strcpy(struct unit_test_state *uts)
 
        r = u16_strcpy(copy, c1);
        ut_assert(r == copy);
-       ut_assert(!memcmp(copy, c1, sizeof(c1)));
+       ut_asserteq_mem(copy, c1, sizeof(c1));
+
        return 0;
 }
 UNICODE_TEST(unicode_test_u16_strcpy);
@@ -580,7 +584,17 @@ static int unicode_test_u16_strncmp(struct unit_test_state *uts)
 }
 UNICODE_TEST(unicode_test_u16_strncmp);
 
-int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int unicode_test_u16_strsize(struct unit_test_state *uts)
+{
+       ut_asserteq_64(u16_strsize(c1), 14);
+       ut_asserteq_64(u16_strsize(c2), 18);
+       ut_asserteq_64(u16_strsize(c3), 8);
+       ut_asserteq_64(u16_strsize(c4), 14);
+       return 0;
+}
+UNICODE_TEST(unicode_test_u16_strsize);
+
+int do_ut_unicode(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        struct unit_test *tests = ll_entry_start(struct unit_test, unicode_test);
        const int n_ents = ll_entry_count(struct unit_test, unicode_test);