sortm.c: Flip get_fields()'s logic to simplify.

[nmh] / test / scan / test-scan

diff --git a/test/scan/test-scan b/test/scan/test-scan
index 1c6d949bf05d9f1809dcf302267d9d1e33732162..dc0e2250283edeee0bbc3982b16a4a8ee609649e 100755 (executable)
--- a/test/scan/test-scan
+++ b/test/scan/test-scan
@@ -14,10 +14,12 @@ 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"
+
+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,8 +32,28 @@ cat > $expected <<EOF
   10  09/29 Test10             Testing message 10<<This is message number 10 >>
 EOF
 
-scan -width 80 +inbox > $actual || exit 1
+run_prog scan +inbox -width 80 >"$actual" || exit 1
+check "$expected" "$actual"
 
+# check 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
+   4  09/29 Test4              Testing message 4<<This is message number 4 >>\e[m
+\e[33;40m   5+ 09/29 Test5              Testing message 5<<This is message number 5 >>\e[m
+   6  09/29 Test6              Testing message 6<<This is message number 6 >>\e[m
+   7  09/29 Test7              Testing message 7<<This is message number 7 >>\e[m
+   8  09/29 Test8              Testing message 8<<This is message number 8 >>\e[m
+   9  09/29 Test9              Testing message 9<<This is message number 9 >>\e[m
+\e[36;40m  10  09/29 Test10             Testing message 10<<This is message number 10 >>\e[m
+EOF
+
+printf 'Unseen-Sequence: unseen\n' >> $MH
+mark -sequence cur 5
+mark -sequence unseen 10
+run_prog scan -form scan.highlighted -width 80 >"$actual" || exit 1
 check "$expected" "$actual"
 
+
 exit $failed