[PATCH] libstdc++: testsuite: Enhance codecvt_unicode with tests for length()

public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed

From: Dimitrij Mijoski <dmjpp@hotmail.com>
To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org
Subject: [PATCH] libstdc++: testsuite: Enhance codecvt_unicode with tests for length()
Date: Wed, 18 Oct 2023 00:50:40 +0200	[thread overview]
Message-ID: <AS1P192MB1620B67E5DAFB16E5BE35BF4ACD6A@AS1P192MB1620.EURP192.PROD.OUTLOOK.COM> (raw)

We can test codecvt::length() with the same data that we test
codecvt::in(). For each call of in() we add another call to length().
Some additional small cosmentic changes are applied.

libstdc++-v3/ChangeLog:

	* testsuite/22_locale/codecvt/codecvt_unicode.h: Test length()
---
 .../22_locale/codecvt/codecvt_unicode.h       | 103 +++++++++++++++---
 1 file changed, 90 insertions(+), 13 deletions(-)

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h
index d3ae42fac..b3c257ec2 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h
@@ -17,7 +17,6 @@
 
 #include <algorithm>
 #include <locale>
-#include <string>
 #include <testsuite_hooks.h>
 
 struct test_offsets_ok
@@ -79,6 +78,10 @@ utf8_to_utf32_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.in_size);
     }
 
   for (auto t : offsets)
@@ -99,6 +102,10 @@ utf8_to_utf32_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, array_size (out));
+      VERIFY (len == t.in_size);
     }
 }
 
@@ -163,6 +170,10 @@ utf8_to_utf32_in_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
 	      == 0);
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
     }
 }
 
@@ -303,6 +314,10 @@ utf8_to_utf32_in_error (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
 
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
+
       in[t.replace_pos] = old_char;
     }
 }
@@ -334,7 +349,7 @@ utf32_to_utf8_out_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 4);
   VERIFY (char_traits<ExternT>::length (exp) == 10);
 
-  const test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}, {4, 10}};
+  test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}, {4, 10}};
   for (auto t : offsets)
     {
       ExternT out[array_size (exp) - 1] = {};
@@ -374,7 +389,7 @@ utf32_to_utf8_out_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 4);
   VERIFY (char_traits<ExternT>::length (exp) == 10);
 
-  const test_offsets_partial offsets[] = {
+  test_offsets_partial offsets[] = {
     {1, 0, 0, 0}, // no space for first CP
 
     {2, 1, 1, 1}, // no space for second CP
@@ -528,6 +543,10 @@ utf8_to_utf16_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.in_size);
     }
 
   for (auto t : offsets)
@@ -548,6 +567,10 @@ utf8_to_utf16_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, array_size (out));
+      VERIFY (len == t.in_size);
     }
 }
 
@@ -617,6 +640,10 @@ utf8_to_utf16_in_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
 	      == 0);
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
     }
 }
 
@@ -757,6 +784,10 @@ utf8_to_utf16_in_error (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
 
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
+
       in[t.replace_pos] = old_char;
     }
 }
@@ -788,7 +819,7 @@ utf16_to_utf8_out_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 5);
   VERIFY (char_traits<ExternT>::length (exp) == 10);
 
-  const test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}, {5, 10}};
+  test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}, {5, 10}};
   for (auto t : offsets)
     {
       ExternT out[array_size (exp) - 1] = {};
@@ -828,7 +859,7 @@ utf16_to_utf8_out_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 5);
   VERIFY (char_traits<ExternT>::length (exp) == 10);
 
-  const test_offsets_partial offsets[] = {
+  test_offsets_partial offsets[] = {
     {1, 0, 0, 0}, // no space for first CP
 
     {2, 1, 1, 1}, // no space for second CP
@@ -1005,6 +1036,10 @@ utf8_to_ucs2_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.in_size);
     }
 
   for (auto t : offsets)
@@ -1025,6 +1060,10 @@ utf8_to_ucs2_in_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, array_size (out));
+      VERIFY (len == t.in_size);
     }
 }
 
@@ -1081,6 +1120,10 @@ utf8_to_ucs2_in_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
 	      == 0);
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
     }
 }
 
@@ -1231,6 +1274,10 @@ utf8_to_ucs2_in_error (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
 
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
+
       in[t.replace_pos] = old_char;
     }
 }
@@ -1262,7 +1309,7 @@ ucs2_to_utf8_out_ok (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 3);
   VERIFY (char_traits<ExternT>::length (exp) == 6);
 
-  const test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}};
+  test_offsets_ok offsets[] = {{0, 0}, {1, 1}, {2, 3}, {3, 6}};
   for (auto t : offsets)
     {
       ExternT out[array_size (exp) - 1] = {};
@@ -1302,7 +1349,7 @@ ucs2_to_utf8_out_partial (const std::codecvt<InternT, ExternT, mbstate_t> &cvt)
   VERIFY (char_traits<InternT>::length (in) == 3);
   VERIFY (char_traits<ExternT>::length (exp) == 6);
 
-  const test_offsets_partial offsets[] = {
+  test_offsets_partial offsets[] = {
     {1, 0, 0, 0}, // no space for first CP
 
     {2, 1, 1, 1}, // no space for second CP
@@ -1499,6 +1546,10 @@ utf16_to_utf32_in_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.in_size);
     }
 
   for (auto t : offsets)
@@ -1519,6 +1570,10 @@ utf16_to_utf32_in_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, array_size (out));
+      VERIFY (len == t.in_size);
     }
 }
 
