X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3af3288f3acdfe29d3c17aefd9e0453ac3204541..ca079bfa8e3812ebf21ffec1c27edeaa03cb9280:/test/scan/test-scan?ds=sidebyside

diff --git a/test/scan/test-scan b/test/scan/test-scan
index 7fd4b7bb..00e383cb 100755
--- a/test/scan/test-scan
+++ b/test/scan/test-scan
@@ -14,9 +14,14 @@ fi
 
 setup_test
 
+check_exit '-eq 1' scan -
+
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
+
+# check -width
+start_test '-width'
 cat >"$expected" <<EOF
    1  09/29 Test1              Testing message 1<<This is message number 1 >>
    2  09/29 Test2              Testing message 2<<This is message number 2 >>
@@ -30,10 +35,12 @@ cat >"$expected" <<EOF
   10  09/29 Test10             Testing message 10<<This is message number 10 >>
 EOF
 
-scan +inbox -width 80 >"$actual" || exit 1
+run_prog scan +inbox -width 80 >"$actual" || exit 1
 check "$expected" "$actual"
 
+
 # check highlighting
+start_test 'highlighting'
 cat >"$expected" <<EOF
    1  09/29 Test1              Testing message 1<<This is message number 1 >>
    2  09/29 Test2              Testing message 2<<This is message number 2 >>
@@ -50,27 +57,14 @@ EOF
 printf 'Unseen-Sequence: unseen\n' >> $MH
 mark -sequence cur 5
 mark -sequence unseen 10
-scan -form scan.highlighted -width 80 >"$actual" || exit 1
+run_prog scan -form scan.highlighted -width 80 >"$actual" || exit 1
 check "$expected" "$actual"
 
-# check decoding with an invalid multibyte sequence.
-cat >"$expected" <<EOF
-  11  12/31 Test11             2013 New Year?s Deals! Start the year right
-EOF
-
-cat >`mhpath new` <<EOF
-From: Test11 <test11@example.com>
-To: Some User <user@example.com>
-Date: Mon, 31 Dec 2012 00:00:00
-Message-Id: 11@test.nmh
-Subject: =?UTF-8?B?MjAxMyBOZXcgWWVhcuKAmXMgRGVhbHMhIFN0YXJ0IHRoZSB5ZWFy?=
-	=?UTF-8?B?IHJpZ2h0IHdpdGggYmlnIHNhdmluZ3M=?=
 
-This message has an encoded Subject with an invalid character for the
-ISO-8859-1 character set.
-EOF
-LC_CTYPE=ISO-8859-1 MM_CHARSET=ISO-8859-1 scan -width 75 last >"$actual"
-check "$expected" "$actual"
+# check null input
+start_test 'null input'
+run_test 'scan -format "" -file /dev/null' ''
 
 
+finish_test
 exit $failed