From b086701a46a88cb42045bfded47d0d87706de6b2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jan 2020 02:33:40 +0100 Subject: [PATCH 2/2] mbsnrtoc32s: Add tests. * tests/test-mbsnrtoc32s.c: New file, based on tests/test-mbsnrtowcs.c. * tests/test-mbsnrtoc32s-1.sh: New file, based on tests/test-mbsnrtowcs1.sh. * tests/test-mbsnrtoc32s-2.sh: New file, based on tests/test-mbsnrtowcs2.sh. * tests/test-mbsnrtoc32s-3.sh: New file, based on tests/test-mbsnrtowcs3.sh. * tests/test-mbsnrtoc32s-4.sh: New file, based on tests/test-mbsnrtowcs4.sh. * modules/mbsnrtoc32s-tests: New file, based on modules/mbsnrtowcs-tests. --- ChangeLog | 13 ++ modules/mbsnrtoc32s-tests | 34 +++++ tests/test-mbsnrtoc32s-1.sh | 15 +++ tests/test-mbsnrtoc32s-2.sh | 15 +++ tests/test-mbsnrtoc32s-3.sh | 15 +++ tests/test-mbsnrtoc32s-4.sh | 15 +++ tests/test-mbsnrtoc32s.c | 293 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 400 insertions(+) create mode 100644 modules/mbsnrtoc32s-tests create mode 100755 tests/test-mbsnrtoc32s-1.sh create mode 100755 tests/test-mbsnrtoc32s-2.sh create mode 100755 tests/test-mbsnrtoc32s-3.sh create mode 100755 tests/test-mbsnrtoc32s-4.sh create mode 100644 tests/test-mbsnrtoc32s.c diff --git a/ChangeLog b/ChangeLog index fb16eee..6d9ea9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2020-01-04 Bruno Haible + mbsnrtoc32s: Add tests. + * tests/test-mbsnrtoc32s.c: New file, based on tests/test-mbsnrtowcs.c. + * tests/test-mbsnrtoc32s-1.sh: New file, based on + tests/test-mbsnrtowcs1.sh. + * tests/test-mbsnrtoc32s-2.sh: New file, based on + tests/test-mbsnrtowcs2.sh. + * tests/test-mbsnrtoc32s-3.sh: New file, based on + tests/test-mbsnrtowcs3.sh. + * tests/test-mbsnrtoc32s-4.sh: New file, based on + tests/test-mbsnrtowcs4.sh. + * modules/mbsnrtoc32s-tests: New file, based on + modules/mbsnrtowcs-tests. + mbsnrtoc32s: New module. * lib/uchar.in.h (mbsnrtoc32s): New declaration. * lib/mbsnrtowcs-impl.h: Parameterize: Use macros FUNC, DCHAR_T, diff --git a/modules/mbsnrtoc32s-tests b/modules/mbsnrtoc32s-tests new file mode 100644 index 0000000..886f7fe --- /dev/null +++ b/modules/mbsnrtoc32s-tests @@ -0,0 +1,34 @@ +Files: +tests/test-mbsnrtoc32s-1.sh +tests/test-mbsnrtoc32s-2.sh +tests/test-mbsnrtoc32s-3.sh +tests/test-mbsnrtoc32s-4.sh +tests/test-mbsnrtoc32s.c +tests/signature.h +tests/macros.h +m4/locale-fr.m4 +m4/locale-ja.m4 +m4/locale-zh.m4 +m4/codeset.m4 + +Depends-on: +mbrtoc32 +mbsinit +c32tob +setlocale + +configure.ac: +gt_LOCALE_FR +gt_LOCALE_FR_UTF8 +gt_LOCALE_JA +gt_LOCALE_ZH_CN + +Makefile.am: +TESTS += test-mbsnrtoc32s-1.sh test-mbsnrtoc32s-2.sh test-mbsnrtoc32s-3.sh test-mbsnrtoc32s-4.sh +TESTS_ENVIRONMENT += \ + LOCALE_FR='@LOCALE_FR@' \ + LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ + LOCALE_JA='@LOCALE_JA@' \ + LOCALE_ZH_CN='@LOCALE_ZH_CN@' +check_PROGRAMS += test-mbsnrtoc32s +test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) diff --git a/tests/test-mbsnrtoc32s-1.sh b/tests/test-mbsnrtoc32s-1.sh new file mode 100755 index 0000000..0e353f2 --- /dev/null +++ b/tests/test-mbsnrtoc32s-1.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test in an ISO-8859-1 or ISO-8859-15 locale. +: ${LOCALE_FR=fr_FR} +if test $LOCALE_FR = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no traditional french locale is installed" + else + echo "Skipping test: no traditional french locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_FR \ +${CHECKER} ./test-mbsnrtoc32s${EXEEXT} 1 diff --git a/tests/test-mbsnrtoc32s-2.sh b/tests/test-mbsnrtoc32s-2.sh new file mode 100755 index 0000000..d3529fa --- /dev/null +++ b/tests/test-mbsnrtoc32s-2.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific UTF-8 locale is installed. +: ${LOCALE_FR_UTF8=fr_FR.UTF-8} +if test $LOCALE_FR_UTF8 = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no french Unicode locale is installed" + else + echo "Skipping test: no french Unicode locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_FR_UTF8 \ +${CHECKER} ./test-mbsnrtoc32s${EXEEXT} 2 diff --git a/tests/test-mbsnrtoc32s-3.sh b/tests/test-mbsnrtoc32s-3.sh new file mode 100755 index 0000000..6eb5c25 --- /dev/null +++ b/tests/test-mbsnrtoc32s-3.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific EUC-JP locale is installed. +: ${LOCALE_JA=ja_JP} +if test $LOCALE_JA = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no traditional japanese locale is installed" + else + echo "Skipping test: no traditional japanese locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_JA \ +${CHECKER} ./test-mbsnrtoc32s${EXEEXT} 3 diff --git a/tests/test-mbsnrtoc32s-4.sh b/tests/test-mbsnrtoc32s-4.sh new file mode 100755 index 0000000..2e1d090 --- /dev/null +++ b/tests/test-mbsnrtoc32s-4.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific GB18030 locale is installed. +: ${LOCALE_ZH_CN=zh_CN.GB18030} +if test $LOCALE_ZH_CN = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no transitional chinese locale is installed" + else + echo "Skipping test: no transitional chinese locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_ZH_CN \ +${CHECKER} ./test-mbsnrtoc32s${EXEEXT} 4 diff --git a/tests/test-mbsnrtoc32s.c b/tests/test-mbsnrtoc32s.c new file mode 100644 index 0000000..339c4a6 --- /dev/null +++ b/tests/test-mbsnrtoc32s.c @@ -0,0 +1,293 @@ +/* Test of conversion of string to 32-bit wide string. + Copyright (C) 2008-2020 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2008. */ + +#include + +#include + +#include "signature.h" +SIGNATURE_CHECK (mbsnrtoc32s, size_t, + (char32_t *, char const **, size_t, size_t, mbstate_t *)); + +#include +#include +#include + +#include "macros.h" + +int +main (int argc, char *argv[]) +{ + mbstate_t state; + char32_t wc; + size_t ret; + + /* configure should already have checked that the locale is supported. */ + if (setlocale (LC_ALL, "") == NULL) + return 1; + + /* Test NUL byte input. */ + { + const char *src; + + memset (&state, '\0', sizeof (mbstate_t)); + + src = ""; + ret = mbsnrtoc32s (NULL, &src, 1, 0, &state); + ASSERT (ret == 0); + ASSERT (mbsinit (&state)); + + src = ""; + ret = mbsnrtoc32s (NULL, &src, 1, 1, &state); + ASSERT (ret == 0); + ASSERT (mbsinit (&state)); + + wc = (char32_t) 0xBADFACE; + src = ""; + ret = mbsnrtoc32s (&wc, &src, 1, 0, &state); + ASSERT (ret == 0); + ASSERT (wc == (char32_t) 0xBADFACE); + ASSERT (mbsinit (&state)); + + wc = (char32_t) 0xBADFACE; + src = ""; + ret = mbsnrtoc32s (&wc, &src, 1, 1, &state); + ASSERT (ret == 0); + ASSERT (wc == 0); + ASSERT (mbsinit (&state)); + } + + if (argc > 1) + { + int unlimited; + + for (unlimited = 0; unlimited < 2; unlimited++) + { + #define BUFSIZE 10 + char32_t buf[BUFSIZE]; + const char *src; + mbstate_t temp_state; + + { + size_t i; + for (i = 0; i < BUFSIZE; i++) + buf[i] = (char32_t) 0xBADFACE; + } + + switch (argv[1][0]) + { + case '1': + /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ + { + char input[] = "B\374\337er"; /* "Büßer" */ + memset (&state, '\0', sizeof (mbstate_t)); + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == 'B'); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input + 1, 1, &state); + ASSERT (ret == 1); + ASSERT (c32tob (wc) == (unsigned char) '\374'); + ASSERT (mbsinit (&state)); + input[1] = '\0'; + + src = input + 2; + temp_state = state; + ret = mbsnrtoc32s (NULL, &src, 4, unlimited ? BUFSIZE : 1, &temp_state); + ASSERT (ret == 3); + ASSERT (src == input + 2); + ASSERT (mbsinit (&state)); + + src = input + 2; + ret = mbsnrtoc32s (buf, &src, 4, unlimited ? BUFSIZE : 1, &state); + ASSERT (ret == (unlimited ? 3 : 1)); + ASSERT (src == (unlimited ? NULL : input + 3)); + ASSERT (c32tob (buf[0]) == (unsigned char) '\337'); + if (unlimited) + { + ASSERT (buf[1] == 'e'); + ASSERT (buf[2] == 'r'); + ASSERT (buf[3] == 0); + ASSERT (buf[4] == (char32_t) 0xBADFACE); + } + else + ASSERT (buf[1] == (char32_t) 0xBADFACE); + ASSERT (mbsinit (&state)); + } + break; + + case '2': + /* Locale encoding is UTF-8. */ + { + char input[] = "s\303\274\303\237\360\237\230\213!"; /* "süß😋!" */ + memset (&state, '\0', sizeof (mbstate_t)); + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == 's'); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input + 1, 1, &state); + ASSERT (ret == (size_t)(-2)); + ASSERT (wc == (char32_t) 0xBADFACE); + ASSERT (!mbsinit (&state)); + input[1] = '\0'; + + src = input + 2; + temp_state = state; + ret = mbsnrtoc32s (NULL, &src, 9, unlimited ? BUFSIZE : 2, &temp_state); + ASSERT (ret == 4); + ASSERT (src == input + 2); + ASSERT (!mbsinit (&state)); + + src = input + 2; + ret = mbsnrtoc32s (buf, &src, 9, unlimited ? BUFSIZE : 2, &state); + ASSERT (ret == (unlimited ? 4 : 2)); + ASSERT (src == (unlimited ? NULL : input + 5)); + ASSERT (c32tob (buf[0]) == EOF); + ASSERT (c32tob (buf[1]) == EOF); + if (unlimited) + { + ASSERT (buf[2] == 0x1F60B); /* expect Unicode encoding */ + ASSERT (buf[3] == '!'); + ASSERT (buf[4] == 0); + ASSERT (buf[5] == (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] == (char32_t) 0xBADFACE); + ASSERT (mbsinit (&state)); + } + break; + + case '3': + /* Locale encoding is EUC-JP. */ + { + char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */ + memset (&state, '\0', sizeof (mbstate_t)); + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == '<'); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input + 1, 2, &state); + ASSERT (ret == 2); + ASSERT (c32tob (wc) == EOF); + ASSERT (mbsinit (&state)); + input[1] = '\0'; + input[2] = '\0'; + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input + 3, 1, &state); + ASSERT (ret == (size_t)(-2)); + ASSERT (wc == (char32_t) 0xBADFACE); + ASSERT (!mbsinit (&state)); + input[3] = '\0'; + + src = input + 4; + temp_state = state; + ret = mbsnrtoc32s (NULL, &src, 5, unlimited ? BUFSIZE : 2, &temp_state); + ASSERT (ret == 3); + ASSERT (src == input + 4); + ASSERT (!mbsinit (&state)); + + src = input + 4; + ret = mbsnrtoc32s (buf, &src, 5, unlimited ? BUFSIZE : 2, &state); + ASSERT (ret == (unlimited ? 3 : 2)); + ASSERT (src == (unlimited ? NULL : input + 7)); + ASSERT (c32tob (buf[0]) == EOF); + ASSERT (c32tob (buf[1]) == EOF); + if (unlimited) + { + ASSERT (buf[2] == '>'); + ASSERT (buf[3] == 0); + ASSERT (buf[4] == (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] == (char32_t) 0xBADFACE); + ASSERT (mbsinit (&state)); + } + break; + + case '4': + /* Locale encoding is GB18030. */ + { + char input[] = "s\250\271\201\060\211\070\224\071\375\067!"; /* "süß😋!" */ + memset (&state, '\0', sizeof (mbstate_t)); + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == 's'); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + wc = (char32_t) 0xBADFACE; + ret = mbrtoc32 (&wc, input + 1, 1, &state); + ASSERT (ret == (size_t)(-2)); + ASSERT (wc == (char32_t) 0xBADFACE); + ASSERT (!mbsinit (&state)); + input[1] = '\0'; + + src = input + 2; + temp_state = state; + ret = mbsnrtoc32s (NULL, &src, 11, unlimited ? BUFSIZE : 2, &temp_state); + ASSERT (ret == 4); + ASSERT (src == input + 2); + ASSERT (!mbsinit (&state)); + + src = input + 2; + ret = mbsnrtoc32s (buf, &src, 11, unlimited ? BUFSIZE : 2, &state); + ASSERT (ret == (unlimited ? 4 : 2)); + ASSERT (src == (unlimited ? NULL : input + 7)); + ASSERT (c32tob (buf[0]) == EOF); + ASSERT (c32tob (buf[1]) == EOF); + if (unlimited) + { + ASSERT (c32tob (buf[2]) == EOF); + ASSERT (buf[3] == '!'); + ASSERT (buf[4] == 0); + ASSERT (buf[5] == (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] == (char32_t) 0xBADFACE); + ASSERT (mbsinit (&state)); + } + break; + + default: + return 1; + } + } + + return 0; + } + + return 1; +} -- 2.7.4