@@ -1535,7 +1590,6 @@ utf16_to_utf32_in_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
 
   char in[array_size (input) * 2];
   InternT exp[array_size (expected)];
-  auto in_iter = begin (in);
   utf16_to_bytes (begin (input), end (input), begin (in), endianess);
   copy (begin (expected), end (expected), begin (exp));
 
@@ -1582,6 +1636,10 @@ utf16_to_utf32_in_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
 	      == 0);
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
     }
 }
 
@@ -1656,6 +1714,10 @@ utf16_to_utf32_in_error (const std::codecvt<InternT, char, mbstate_t> &cvt,
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
 
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
+
       input[t.replace_pos] = old_char;
     }
 }
@@ -1676,7 +1738,7 @@ utf32_to_utf16_out_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
   copy (begin (input), end (input), begin (in));
   utf16_to_bytes (begin (expected), end (expected), begin (exp), endianess);
 
-  const test_offsets_ok offsets[] = {{0, 0}, {1, 2}, {2, 4}, {3, 6}, {4, 10}};
+  test_offsets_ok offsets[] = {{0, 0}, {1, 2}, {2, 4}, {3, 6}, {4, 10}};
   for (auto t : offsets)
     {
       char out[array_size (exp) - 2] = {};
@@ -1714,7 +1776,7 @@ utf32_to_utf16_out_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
   copy (begin (input), end (input), begin (in));
   utf16_to_bytes (begin (expected), end (expected), begin (exp), endianess);
 
-  const test_offsets_partial offsets[] = {
+  test_offsets_partial offsets[] = {
     {1, 0, 0, 0}, // no space for first CP
     {1, 1, 0, 0}, // no space for first CP
 
@@ -1858,6 +1920,10 @@ utf16_to_ucs2_in_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.in_size);
     }
 
   for (auto t : offsets)
@@ -1878,6 +1944,10 @@ utf16_to_ucs2_in_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
       VERIFY (char_traits<InternT>::compare (out, exp, t.out_size) == 0);
       if (t.out_size < array_size (out))
 	VERIFY (out[t.out_size] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, array_size (out));
+      VERIFY (len == t.in_size);
     }
 }
 
@@ -1894,7 +1964,6 @@ utf16_to_ucs2_in_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
 
   char in[array_size (input) * 2];
   InternT exp[array_size (expected)];
-  auto in_iter = begin (in);
   utf16_to_bytes (begin (input), end (input), begin (in), endianess);
   copy (begin (expected), end (expected), begin (exp));
 
@@ -1933,6 +2002,10 @@ utf16_to_ucs2_in_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
 	      == 0);
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
+
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
     }
 }
 
@@ -2018,6 +2091,10 @@ utf16_to_ucs2_in_error (const std::codecvt<InternT, char, mbstate_t> &cvt,
       if (t.expected_out_next < array_size (out))
 	VERIFY (out[t.expected_out_next] == 0);
 
+      state = {};
+      auto len = cvt.length (state, in, in + t.in_size, t.out_size);
+      VERIFY (len == t.expected_in_next);
+
       input[t.replace_pos] = old_char;
     }
 }
@@ -2038,7 +2115,7 @@ ucs2_to_utf16_out_ok (const std::codecvt<InternT, char, mbstate_t> &cvt,
   copy (begin (input), end (input), begin (in));
   utf16_to_bytes (begin (expected), end (expected), begin (exp), endianess);
 
-  const test_offsets_ok offsets[] = {{0, 0}, {1, 2}, {2, 4}, {3, 6}};
+  test_offsets_ok offsets[] = {{0, 0}, {1, 2}, {2, 4}, {3, 6}};
   for (auto t : offsets)
     {
       char out[array_size (exp) - 2] = {};
@@ -2076,7 +2153,7 @@ ucs2_to_utf16_out_partial (const std::codecvt<InternT, char, mbstate_t> &cvt,
   copy (begin (input), end (input), begin (in));
   utf16_to_bytes (begin (expected), end (expected), begin (exp), endianess);
 
-  const test_offsets_partial offsets[] = {
+  test_offsets_partial offsets[] = {
     {1, 0, 0, 0}, // no space for first CP
     {1, 1, 0, 0}, // no space for first CP
 
-- 
2.34.1

next             reply	other threads:[~2023-10-17 22:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-17 22:50 Dimitrij Mijoski [this message]
2023-10-18  9:52 ` Jonathan Wakely
2023-10-18 10:35   ` Dimitrij Mijoski
2023-10-18 10:52 ` [PATCH v2] " Dimitrij Mijoski
2023-10-21 11:14   ` Jonathan Wakely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AS1P192MB1620B67E5DAFB16E5BE35BF4ACD6A@AS1P192MB1620.EURP192.PROD.OUTLOOK.COM \
    --to=dmjpp@hotmail.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).