u8-istream: Fix handling of partial reads.

[pspp] / tests / libpspp / u8-istream.at

diff --git a/tests/libpspp/u8-istream.at b/tests/libpspp/u8-istream.at
index 2d8baa4745448d76a906ef739acc5421193bcac9..5b5b4e006e64e81760680a39f868f854b1c8c480 100644 (file)
--- a/tests/libpspp/u8-istream.at
+++ b/tests/libpspp/u8-istream.at
@@ -2,7 +2,7 @@ AT_BANNER([u8_istream])
 
 AT_SETUP([read ASCII])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings ASCII])
+AT_CHECK([i18n-test supports_encodings ASCII])
 AT_CHECK([echo string | u8-istream-test read - ASCII], [0], [string
 ])
 AT_CLEANUP
@@ -18,7 +18,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf '\244\241 \244\242 \244\243 \244\244 \244\245 \244\246 \244\247 \244\250 \244\251 \244\252\n' | u8-istream-test read - EUC-JP],
   [0],
   [ぁ あ ぃ い ぅ う ぇ え ぉ お
@@ -58,7 +58,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across input buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 buffer_size=`u8-istream-test buffer-size`
 ($PERL -e "print 'x' x ($buffer_size - 16)"
  printf '\244\241 \244\242 \244\243 \244\244 \244\245 \244\246 \244\247 '
@@ -72,7 +72,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across output buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf '\244\241\244\242\244\243\244\244\244\245\244\246\244\247\244\250\244\251\244\252\n' | u8-istream-test read - EUC-JP 16],
   [0],
   [ぁあぃいぅうぇえぉお
@@ -81,7 +81,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across input and output buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 buffer_size=`u8-istream-test buffer-size`
 ($PERL -e "print 'x' x ($buffer_size - 16)"
  printf 'xyz\244\241\244\242\244\243\244\244\244\245\244\246\244\247\244\250'
@@ -109,15 +109,20 @@ Auto mode
 entrée
 UTF-8 mode
 ])
+AT_CHECK([printf '\357\273\277entr\303\251e\n' | u8-istream-test read - Auto], [0], [dnl
+UTF-8 mode
+entrée
+UTF-8 mode
+])
 AT_CLEANUP
 
 AT_SETUP([read ISO-8859-1 as Auto,ISO-8859-1])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 buffer_size=`u8-istream-test buffer-size`
-($PERL -e "print 'x' x int($buffer_size * 2.5)"; printf 'entr\351e\n') > input
+($PERL -e 'print "xyzzy\n" x int('$buffer_size' * 2.5 / 7)'; printf 'entr\351e\n') > input
 (echo "Auto mode"
- $PERL -e "print 'x' x int($buffer_size * 2.5)"
+ $PERL -e 'print "xyzzy\n" x int('$buffer_size' * 2.5 / 7)'
  printf 'entr\303\251e\n') > expout
 AT_CHECK([u8-istream-test read input Auto,ISO-8859-1], [0], [expout])
 AT_CLEANUP
@@ -125,16 +130,52 @@ AT_CLEANUP
 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([supports_encodings UTF-16BE])
+AT_CHECK([i18n-test supports_encodings UTF-16BE])
 AT_CHECK([printf '\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])
+AT_CHECK([i18n-test supports_encodings UTF-16 UTF-16BE UTF-16LE])
+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],
+  [0], [entrée
+])
+AT_CHECK([printf 'e\0n\0t\0r\0\351\0e\0\n\0' | u8-istream-test read - Auto],
+  [0], [entrée
+])
+AT_CHECK([printf '\376\377\0e\0n\0t\0r\0\351\0e\0\n' | u8-istream-test read - Auto],
+  [0], [entrée
+])
+AT_CHECK([printf '\377\376e\0n\0t\0r\0\351\0e\0\n\0' | u8-istream-test read - Auto],
+  [0], [entrée
+])
+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])
+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
+])
+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
+])
+AT_CHECK([printf '\377\376\0\0e\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
+])
+AT_CLEANUP
+
 AT_SETUP([read EUC-JP as Auto,EUC-JP])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf 'entr\217\253\261e\n' | u8-istream-test read - Auto,EUC-JP], 
   [0], [entrée
 ])