X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bcf252dfcdd7db22634ee483b457167eebf81951..54483f16238902dcd920de1f6056df6cb0a0d8cf:/test/mhshow/test-textcharset diff --git a/test/mhshow/test-textcharset b/test/mhshow/test-textcharset index 4768808a..9fad5d8d 100755 --- a/test/mhshow/test-textcharset +++ b/test/mhshow/test-textcharset @@ -27,7 +27,7 @@ actual="$MH_TEST_DIR"/$$.actual # check charset conversion msgfile=`mhpath new` -cat >"$msgfile" <"$msgfile" <<'EOF' From: foo@example.edu To: bar@example.edu Subject: test display with charset conversion @@ -39,7 +39,7 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100 4 =F7 2 =3D 2 EOF -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -51,16 +51,17 @@ part text/plain 10 4 ÷ 2 = 2 EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual" cat >>"$MH" <<'EOF' mhshow-show-text/plain: echo %{charset} EOF + # check expansion of %{charset} by itself msgfile=`mhpath new` -cat >"$msgfile" <"$msgfile" <<'EOF' From: foo@example.edu To: bar@example.edu Subject: test display with %{charset} expansion @@ -72,7 +73,7 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100 4 =F7 2 =3D 2 EOF -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -80,15 +81,16 @@ Subject: test display with %{charset} expansion MIME-Version: 1.0 -windows-1252 +UTF-8 EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual" + # check expansion of empty %{charset} by itself msgfile=`mhpath new` -cat >"$msgfile" <"$msgfile" <<'EOF' From: foo@example.edu To: bar@example.edu Subject: test display with empty %{charset} expansion @@ -100,7 +102,7 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100 4 =F7 2 =3D 2 EOF -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -111,17 +113,18 @@ MIME-Version: 1.0 EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual" + grep -v 'mhshow-show-text/plain:' "$MH" >"$MH.new" mv -f "$MH.new" "$MH" cat >>"$MH" <<'EOF' -mhshow-show-text/plain: echo `ap -format '%(void(lit %{charset}))%<(nonnull)-I %(putstr)%>' 0` +mhshow-show-text/plain: charset=%{charset}; echo ${charset:+-I $charset} EOF # check expansion of embedded %{charset} with no text following -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -129,14 +132,15 @@ Subject: test display with %{charset} expansion MIME-Version: 1.0 --I windows-1252 +-I UTF-8 EOF -run_prog mhshow -nopause prev >"$actual" 2>&1 +run_prog mhshow prev >"$actual" 2>&1 check "$expected" "$actual" + # check expansion of empty embedded %{charset} with no text following -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -147,14 +151,15 @@ MIME-Version: 1.0 EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual" + sed -e 's%\(mhshow-show-text/plain:.*\)%\1 file%' "$MH" >"$MH.new" mv -f "$MH.new" "$MH" # check expansion of embedded %{charset} with text following -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -162,14 +167,15 @@ Subject: test display with %{charset} expansion MIME-Version: 1.0 --I windows-1252 file +-I UTF-8 file EOF -run_prog mhshow -nopause prev >"$actual" 2>&1 +run_prog mhshow prev >"$actual" 2>&1 check "$expected" "$actual" + # check expansion of empty embedded %{charset} with text following -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -180,15 +186,48 @@ MIME-Version: 1.0 file EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 +check "$expected" "$actual" + + +sed -e 's/charset/method/g' "$MH" >"$MH.new" +mv -f "$MH.new" "$MH" + +# check parameter value quoting +msgfile=`mhpath new` +cat >"$msgfile" <<'EOF' +From: foo@example.edu +To: bar@example.edu +Subject: test C-T parameter expansion quoting +MIME-Version: 1.0 +Content-Type: text/plain; method=$QUOTEME' +Content-Transfer-Encoding: quoted-printable +Date: Sun, 18 Dec 2005 00:52:39 +0100 + +4 =F7 2 =3D 2 +EOF + +cat >"$expected" <<'EOF' +Date: Sun, 18 Dec 2005 00:52:39 +0100 +To: bar@example.edu +From: foo@example.edu +Subject: test C-T parameter expansion quoting + +MIME-Version: 1.0 + +-I $QUOTEME' file +EOF + +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual" -sed -e 's/%{charset}/%{unknown}/' "$MH" >"$MH.new" + +sed -e 's/method/unknown/g' "$MH" >"$MH.new" mv -f "$MH.new" "$MH" -# check expansion of unknown parameter +# check that unknown parameter is not expanded msgfile=`mhpath new` -cat >"$msgfile" <"$msgfile" <<'EOF' From: foo@example.edu To: bar@example.edu Subject: test display with unknown C-T parameter expansion @@ -200,7 +239,7 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100 4 =F7 2 =3D 2 EOF -cat >"$expected" <"$expected" <<'EOF' Date: Sun, 18 Dec 2005 00:52:39 +0100 To: bar@example.edu From: foo@example.edu @@ -208,10 +247,43 @@ Subject: test display with unknown C-T parameter expansion MIME-Version: 1.0 --I %{unknown} file +file +EOF + +run_prog mhshow last >"$actual" 2>&1 +check "$expected" "$actual" + + +grep -v '^mhshow-show-text/plain: ' "$MH" >>"$MH.new" +mv -f "$MH.new" "$MH" +cat >>"$MH" <"$msgfile" <<'EOF' +From: foo@example.edu +To: bar@example.edu +Subject: check parameter value quoting with text following +MIME-Version: 1.0 +Content-Type: text/plain +Date: Sun, 18 Dec 2005 00:52:39 +0100 + +This is a test. +EOF + +cat >"$expected" <<'EOF' +Date: Sun, 18 Dec 2005 00:52:39 +0100 +To: bar@example.edu +From: foo@example.edu +Subject: check parameter value quoting with text following + +MIME-Version: 1.0 + EOF -run_prog mhshow -nopause last >"$actual" 2>&1 +run_prog mhshow last >"$actual" 2>&1 check "$expected" "$actual"