pick matching rework

[mmh] / test / tests / pick / test-rfc2047

diff --git a/test/tests/pick/test-rfc2047 b/test/tests/pick/test-rfc2047
index b89a71a..3eab253 100644 (file)
--- a/test/tests/pick/test-rfc2047
+++ b/test/tests/pick/test-rfc2047
@@ -5,28 +5,39 @@
 #
 ######################################################
 
-set -e
-
-expected_err=$MH_TEST_DIR/$$.expected_err
-expected_out=$MH_TEST_DIR/$$.expected_out
-actual_err=$MH_TEST_DIR/$$.actual_err
-actual_out=$MH_TEST_DIR/$$.actual_out
+. "$MH_TEST_COMMON"
 
 # Test MIME-encoded header.
-cat >"$MH_TEST_DIR/Mail/inbox/13" <<EOF
+cat > $(mhpath b) <<!
 From: Test13 <test13@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
 Message-Id: 13@test.nmh
-Subject: =?us-ascii?q?=66=6f=6f?=
- =?utf-8?q?=62=61=72?=
+Subject: =?utf-8?q?=66=6f=6f=62=61=72?=
 
 This is message number 13, with MIME-encoded Subject "foobar".
-EOF
+!
+lm=$(pick l)
+
+runandcheck 'pick -subject foobar' <<!
+$lm
+!
+
+
+require_locale en_US.utf-8 en_US.utf8
+LC_ALL=en_US.UTF-8
+export LC_ALL
+
+cat > $(mhpath b) <<!
+From: Test13 <test13@example.com>
+To: Some User <user@example.com>
+Date: Fri, 29 Sep 2006 00:00:00
+Subject: =?utf-8?q?=C3=BCbung?=
 
-echo 13 >"$expected_out"
-cat /dev/null > $expected_err
+This is a message, with MIME-encoded subject.
+!
+lm=$(pick l)
 
-pick -subject foobar 13 > $actual_out 2> $actual_err
-diff -u $expected_err $actual_err
-diff -u $expected_out $actual_out
+runandcheck 'pick -subject übung' <<!
+$lm
+!