From 343b31bf1b7492ad2519143fd490565a6f6a2321 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 3 Jan 2025 13:34:16 +0100 Subject: [PATCH] mbs_endswith: Add tests. * tests/test-mbs_endswith1.c: New file. * tests/test-mbs_endswith2.sh: New file, based on tests/test-mbsstr2.sh. * tests/test-mbs_endswith2.c: New file. * tests/test-mbs_endswith3.sh: New file, based on tests/test-mbsstr3.sh. * tests/test-mbs_endswith3.c: New file. * modules/mbs_endswith-tests: New file. --- ChangeLog | 8 +++++ modules/mbs_endswith-tests | 30 ++++++++++++++++ tests/test-mbs_endswith1.c | 48 +++++++++++++++++++++++++ tests/test-mbs_endswith2.c | 66 ++++++++++++++++++++++++++++++++++ tests/test-mbs_endswith2.sh | 23 ++++++++++++ tests/test-mbs_endswith3.c | 71 +++++++++++++++++++++++++++++++++++++ tests/test-mbs_endswith3.sh | 15 ++++++++ 7 files changed, 261 insertions(+) create mode 100644 modules/mbs_endswith-tests create mode 100644 tests/test-mbs_endswith1.c create mode 100644 tests/test-mbs_endswith2.c create mode 100755 tests/test-mbs_endswith2.sh create mode 100644 tests/test-mbs_endswith3.c create mode 100755 tests/test-mbs_endswith3.sh diff --git a/ChangeLog b/ChangeLog index 4dc577daf5..3cce627d4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2025-01-03 Bruno Haible + mbs_endswith: Add tests. + * tests/test-mbs_endswith1.c: New file. + * tests/test-mbs_endswith2.sh: New file, based on tests/test-mbsstr2.sh. + * tests/test-mbs_endswith2.c: New file. + * tests/test-mbs_endswith3.sh: New file, based on tests/test-mbsstr3.sh. + * tests/test-mbs_endswith3.c: New file. + * modules/mbs_endswith-tests: New file. + mbs_endswith: New module. * lib/string.in.h (mbs_endswith): New declaration. * lib/mbs_endswith.c: New file. diff --git a/modules/mbs_endswith-tests b/modules/mbs_endswith-tests new file mode 100644 index 0000000000..62032384d1 --- /dev/null +++ b/modules/mbs_endswith-tests @@ -0,0 +1,30 @@ +Files: +tests/test-mbs_endswith1.c +tests/test-mbs_endswith2.sh +tests/test-mbs_endswith2.c +tests/test-mbs_endswith3.sh +tests/test-mbs_endswith3.c +tests/macros.h +m4/locale-en.m4 +m4/locale-fr.m4 +m4/locale-zh.m4 +m4/codeset.m4 + +Depends-on: +setlocale + +configure.ac: +gt_LOCALE_EN_UTF8 +gt_LOCALE_FR_UTF8 +gt_LOCALE_ZH_CN + +Makefile.am: +TESTS += test-mbs_endswith1 test-mbs_endswith2.sh test-mbs_endswith3.sh +TESTS_ENVIRONMENT += \ + LOCALE_EN_UTF8='@LOCALE_EN_UTF8@' \ + LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ + LOCALE_ZH_CN='@LOCALE_ZH_CN@' +check_PROGRAMS += test-mbs_endswith1 test-mbs_endswith2 test-mbs_endswith3 +test_mbs_endswith1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV) +test_mbs_endswith2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) +test_mbs_endswith3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) diff --git a/tests/test-mbs_endswith1.c b/tests/test-mbs_endswith1.c new file mode 100644 index 0000000000..9153ed03f1 --- /dev/null +++ b/tests/test-mbs_endswith1.c @@ -0,0 +1,48 @@ +/* Test of mbs_endswith() function. + Copyright (C) 2025 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 , 2025. */ + +#include + +#include + +#include + +#include "macros.h" + +int +main () +{ + /* This test is executed in the C locale. */ + + ASSERT (mbs_endswith ("", "")); + ASSERT (mbs_endswith ("abc", "")); + + ASSERT (!mbs_endswith ("", "c")); + ASSERT (!mbs_endswith ("x", "c")); + ASSERT (mbs_endswith ("c", "c")); + ASSERT (mbs_endswith ("abc", "c")); + + ASSERT (!mbs_endswith ("", "xyz")); + ASSERT (!mbs_endswith ("x", "xyz")); + ASSERT (!mbs_endswith ("a", "xyz")); + ASSERT (!mbs_endswith ("abc", "xyz")); + ASSERT (mbs_endswith ("xyz", "xyz")); + ASSERT (mbs_endswith ("yxxyz", "xyz")); + + return test_exit_status; +} diff --git a/tests/test-mbs_endswith2.c b/tests/test-mbs_endswith2.c new file mode 100644 index 0000000000..f76f9b04e4 --- /dev/null +++ b/tests/test-mbs_endswith2.c @@ -0,0 +1,66 @@ +/* Test of mbs_endswith() function. + Copyright (C) 2025 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 , 2025. */ + +#include + +#include + +#include +#include + +#include "macros.h" + +int +main () +{ + /* configure should already have checked that the locale is supported. */ + if (setlocale (LC_ALL, "") == NULL) + return 1; + + ASSERT (mbs_endswith ("", "")); + ASSERT (mbs_endswith ("abc", "")); + + ASSERT (!mbs_endswith ("", "c")); + ASSERT (!mbs_endswith ("x", "c")); + ASSERT (mbs_endswith ("c", "c")); + ASSERT (mbs_endswith ("abc", "c")); + + ASSERT (!mbs_endswith ("", "xyz")); + ASSERT (!mbs_endswith ("x", "xyz")); + ASSERT (!mbs_endswith ("a", "xyz")); + ASSERT (!mbs_endswith ("abc", "xyz")); + ASSERT (mbs_endswith ("xyz", "xyz")); + ASSERT (mbs_endswith ("yxxyz", "xyz")); + + ASSERT (mbs_endswith ("", "")); + ASSERT (mbs_endswith ("\303\244\306\200\303\247", "")); /* "äƀç" */ + + ASSERT (!mbs_endswith ("", "\303\247")); /* "ç" */ + ASSERT (!mbs_endswith ("\341\272\213", "\303\247")); /* "ẋ" "ç" */ + ASSERT (mbs_endswith ("\303\247", "\303\247")); /* "ç" "ç" */ + ASSERT (mbs_endswith ("\303\244\306\200\303\247", "\303\247")); /* "äƀç" "ç" */ + + ASSERT (!mbs_endswith ("", "\341\272\213\303\277\341\272\221")); /* "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\341\272\213", "\341\272\213\303\277\341\272\221")); /* "ẋ" "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\303\244", "\341\272\213\303\277\341\272\221")); /* "ä" "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\303\244\306\200\303\247", "\341\272\213\303\277\341\272\221")); /* "äƀç" "ẋÿẑ" */ + ASSERT (mbs_endswith ("\341\272\213\303\277\341\272\221", "\341\272\213\303\277\341\272\221")); /* "ẋÿẑ" "ẋÿẑ" */ + ASSERT (mbs_endswith ("\303\277\341\272\213\341\272\213\303\277\341\272\221", "\341\272\213\303\277\341\272\221")); /* "ÿẋẋÿẑ" "ẋÿẑ" */ + + return test_exit_status; +} diff --git a/tests/test-mbs_endswith2.sh b/tests/test-mbs_endswith2.sh new file mode 100755 index 0000000000..464e9e9956 --- /dev/null +++ b/tests/test-mbs_endswith2.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# Test whether a specific UTF-8 locale is installed. +: "${LOCALE_EN_UTF8=en_US.UTF-8}" +: "${LOCALE_FR_UTF8=fr_FR.UTF-8}" +if test "$LOCALE_EN_UTF8" = none && test $LOCALE_FR_UTF8 = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no english or french Unicode locale is installed" + else + echo "Skipping test: no english or french Unicode locale is supported" + fi + exit 77 +fi + +# It's sufficient to test in one of the two locales. +if test $LOCALE_FR_UTF8 != none; then + testlocale=$LOCALE_FR_UTF8 +else + testlocale="$LOCALE_EN_UTF8" +fi + +LC_ALL="$testlocale" \ +${CHECKER} ./test-mbs_endswith2${EXEEXT} diff --git a/tests/test-mbs_endswith3.c b/tests/test-mbs_endswith3.c new file mode 100644 index 0000000000..ee7c1d4a2d --- /dev/null +++ b/tests/test-mbs_endswith3.c @@ -0,0 +1,71 @@ +/* Test of mbs_endswith() function. + Copyright (C) 2025 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 , 2025. */ + +#include + +#include + +#include + +#include "macros.h" + +int +main () +{ + /* configure should already have checked that the locale is supported. */ + if (setlocale (LC_ALL, "") == NULL) + return 1; + + ASSERT (mbs_endswith ("", "")); + ASSERT (mbs_endswith ("abc", "")); + + ASSERT (!mbs_endswith ("", "c")); + ASSERT (!mbs_endswith ("x", "c")); + ASSERT (mbs_endswith ("c", "c")); + ASSERT (mbs_endswith ("abc", "c")); + + ASSERT (!mbs_endswith ("", "xyz")); + ASSERT (!mbs_endswith ("x", "xyz")); + ASSERT (!mbs_endswith ("a", "xyz")); + ASSERT (!mbs_endswith ("abc", "xyz")); + ASSERT (mbs_endswith ("xyz", "xyz")); + ASSERT (mbs_endswith ("yxxyz", "xyz")); + + ASSERT (mbs_endswith ("", "")); + ASSERT (mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "")); /* "äƀç" */ + + ASSERT (!mbs_endswith ("", "\201\060\212\064")); /* "ç" */ + ASSERT (!mbs_endswith ("\201\065\374\063", "\201\060\212\064")); /* "ẋ" "ç" */ + ASSERT (mbs_endswith ("\201\060\212\064", "\201\060\212\064")); /* "ç" "ç" */ + ASSERT (mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "\201\060\212\064")); /* "äƀç" "ç" */ + ASSERT (!mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "4")); /* "äƀç" */ + ASSERT (!mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "0\212\064")); /* "äƀç" "0?" */ + ASSERT (!mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "8\201\060\212\064")); /* "äƀç" "8ç" */ + + ASSERT (!mbs_endswith ("", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\201\065\374\063", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "ẋ" "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\201\060\212\061", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "ä" "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\201\060\212\061\201\060\227\070\201\060\212\064", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "äƀç" "ẋÿẑ" */ + ASSERT (mbs_endswith ("\201\065\374\063\201\060\213\067\201\065\374\071", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "ẋÿẑ" "ẋÿẑ" */ + ASSERT (mbs_endswith ("\201\060\213\067\201\065\374\063\201\065\374\063\201\060\213\067\201\065\374\071", "\201\065\374\063\201\060\213\067\201\065\374\071")); /* "ÿẋẋÿẑ" "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\201\065\374\063\201\060\213\067\201\065\374\071", "9")); /* "ẋÿẑ" */ + ASSERT (!mbs_endswith ("\201\065\374\063\201\060\213\067\201\065\374\071", "5\374\071")); /* "ẋÿẑ" "5?" */ + ASSERT (!mbs_endswith ("\201\065\374\063\201\060\213\067\201\065\374\071", "7\201\065\374\071")); /* "ẋÿẑ" "7ẑ" */ + + return test_exit_status; +} diff --git a/tests/test-mbs_endswith3.sh b/tests/test-mbs_endswith3.sh new file mode 100755 index 0000000000..fe0df625de --- /dev/null +++ b/tests/test-mbs_endswith3.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 chinese GB18030 locale is installed" + else + echo "Skipping test: no chinese GB18030 locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_ZH_CN \ +${CHECKER} ./test-mbs_endswith3${EXEEXT} -- 2.39.5