unistr/u*-chr: test multibyte sequences more

* tests/unistr/test-chr.h: Do complete testing of the characters in the
test vector.
* tests/unistr/test-u8-chr.c, tests/unistr/test-u32-chr.c,
tests/unistr/test-u16-chr.c (U_UCTOMB): Define.

diff --git a/tests/unistr/test-chr.h b/tests/unistr/test-chr.h
index 266cda017cde3fd982bafa645d92e066632cc1be..4a3f5bcee1e66d2cca2567cc52b15474780d7ed7 100644 (file)
--- a/tests/unistr/test-chr.h
+++ b/tests/unistr/test-chr.h
@@ -19,29 +19,29 @@
 int
 main (void)
 {
-  size_t n = 0x100000;
+  size_t size = 0x100000;
   size_t i;
   size_t length;
   UNIT *input;
-  uint32_t *input32 = (uint32_t *) malloc (n * sizeof (uint32_t));
+  uint32_t *input32 = (uint32_t *) malloc (size * sizeof (uint32_t));
   ASSERT (input32);
 
   input32[0] = 'a';
   input32[1] = 'b';
   u32_set (input32 + 2, 'c', 1024);
-  for (i = 1026; i < n - 2; i += 63)
+  for (i = 1026; i < size - 2; i += 63)
     {
-      size_t last = i + 63 < n - 2 ? i + 63 : n - 2;
+      size_t last = i + 63 < size - 2 ? i + 63 : size - 2;
       ucs4_t uc = 'd' | (i - 1026);
       if (uc >= 0xd800 && uc <= 0xdfff)
         uc |= 0x100000;
       u32_set (input32 + i, uc, last - i);
     }
 
-  input32[n - 2] = 'e';
-  input32[n - 1] = 'a';
+  input32[size - 2] = 'e';
+  input32[size - 1] = 'a';
 
-  input = U32_TO_U (input32, n, NULL, &length);
+  input = U32_TO_U (input32, size, NULL, &length);
   ASSERT (input);
 
   /* Basic behavior tests.  */
@@ -54,6 +54,25 @@ main (void)
   ASSERT (U_CHR (input, length, 'c') == input + 2);
   ASSERT (U_CHR (input, length, 'd') == input + 1026);
 
+  {
+    UNIT *exp = input + 1026;
+    UNIT *prev = input + 1;
+    for (i = 1026; i < size - 2; i += 63)
+      {
+        UNIT c[6];
+        size_t n;
+        ucs4_t uc = 'd' | (i - 1026);
+        if (uc >= 0xd800 && uc <= 0xdfff)
+          uc |= 0x100000;
+        n = U_UCTOMB (c, uc, 6);
+        ASSERT (exp < input + length - 1);
+        ASSERT (U_CHR (prev, (length - 1) - (prev - input), uc) == exp);
+        ASSERT (memcmp (exp, c, n * sizeof (UNIT)) == 0);
+        prev = exp;
+        exp += n * 63;
+      }
+  }
+
   ASSERT (U_CHR (input + 1, length - 1, 'a') == input + length - 1);
   ASSERT (U_CHR (input + 1, length - 1, 'e') == input + length - 2);
 
@@ -88,6 +107,7 @@ main (void)
      byte being searched.  */
   {
     char *page_boundary = (char *) zerosize_ptr ();
+    size_t n;
 
     if (page_boundary != NULL)
       {

diff --git a/tests/unistr/test-u16-chr.c b/tests/unistr/test-u16-chr.c
index b9792dff6aad7a3a089e29941805100c41f81dd2..10a0ccb03076c82dd862a730f13b4557e3ccfb9f 100644 (file)
--- a/tests/unistr/test-u16-chr.c
+++ b/tests/unistr/test-u16-chr.c
@@ -26,6 +26,7 @@
 #include "macros.h"
 
 #define UNIT uint16_t
+#define U_UCTOMB u16_uctomb
 #define U32_TO_U u32_to_u16
 #define U_CHR u16_chr
 #define U_SET u16_set

diff --git a/tests/unistr/test-u32-chr.c b/tests/unistr/test-u32-chr.c
index 5b74bafc6947cbef460bf5705d4bc39a560a3f86..da58e95945fbf921ebcf25481d963cfafb051d48 100644 (file)
--- a/tests/unistr/test-u32-chr.c
+++ b/tests/unistr/test-u32-chr.c
@@ -26,6 +26,7 @@
 #include "macros.h"
 
 #define UNIT uint32_t
+#define U_UCTOMB(s, uc, n) (*(s) = (uc), 1)
 #define U32_TO_U(s, n, result, length) (*(length) = (n), (s))
 #define U_CHR u32_chr
 #define U_SET u32_set

diff --git a/tests/unistr/test-u8-chr.c b/tests/unistr/test-u8-chr.c
index aefc6ba497ce601a047611d2d47a46fc30dcc9b3..6162c9063815c4b9d9f6ed88cfc86eaeda5abe77 100644 (file)
--- a/tests/unistr/test-u8-chr.c
+++ b/tests/unistr/test-u8-chr.c
@@ -26,6 +26,7 @@
 #include "macros.h"
 
 #define UNIT uint8_t
+#define U_UCTOMB u8_uctomb
 #define U32_TO_U u32_to_u8
 #define U_CHR u8_chr
 #define U_SET u8_set