X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9383ac2311caa190a93fd6694c6c82390cabf044..4829d096feb337a55e2b866adb19acab9617b071:/test/format/test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index 19e28c33..bf27d475 100755
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -19,6 +19,17 @@ setup_test
 # Use proper program, likely not the first one on PATH.
 dp="${MH_LIBEXEC_DIR}/dp"
 
+check_exit '-eq 1' $dp -
+check_exit '-eq 1' $dp -format foo -form
+check_exit '-eq 1' $dp -form foo -format
+check_exit '-eq 1' $dp -width
+x=tendixzehn
+l=$x$x$x$x$x
+c=$l$l
+check_exit '-eq 1' $dp `echo $c | sed 's/./ &/g'` 101
+COLUMNS=1 check_exit '-eq 0' $dp foo
+check_exit '-eq 0' $dp -width 0 foo
+
 expected="$MH_TEST_DIR/$$.expected"
 expected_err="$MH_TEST_DIR/$$.expected_err"
 actual="$MH_TEST_DIR/$$.actual"
@@ -26,6 +37,7 @@ actual_err="$MH_TEST_DIR/$$.actual_err"
 
 
 # check -help
+start_test "-help"
 cat >"$expected" <<EOF
 Usage: dp [switches] dates ...
   switches are:
@@ -37,10 +49,11 @@ Usage: dp [switches] dates ...
 EOF
 
 #### Skip nmh intro text.
-run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$dp" -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `$dp -v` in
   dp\ --*) ;;
   *      ) printf '%s: dp -v generated unexpected output\n' "$0" >&2
@@ -48,12 +61,15 @@ case `$dp -v` in
 esac
 
 # check unknown switch
+start_test "unknown switch"
 run_test "$dp -nonexistent" 'dp: -nonexistent unknown'
 
 # check with no switches
+start_test "with no switches"
 run_test "$dp" 'dp: usage: dp [switches] dates ...'
 
 # check with one valid date
+start_test "with one valid date"
 cat >"$expected" <<EOF
 Sun, 01 Jul 2012 00:00:00
 EOF
@@ -62,6 +78,7 @@ run_prog $dp 'Sun Jul  1 2012' > "$actual" 2>&1
 check "$expected" "$actual"
 
 # check with two valid dates
+start_test "with two valid dates"
 cat >"$expected" <<EOF
 Sun, 01 Jul 2012 00:00:00
 Mon, 02 Jul 2012 00:00:00
@@ -71,6 +88,7 @@ run_prog $dp 'Sun Jul  1 2012' 'Mon Jul  2 2012' > "$actual" 2>&1
 check "$expected" "$actual"
 
 # check with invalid date
+start_test "with invalid date"
 cat >"$expected" <<EOF
 error: not a date
 EOF
@@ -83,6 +101,7 @@ check "$expected" "$actual"
 check "$expected_err" "$actual_err"
 
 # check -form
+start_test "-form"
 form="${MH_TEST_DIR}/Mail/dp-form"
 cat >"$form" <<'EOF'
 %(day{text})
@@ -97,6 +116,7 @@ check $expected $actual
 rm -f "$form"
 
 # check -format
+start_test "-format"
 cat >"$expected" <<EOF
 Sun
 EOF
@@ -105,6 +125,7 @@ run_prog $dp -format '%(day{text})' 'Jul 1 2012' >$actual 2>&1
 check $expected $actual
 
 # check -width
+start_test "-width"
 cat >"$expected" <<EOF
 Sun, 01 Jul 2012 
 EOF
@@ -113,4 +134,5 @@ run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1
 check "$expected" "$actual"
 
 
+finish_test
 exit ${failed:-0}