X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1186f294d7e907788140fd71bbd4d375fa24c2e8..7540f02725475698a47046ebf4e55b3e8dea5ab6:/test/ali/test-ali

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 7af25cc8..982cff78 100755
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -19,6 +19,13 @@ fi
 
 setup_test
 
+check_exit '-eq 1' ali -
+check_exit '-eq 1' ali -noalias -alias
+check_exit '-eq 1' ali -user
+check_exit '-eq 1' ali -user ''
+check_exit '-eq 1' ali -user 'foo bar'
+check_exit '-eq 0' ali -user foo,bar
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -26,21 +33,24 @@ actual_err=$MH_TEST_DIR/$$.actual_err
 
 
 # check -help
+start_test "-help"
 cat >$expected <<EOF
 Usage: ali [switches] aliases ...
   switches are:
   -alias aliasfile
+  -noalias
   -[no]list
-  -[no]normalize
   -[no]user
   -version
   -help
 EOF
 
-ali -help >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+ali -help 2>&1 | sed '/^$/,$d' >"$actual"
+check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `ali -v` in
   ali\ --*) ;;
   *       ) echo "$0: ali -v generated unexpected output" 1>&2
@@ -48,53 +58,99 @@ case `ali -v` in
 esac
 
 # check unknown option
+start_test "unknown option"
 run_test 'ali -nonexistent' 'ali: -nonexistent unknown'
 
 # check with no arguments and no AliasFile profile component
+start_test "with no arguments and no AliasFile profile component"
 run_test 'ali' ''
 
 # check with nonexistent alias file
-run_test 'ali -alias aliases' \
-         "ali: aliasing error in aliases - unable to read 'aliases'"
+start_test "with nonexistent alias file"
+run_test 'ali -alias nonexistent' \
+         "ali: aliasing error in nonexistent - unable to read 'nonexistent'"
 
-cat >${MH_TEST_DIR}/Mail/aliases <<EOF
+cat >"${MH_TEST_DIR}/Mail/aliases" <<EOF
 me: me@example.com
-rush: geddy@example.com, alex@example.com, neil@example.com
+rush: geddy, alex, neil
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com
 EOF
 
 # check -alias
+start_test "-alias"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases" \
          'me: me@example.com
-rush: geddy@example.com, alex@example.com, neil@example.com'
+rush: geddy@example.com, alex@example.com, neil@example.com
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com'
 
 # check for a specific alias
+start_test "for a specific alias"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
          'geddy@example.com, alex@example.com, neil@example.com'
 
 # check for a specific alias that doesn't exist
+start_test "for a specific alias that doesn't exist"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases nonexistent" \
          'nonexistent'
 
 # check -list
+start_test "-list"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -list" \
          'me: me@example.com
 rush: geddy@example.com
       alex@example.com
-      neil@example.com'
+      neil@example.com
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com'
 
 # check -nolist, which is the default
+start_test "-nolist, which is the default"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -list -nolist" \
          'me: me@example.com
-rush: geddy@example.com, alex@example.com, neil@example.com'
+rush: geddy@example.com, alex@example.com, neil@example.com
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com'
 
 # check -user
+start_test "-user"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -user geddy@example.com" \
-         'rush'
+         'rush, geddy'
 
 # check -nouser
+start_test "-nouser"
 run_test \
   "ali -alias ${MH_TEST_DIR}/Mail/aliases -user -nouser geddy@example.com" \
   'geddy@example.com'
 
+# check expansion of first address of blind list [Bug #15604]
+start_test "expansion of first address of blind list [Bug #15604]"
+cat >"${MH_TEST_DIR}/Mail/aliases" <<EOF
+rush: Rush: geddy, alex, neil
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com
+EOF
+
+run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
+         'Rush: geddy@example.com, alex@example.com, neil@example.com'
+
+# check that aliases followed by ; are not expanded [Bug #15604]
+start_test "that aliases followed by ; are not expanded [Bug #15604]"
+cat >"${MH_TEST_DIR}/Mail/aliases" <<EOF
+rush: Rush: geddy, alex, neil;
+geddy: geddy@example.com
+alex: alex@example.com
+neil: neil@example.com
+EOF
+
+run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
+         'Rush: geddy@example.com, alex@example.com, neil;'
 
+finish_test
 exit $failed