Don't need to `else' after done() at end of then-block.

[nmh] / test / scan / test-scan

diff --git a/test/scan/test-scan b/test/scan/test-scan
index 79ac85d5d81a6c93249c904aaade6dcb422c2a9d..00e383cb6c4073b25a45ed40b09942e99f96b10b 100755 (executable)
--- a/test/scan/test-scan
+++ b/test/scan/test-scan
@@ -14,10 +14,15 @@ fi
 
 setup_test
 
-expected=$MH_TEST_DIR/$$.expected
-actual=$MH_TEST_DIR/$$.actual
+check_exit '-eq 1' scan -
 
-cat > $expected <<EOF
+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 >>
    3  09/29 Test3              Testing message 3<<This is message number 3 >>
@@ -30,12 +35,13 @@ 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
-cat > $expected <<EOF
+start_test 'highlighting'
+cat >"$expected" <<EOF
    1  09/29 Test1              Testing message 1<<This is message number 1 >>\e[m
    2  09/29 Test2              Testing message 2<<This is message number 2 >>\e[m
    3  09/29 Test3              Testing message 3<<This is message number 3 >>\e[m
@@ -51,9 +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 null input
+start_test 'null input'
+run_test 'scan -format "" -file /dev/null' ''
+
+
+finish_test
 exit $failed