u8-istream: Add some more tests for byte-order marks.

diff --git a/tests/libpspp/u8-istream.at b/tests/libpspp/u8-istream.at
index 487de068c0b0bb30d5214a0b3cb6a7a343f87745..84ee4514a075d99304b7c5f47d8ceebc79bf7641 100644 (file)
--- a/tests/libpspp/u8-istream.at
+++ b/tests/libpspp/u8-istream.at
@@ -25,11 +25,18 @@ AT_CLEANUP
 
 AT_SETUP([read UTF-8])
 AT_KEYWORDS([u8_istream])
+# Without byte-order-mark.
 AT_CHECK([printf '\346\227\245\346\234\254\350\252\236\n' | u8-istream-test read - UTF-8], [0], [dnl
 UTF-8 mode
 日本語
 UTF-8 mode
 ])
+# With byte-order-mark.
+AT_CHECK([printf '\357\273\277\346\227\245\346\234\254\350\252\236\n' | u8-istream-test read - UTF-8], [0], [dnl
+UTF-8 mode
+日本語
+UTF-8 mode
+])
 AT_CLEANUP
 
 AT_SETUP([read EUC-JP])
@@ -120,11 +127,13 @@ AT_CLEANUP
 
 AT_SETUP([read UTF-8 as Auto])
 AT_KEYWORDS([u8_istream])
+# Without byte-order mark.
 AT_CHECK([printf 'entr\303\251e\n' | u8-istream-test read - Auto], [0], [dnl
 Auto mode
 entrée
 UTF-8 mode
 ])
+# With byte-order mark.
 AT_CHECK([printf '\357\273\277entr\303\251e\n' | u8-istream-test read - Auto], [0], [dnl
 UTF-8 mode
 entrée
@@ -147,15 +156,22 @@ dnl UTF-16BE is not ASCII compatible so this doesn't start out in Auto mode.
 AT_SETUP([read UTF-16BE as Auto,UTF-16BE])
 AT_KEYWORDS([u8_istream])
 AT_CHECK([i18n-test supports_encodings UTF-16BE])
+# Without byte-order mark.
 AT_CHECK([printf '\0e\0n\0t\0r\0\351\0e\0\n' | u8-istream-test read - Auto,UTF-16BE],
   [0], [dnl
 entrée
 ])
+# With byte-order mark.
+AT_CHECK([printf '\376\377\0e\0n\0t\0r\0\351\0e\0\n' | u8-istream-test read - Auto,UTF-16BE],
+  [0], [dnl
+entrée
+])
 AT_CLEANUP
 
 AT_SETUP([read UTF-16 as Auto])
 AT_KEYWORDS([u8_istream slow])
 AT_CHECK([i18n-test supports_encodings UTF-16 UTF-16BE UTF-16LE])
+# Without byte-order mark.
 dnl The "sleep 1" checks for a bug in which u8-istream did not properly
 dnl handle receiving data in multiple chunks.
 AT_CHECK([{ printf '\0e\0n\0t\0'; sleep 1; printf 'r\0\351\0e\0\n'; } | u8-istream-test read - Auto],
@@ -164,6 +180,7 @@ AT_CHECK([{ printf '\0e\0n\0t\0'; sleep 1; printf 'r\0\351\0e\0\n'; } | u8-istre
 AT_CHECK([printf 'e\0n\0t\0r\0\351\0e\0\n\0' | u8-istream-test read - Auto],
   [0], [entrée
 ])
+# With byte-order mark.
 AT_CHECK([printf '\376\377\0e\0n\0t\0r\0\351\0e\0\n' | u8-istream-test read - Auto],
   [0], [entrée
 ])
@@ -175,12 +192,14 @@ AT_CLEANUP
 AT_SETUP([read UTF-32 as Auto])
 AT_KEYWORDS([u8_istream])
 AT_CHECK([i18n-test supports_encodings UTF-16 UTF-16BE UTF-16LE])
+# Without byte-order mark.
 AT_CHECK([printf '\0\0\0e\0\0\0n\0\0\0t\0\0\0r\0\0\0\351\0\0\0e\0\0\0\n' | u8-istream-test read - Auto],
   [0], [entrée
 ])
 AT_CHECK([printf 'e\0\0\0n\0\0\0t\0\0\0r\0\0\0\351\0\0\0e\0\0\0\n\0\0\0' | u8-istream-test read - Auto],
   [0], [entrée
 ])
+# With byte-order mark.
 AT_CHECK([printf '\0\0\376\377\0\0\0e\0\0\0n\0\0\0t\0\0\0r\0\0\0\351\0\0\0e\0\0\0\n' | u8-istream-test read - Auto],
   [0], [entrée
 ])