X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ec251f5102aca59d99e09d07d10906d99514f2b4..a341943063abbdbcacdfa6a932093e1b42f71bd6:/test/folder/test-sortm?ds=sidebyside diff --git a/test/folder/test-sortm b/test/folder/test-sortm index daee94b3..a136faaa 100755 --- a/test/folder/test-sortm +++ b/test/folder/test-sortm @@ -7,7 +7,7 @@ set -e -if test -z "${MH_OBJ_DIR}"; then +if test -z "$MH_OBJ_DIR"; then srcdir=`dirname $0`/../.. MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR fi @@ -16,13 +16,15 @@ fi setup_test +check_exit '-eq 1' sortm - + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual cd $MH_TEST_DIR # check -help -cat >$expected <"$expected" <$actual 2>&1 -check $expected $actual +#### Skip nmh intro text. +run_prog sortm -help | sed '/^$/,$d' >"$actual" 2>&1 +check "$expected" "$actual" # check -version case `sortm -version` in @@ -45,7 +50,7 @@ case `sortm -version` in failed=`expr ${failed:-0} + 1`;; esac -cat > $MH_TEST_DIR/Mail/inbox/11 <$MH_TEST_DIR/Mail/inbox/11 < To: Some User Date: Fri, 29 Sep 2006 00:00:01 @@ -55,7 +60,7 @@ Subject: Re: common subject This is message number 11 EOF -cat > $MH_TEST_DIR/Mail/inbox/12 <$MH_TEST_DIR/Mail/inbox/12 < To: Some User Date: Thu, 28 Sep 2006 23:59:59 @@ -66,7 +71,7 @@ This is message number 12 EOF # check with no options -cat >$expected <"$expected" <> 2 09/29 Test1 Testing message 1<> 3 09/29 Test2 Testing message 2<> @@ -81,12 +86,12 @@ cat >$expected <> EOF -sortm -scan > $actual -check $expected $actual +run_prog sortm +scan -width 80 >"$actual" +check "$expected" "$actual" # check +folder -cat >$expected <"$expected" <> 2+ 09/29 Test1 Testing message 1<> 3 09/29 Test2 Testing message 2<> @@ -101,14 +106,13 @@ cat >$expected <> EOF -refile first +inbox -folder -pack > /dev/null -sortm +inbox -scan > $actual -check $expected $actual +refile first +inbox; folder -pack >/dev/null +run_prog sortm +inbox +scan -width 80 >"$actual" +check "$expected" "$actual" # check -verbose -cat >$expected <"$expected" <> EOF -refile first +inbox -folder -pack > /dev/null -sortm -verbose >$actual -scan >> $actual -check $expected $actual +refile first +inbox; folder -pack >/dev/null +run_prog sortm -verbose >"$actual" +scan -width 80 >>"$actual" +check "$expected" "$actual" # check -noverbose -cat >$expected <"$expected" <> 2+ 09/29 Test1 Testing message 1<> 3 09/29 Test2 Testing message 2<> @@ -158,14 +161,13 @@ cat >$expected <> EOF -refile first +inbox -folder -pack > /dev/null -sortm -verbose -noverbose >$actual -scan >> $actual -check $expected $actual +refile first +inbox; folder -pack >/dev/null +run_prog sortm -verbose -noverbose >"$actual" +scan -width 80 >>"$actual" +check "$expected" "$actual" # check msgs -cat >$expected <"$expected" <> 2 09/29 Test2 Testing message 2<> 3 09/29 Test3 Testing message 3<> @@ -180,14 +182,13 @@ cat >$expected <> EOF -refile first +inbox -folder -pack > /dev/null -sortm first last -scan > $actual -check $expected $actual +refile first +inbox; folder -pack >/dev/null +run_prog sortm first last +scan -width 80 >"$actual" +check "$expected" "$actual" # check -datefield -cat >$expected <"$expected" <> 2 09/29 Test2 Testing message 2<> 3 09/29 Test3 Testing message 3<> @@ -202,12 +203,12 @@ cat >$expected <> EOF -sortm -datefield Alt-Date 1 11 -scan > $actual -check $expected $actual +run_prog sortm -datefield Alt-Date 1 11 +scan -width 80 >"$actual" +check "$expected" "$actual" # check -textfield subject (datefield major, subjects grouped) -cat >$expected <"$expected" <> 2 09/29 Test11 Re: common subject<> 3 09/29 Test2 Testing message 2<> @@ -222,12 +223,12 @@ cat >$expected <> EOF -sortm -textfield subject -scan > $actual -check $expected $actual +run_prog sortm -textfield subject +scan -width 80 >"$actual" +check "$expected" "$actual" # check -nolimit -cat >$expected <"$expected" <> 2 09/29 Test11 Re: common subject<> 3 09/29 Test2 Testing message 2<> @@ -242,12 +243,12 @@ cat >$expected <> EOF -sortm -textfield subject -limit 0 -nolimit -scan > $actual -check $expected $actual +run_prog sortm -textfield subject -limit 0 -nolimit +scan -width 80 >"$actual" +check "$expected" "$actual" # check -textfield subject -limit 0 (subject sort) -cat >$expected <"$expected" <> 2 09/28 Test12 common subject<> 3 09/29 Test1 Testing message 1<> @@ -262,13 +263,13 @@ cat >$expected <> EOF -refile 2-7 +inbox; refile 1 +inbox; folder -pa last >/dev/null -sortm -textfield subject -limit 0 -scan > $actual -check $expected $actual +refile 2-7 +inbox; refile 1 +inbox; folder -pack last >/dev/null +run_prog sortm -textfield subject -limit 0 +scan -width 80 >"$actual" +check "$expected" "$actual" # check -textfield -limit 0 (text sort) -cat >$expected <"$expected" <> 2 09/29 Test11 Re: common subject<> 3 09/28 Test12 common subject<> @@ -283,13 +284,13 @@ cat >$expected <> EOF -refile 2-7 +inbox; refile 1 +inbox; folder -pa last >/dev/null -sortm -textfield from -limit 0 -scan > $actual -check $expected $actual +refile 2-7 +inbox; refile 1 +inbox; folder -pack last >/dev/null +run_prog sortm -textfield from -limit 0 +scan -width 80 >"$actual" +check "$expected" "$actual" # check -textfield with finite -limit that doesn't cover message 13 -cat > $MH_TEST_DIR/Mail/inbox/13 <$MH_TEST_DIR/Mail/inbox/13 < To: Some User Date: Tue, 31 Oct 2006 23:59:59 @@ -298,7 +299,7 @@ Subject: Re: common subject This is message number 13 EOF -cat >$expected <"$expected" <> 2 09/29 Test11 Re: common subject<> 3 09/29 Test5 Testing message 5<> @@ -314,13 +315,13 @@ cat >$expected <> EOF -refile 2-7 +inbox; refile 1 +inbox; folder -pa last >/dev/null -sortm -textfield subject -limit 10 -scan > $actual -check $expected $actual +refile 2-7 +inbox; refile 1 +inbox; folder -pack last >/dev/null +run_prog sortm -textfield subject -limit 10 +scan -width 80 >"$actual" +check "$expected" "$actual" # check -textfield with finite -limit that does cover message 13 -cat >$expected <"$expected" <> 2 09/29 Test11 Re: common subject<> 3 10/31 Test13 Re: common subject<> @@ -336,13 +337,13 @@ cat >$expected <> EOF -refile 2-7 +inbox; refile 1 +inbox; folder -pa last >/dev/null -sortm -textfield subject -limit 60 -scan > $actual -check $expected $actual +refile 2-7 +inbox; refile 1 +inbox; folder -pack last >/dev/null +run_prog sortm -textfield subject -limit 60 +scan -width 80 >"$actual" +check "$expected" "$actual" # check -notextfield -cat >$expected <"$expected" <> 2 09/29 Test10 Testing message 10<> 3 09/29 Test5 Testing message 5<> @@ -358,9 +359,91 @@ cat >$expected <> EOF -refile 2-7 +inbox; refile 1 +inbox; folder -pa last >/dev/null -sortm -textfield subject -limit 60 -notextfield -scan > $actual -check $expected $actual +refile 2-7 +inbox; refile 1 +inbox; folder -pack last >/dev/null +run_prog sortm -textfield subject -limit 60 -notextfield +scan -width 80 >"$actual" +check "$expected" "$actual" + +# check -noall +run_test 'sortm -noall' 'sortm: must specify messages to sort with -noall' + +# check -all +cat >"$expected" <> + 2+ 09/29 Test10 Testing message 10<> + 3 09/29 Test5 Testing message 5<> + 4 09/29 Test6 Testing message 6<> + 5 09/29 Test7 Testing message 7<> + 6 09/29 Test8 Testing message 8<> + 7 09/29 Test9 Testing message 9<> + 8 09/29 Test1 Testing message 1<> + 9 09/29 Test2 Testing message 2<> + 10 09/29 Test3 Testing message 3<> + 11 09/29 Test4 Testing message 4<> + 12 09/29 Test11 Re: common subject<> + 13 10/31 Test13 Re: common subject<> +EOF + +refile first +inbox; folder -pack >/dev/null +run_prog sortm -noall -all +scan -width 80 >"$actual" +check "$expected" "$actual" + +# check -check +cat >"$expected" < $MH_TEST_DIR/Mail/inbox/14 +set +e +run_prog sortm -check >"$actual" 2>&1 +set -e +check "$expected" "$actual" + +cat >"$expected" <> + 2+ 09/29 Test10 Testing message 10<> + 3 09/29 Test5 Testing message 5<> + 4 09/29 Test6 Testing message 6<> + 5 09/29 Test7 Testing message 7<> + 6 09/29 Test8 Testing message 8<> + 7 09/29 Test9 Testing message 9<> + 8 09/29 Test1 Testing message 1<> + 9 09/29 Test2 Testing message 2<> + 10 09/29 Test3 Testing message 3<> + 11 09/29 Test4 Testing message 4<> + 12 09/29 Test11 Re: common subject<> + 13 10/31 Test13 Re: common subject<> + 14 01/00 Test9 Testing message 9<> +EOF +scan -width 80 >"$actual" +check "$expected" "$actual" + +# check -nocheck +cat >"$expected" <> + 2+ 09/29 Test10 Testing message 10<> + 3 09/29 Test5 Testing message 5<> + 4 09/29 Test6 Testing message 6<> + 5 09/29 Test7 Testing message 7<> + 6 09/29 Test8 Testing message 8<> + 7 09/29 Test9 Testing message 9<> + 8 09/29 Test1 Testing message 1<> + 9 09/29 Test2 Testing message 2<> + 10 09/29 Test3 Testing message 3<> + 11 09/29 Test4 Testing message 4<> + 12 09/29 Test11 Re: common subject<> + 13 10/31 Test13 Re: common subject<> + 14 01/00 Test9 Testing message 9<> +EOF + +sed -e 's/Sep//' $MH_TEST_DIR/Mail/inbox/7 > $MH_TEST_DIR/Mail/inbox/14 +run_test 'sortm -check -nocheck' \ + "sortm: can't parse date field in message 14, will use file \ +modification time" +scan -width 80 >"$actual" +check "$expected" "$actual" + -exit $failed +exit ${failed:-0}