From nobody Tue Oct 25 21:51:21 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mxly12B7jz4g5by; Tue, 25 Oct 2022 21:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mxly11gCbz3fwD; Tue, 25 Oct 2022 21:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666734681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBc5ZjTCeFLnB8+JpTPq+AEIdgPOdEMlfEzvvqIBmx8=; b=nBfK0Ge9qg5QR18aYWsCF9ebT9Vsh63XrolT6HFWqk8pJdOASJ6wreHt0SLZtUCQ43feRn E649HAzbYZK3/Q2GKcC9D35K8NCT/XwWQCvVySC13eMu24vrYiCMBEac83RVjOkyg/aqa3 CbAPOkmJr0QhP6/FaFNJHlfdaKV1TvavgMtdHrvBHGiHsm6LbC6NL8EvGevVhTg+lnvx7A 2B+aS0nv/k8OlBr6sPXXeimv0t4ZYKtFCNcLZfHuPxRav4VMZzs/Y1JSAOClXEhOZJ25hv UTse0IVIchXX1HW3qHLNuevQBwKeJgsAakW/gZ58zWDMecVe9Uj1CeD6PYG3zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mxly10hGczt9P; Tue, 25 Oct 2022 21:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29PLpLqH085848; Tue, 25 Oct 2022 21:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PLpLMu085847; Tue, 25 Oct 2022 21:51:21 GMT (envelope-from git) Date: Tue, 25 Oct 2022 21:51:21 GMT Message-Id: <202210252151.29PLpLMu085847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3f97d37ac586 - main - strfmon_test: Add some tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f97d37ac586f43022fa54fdde881bf30550e67d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666734681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBc5ZjTCeFLnB8+JpTPq+AEIdgPOdEMlfEzvvqIBmx8=; b=yDrYJT4bNtOSqDHWoyoeqOYOlULMriZHby+xv9GZ4JfREcr2QK4QatKUYxQ4kRBUkPFKWE +1EgzBwKvrz4lYSn9oFIFAHE9pmXcEdJmqpm3nwFoSEskTs+OAVNqq/G34uTkNuvKHvXRR mmbzf5eDKuHVcmfnC5HgEH7nY1QpGJpngEi9JacoJRwC9HS3EIEIuIrdsQz6gY2Ds28w0W xmefkv2YpN/pWKGZRURyUX7K/EdsqNl6z21AZjEOCs2qQdp6aOAxcordOkYtLFKlSdymcS 9YzcmdbbakURhpKc+w9XGQDwSpf/5gEVEub6gg3CUcRFxAllwKycs093VZ2RwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666734681; a=rsa-sha256; cv=none; b=PPiiiZV7t8FOQ4ZcxAchEr0rKmZ5ik7SqUHQHEIOTRLP0JM2Lo1T/4i3vfGousEtW2qE4e pXHMXZNACnt+I0uD1Nhr3zLHqSm7OoZrTlBs/lklYtlh1aey0rSaCOvZHHgrQ3EFDor1aN mHmFWscX5Xbxn977/7AAJCkqtNYwBLg+pnK7CjUzBTdRKfXJovkjyL6txWV0iKLfn/1vc0 obzqcP3hHLwC++6HnXJnMiY++Opl0fzICgV+yX9+cW9R/Jeo8hlxbWvkaYw18bxkzLSLZb imQr3dS6JzlgsMTeY2IDb9rycmTH5RGgVbwiTY5VV/Cd1tJ5jQCQqGBqFYAHYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3f97d37ac586f43022fa54fdde881bf30550e67d commit 3f97d37ac586f43022fa54fdde881bf30550e67d Author: Jose Luis Duran AuthorDate: 2022-10-16 04:01:17 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-25 21:29:26 +0000 strfmon_test: Add some tests Attempt to test the correctness of strfmon(3). Some of them were inspired from the examples section at: https://pubs.opengroup.org/onlinepubs/9699919799/functions/strfmon.html Items marked with XXX represent an invalid output. Reviewed by: kib PR: 267282 Github PR: #619 MFC after: 1 week --- lib/libc/tests/stdlib/strfmon_test.c | 151 +++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c index 69398091baef..3e77a4f5290f 100644 --- a/lib/libc/tests/stdlib/strfmon_test.c +++ b/lib/libc/tests/stdlib/strfmon_test.c @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include + #include #include #include @@ -64,8 +66,157 @@ ATF_TC_BODY(strfmon_locale_thousands, tc) ATF_CHECK_STREQ(expected, actual); } +ATF_TC_WITHOUT_HEAD(strfmon_examples); +ATF_TC_BODY(strfmon_examples, tc) +{ + const struct { + const char *format; + const char *expected; + } tests[] = { + { "%n", "[$123.45] [-$123.45] [$3,456.78]" }, + { "%11n", "[ $123.45] [ -$123.45] [ $3,456.78]" }, /* XXX */ + { "%#5n", "[ $ 123.45] [-$ 123.45] [ $ 3,456.78]" }, + { "%=*#5n", "[ $***123.45] [-$***123.45] [ $*3,456.78]" }, + { "%=0#5n", "[ $000123.45] [-$000123.45] [ $03,456.78]" }, + { "%^#5n", "[ $ 123.45] [-$ 123.45] [ $ 3456.78]" }, + { "%^#5.0n", "[ $ 123] [-$ 123] [ $ 3457]" }, + { "%^#5.4n", "[ $ 123.4500] [-$ 123.4500] [ $ 3456.7810]" }, + { "%(#5n", "[$ 123.45] [($ 123.45)] [$ 3,456.78]" }, /* XXX */ + { "%!(#5n", "[ 123.45] [( 123.45)] [ 3,456.78]" }, /* XXX */ + { "%-14#5.4n", "[ $ 123.4500 ] [-$ 123.4500 ] [ $ 3,456.7810 ]" }, + { "%14#5.4n", "[ $ 123.4500] [ -$ 123.4500] [ $ 3,456.7810]" }, + }; + size_t i; + char actual[100], format[50]; + + if (setlocale(LC_MONETARY, "en_US.UTF-8") == NULL) + atf_tc_skip("unable to setlocale()"); + + for (i = 0; i < nitems(tests); ++i) { + snprintf(format, sizeof(format), "[%s] [%s] [%s]", + tests[i].format, tests[i].format, tests[i].format); + strfmon(actual, sizeof(actual), format, + 123.45, -123.45, 3456.781); + ATF_CHECK_STREQ_MSG(tests[i].expected, actual, + "[%s]", tests[i].format); + } +} + +ATF_TC(strfmon_cs_precedes_0); +ATF_TC_HEAD(strfmon_cs_precedes_0, tc) +{ + atf_tc_set_md_var(tc, "descr", + "sep_by_space x sign_posn when cs_precedes = 0"); +} +ATF_TC_BODY(strfmon_cs_precedes_0, tc) +{ + const struct { + const char *expected; + } tests[] = { + /* sep_by_space x sign_posn */ + { "[(123.00$)] [-123.00$] [123.00$-] [123.00-$] [123.00$-]" }, + { "[(123.00 $)] [-123.00 $] [123.00 $-] [123.00 -$] [123.00 $-]" }, + { "[(123.00$)] [-123.00$] [123.00$ -] [123.00- $] [123.00$ -]" }, /* XXX */ + }; + size_t i, j; + struct lconv *lc; + char actual[100], buf[100]; + + if (setlocale(LC_MONETARY, "en_US.UTF-8") == NULL) + atf_tc_skip("unable to setlocale()"); + + lc = localeconv(); + lc->n_cs_precedes = 0; + + for (i = 0; i < nitems(tests); ++i) { + actual[0] = '\0'; + lc->n_sep_by_space = i; + + for (j = 0; j < 5; ++j) { + lc->n_sign_posn = j; + + strfmon(buf, sizeof(buf), "[%n] ", -123.0); + strlcat(actual, buf, sizeof(actual)); + } + + actual[strlen(actual) - 1] = '\0'; + ATF_CHECK_STREQ_MSG(tests[i].expected, actual, + "sep_by_space = %zu", i); + } +} + +ATF_TC(strfmon_cs_precedes_1); +ATF_TC_HEAD(strfmon_cs_precedes_1, tc) +{ + atf_tc_set_md_var(tc, "descr", + "sep_by_space x sign_posn when cs_precedes = 1"); +} +ATF_TC_BODY(strfmon_cs_precedes_1, tc) +{ + const struct { + const char *expected; + } tests[] = { + /* sep_by_space x sign_posn */ + { "[($123.00)] [-$123.00] [$123.00-] [-$123.00] [$-123.00]" }, + { "[($ 123.00)] [-$ 123.00] [$ 123.00-] [-$ 123.00] [$- 123.00]" }, + { "[($123.00)] [- $123.00] [$123.00 -] [- $123.00] [$ -123.00]" }, + }; + size_t i, j; + struct lconv *lc; + char actual[100], buf[100]; + + if (setlocale(LC_MONETARY, "en_US.UTF-8") == NULL) + atf_tc_skip("unable to setlocale()"); + + lc = localeconv(); + lc->n_cs_precedes = 1; + + for (i = 0; i < nitems(tests); ++i) { + actual[0] = '\0'; + lc->n_sep_by_space = i; + + for (j = 0; j < 5; ++j) { + lc->n_sign_posn = j; + + strfmon(buf, sizeof(buf), "[%n] ", -123.0); + strlcat(actual, buf, sizeof(actual)); + } + + actual[strlen(actual) - 1] = '\0'; + ATF_CHECK_STREQ_MSG(tests[i].expected, actual, + "sep_by_space = %zu", i); + } +} + +ATF_TC_WITHOUT_HEAD(strfmon_international_currency_code); +ATF_TC_BODY(strfmon_international_currency_code, tc) +{ + const struct { + const char *locale; + const char *expected; + } tests[] = { + { "en_US.UTF-8", "[USD 123.45]" }, /* XXX */ + { "de_DE.UTF-8", "[123,45 EUR ]" }, /* XXX */ + { "C", "[123.45]" }, /* XXX OOB access */ + }; + size_t i; + char actual[100]; + + for (i = 0; i < nitems(tests); ++i) { + if (setlocale(LC_MONETARY, tests[i].locale) == NULL) + atf_tc_skip("unable to setlocale()"); + + strfmon(actual, sizeof(actual), "[%i]", 123.45); + ATF_CHECK_STREQ(tests[i].expected, actual); + } +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, strfmon_locale_thousands); + ATF_TP_ADD_TC(tp, strfmon_examples); + ATF_TP_ADD_TC(tp, strfmon_cs_precedes_0); + ATF_TP_ADD_TC(tp, strfmon_cs_precedes_1); + ATF_TP_ADD_TC(tp, strfmon_international_currency_code); return (atf_no_error()); }