The mbslen has 2 different implementations (one relying on mbuiterf, one
relying on mcel). To avoid behavioural differences, a unit test is in order.


2024-06-18  Bruno Haible  <br...@clisp.org>

        mbslen: Add tests.
        * tests/test-mbslen.c: New file.
        * tests/test-mbslen.sh: New file, based on tests/test-mbsspn.sh.
        * modules/mbslen-tests: New file.

From ba4f392a04ad0633bd6533c2983c6a980fe9f014 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Wed, 19 Jun 2024 00:45:46 +0200
Subject: [PATCH] mbslen: Add tests.

* tests/test-mbslen.c: New file.
* tests/test-mbslen.sh: New file, based on tests/test-mbsspn.sh.
* modules/mbslen-tests: New file.
---
 ChangeLog            |  7 +++++++
 modules/mbslen-tests | 18 +++++++++++++++++
 tests/test-mbslen.c  | 47 ++++++++++++++++++++++++++++++++++++++++++++
 tests/test-mbslen.sh | 15 ++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 modules/mbslen-tests
 create mode 100644 tests/test-mbslen.c
 create mode 100755 tests/test-mbslen.sh

diff --git a/ChangeLog b/ChangeLog
index 43b8424b6b..7e66ba5b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-18  Bruno Haible  <br...@clisp.org>
+
+	mbslen: Add tests.
+	* tests/test-mbslen.c: New file.
+	* tests/test-mbslen.sh: New file, based on tests/test-mbsspn.sh.
+	* modules/mbslen-tests: New file.
+
 2024-06-18  Bruno Haible  <br...@clisp.org>
 
 	u*-vasnprintf tests: Add tests of %ls directive.
diff --git a/modules/mbslen-tests b/modules/mbslen-tests
new file mode 100644
index 0000000000..0d21eddab8
--- /dev/null
+++ b/modules/mbslen-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-mbslen.sh
+tests/test-mbslen.c
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR_UTF8
+
+Makefile.am:
+TESTS += test-mbslen.sh
+TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+check_PROGRAMS += test-mbslen
+test_mbslen_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
diff --git a/tests/test-mbslen.c b/tests/test-mbslen.c
new file mode 100644
index 0000000000..a762c6448a
--- /dev/null
+++ b/tests/test-mbslen.c
@@ -0,0 +1,47 @@
+/* Test of determining the number of multibyte characters in a string.
+   Copyright (C) 2007-2024 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 <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2024.  */
+
+#include <config.h>
+
+#include <string.h>
+
+#include <locale.h>
+
+#include "macros.h"
+
+int
+main ()
+{
+  /* configure should already have checked that the locale is supported.  */
+  if (setlocale (LC_ALL, "") == NULL)
+    return 1;
+
+  ASSERT (mbslen ("") == 0);
+  ASSERT (mbslen ("Hello") == 5);
+
+  /* The following tests shows how mbslen() is different from strlen().  */
+  ASSERT (mbslen ("\303\244\303\266") == 2); /* "äö" */
+  ASSERT (mbslen ("7\342\202\254") == 2); /* "7€" */
+  ASSERT (mbslen ("\360\237\220\203") == 1); /* "🐃" */
+
+  ASSERT (mbslen ("\303") == 1); /* invalid multibyte sequence */
+  ASSERT (mbslen ("\342\202") == 2); /* 2x invalid multibyte sequence */
+  ASSERT (mbslen ("\360\237\220") == 3); /* 3x invalid multibyte sequence */
+
+  return test_exit_status;
+}
diff --git a/tests/test-mbslen.sh b/tests/test-mbslen.sh
new file mode 100755
index 0000000000..9ba9f0cbac
--- /dev/null
+++ b/tests/test-mbslen.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-mbslen${EXEEXT}
-- 
2.34.1

Reply via email to