t2400: replace 'test -[efd]' with 'test_path_is_*'

'test_path_is_file', 'test_path_is_dir' and 'test_file_is_missing'
are test helpers used in Git's development, that emit useful
diagnostic information when they detect a failing condition, while
test -[efd] does not.

Replace the basic shell commands 'test -f', 'test -d' and 'test -e',
with these test helpers.

Co-authored-by: Isabella Caselli <icaselli@usp.br>
Signed-off-by: Isabella Caselli <icaselli@usp.br>
Signed-off-by: Rodrigo Michelassi <rodmichelassi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 90638fa886a22e00520e3648dc38567ed35ce46c..023e1301c8e68eebf67ac9185fcf01a80ab91d54 100755 (executable)
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -42,8 +42,8 @@ test_expect_success '"add" using - shorthand' '
 
 test_expect_success '"add" refuses to checkout locked branch' '
        test_must_fail git worktree add zere main &&
-       ! test -d zere &&
-       ! test -d .git/worktrees/zere
+       test_path_is_missing zere &&
+       test_path_is_missing .git/worktrees/zere
 '
 
 test_expect_success 'checking out paths not complaining about linked checkouts' '
@@ -70,14 +70,14 @@ test_expect_success '"add" worktree' '
 test_expect_success '"add" worktree with lock' '
        git worktree add --detach --lock here-with-lock main &&
        test_when_finished "git worktree unlock here-with-lock || :" &&
-       test -f .git/worktrees/here-with-lock/locked
+       test_path_is_file .git/worktrees/here-with-lock/locked
 '
 
 test_expect_success '"add" worktree with lock and reason' '
        lock_reason="why not" &&
        git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main &&
        test_when_finished "git worktree unlock here-with-lock-reason || :" &&
-       test -f .git/worktrees/here-with-lock-reason/locked &&
+       test_path_is_file .git/worktrees/here-with-lock-reason/locked &&
        echo "$lock_reason" >expect &&
        test_cmp expect .git/worktrees/here-with-lock-reason/locked
 '
@@ -412,14 +412,14 @@ test_expect_success '"add --orphan" with empty repository' '
 test_expect_success '"add" worktree with orphan branch and lock' '
        git worktree add --lock --orphan -b orphanbr orphan-with-lock &&
        test_when_finished "git worktree unlock orphan-with-lock || :" &&
-       test -f .git/worktrees/orphan-with-lock/locked
+       test_path_is_file .git/worktrees/orphan-with-lock/locked
 '
 
 test_expect_success '"add" worktree with orphan branch, lock, and reason' '
        lock_reason="why not" &&
        git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main &&
        test_when_finished "git worktree unlock orphan-with-lock-reason || :" &&
-       test -f .git/worktrees/orphan-with-lock-reason/locked &&
+       test_path_is_file .git/worktrees/orphan-with-lock-reason/locked &&
        echo "$lock_reason" >expect &&
        test_cmp expect .git/worktrees/orphan-with-lock-reason/locked
 '
@@ -474,7 +474,7 @@ test_expect_success 'local clone --shared from linked checkout' '
 
 test_expect_success '"add" worktree with --no-checkout' '
        git worktree add --no-checkout -b swamp swamp &&
-       ! test -e swamp/init.t &&
+       test_path_is_missing swamp/init.t &&
        git -C swamp reset --hard &&
        test_cmp init.t swamp/init.t
 '
@@ -497,7 +497,7 @@ test_expect_success 'put a worktree under rebase' '
 
 test_expect_success 'add a worktree, checking out a rebased branch' '
        test_must_fail git worktree add new-rebase under-rebase &&
-       ! test -d new-rebase
+       test_path_is_missing new-rebase
 '
 
 test_expect_success 'checking out a rebased branch from another worktree' '
@@ -535,7 +535,7 @@ test_expect_success 'checkout a branch under bisect' '
                git worktree list >actual &&
                grep "under-bisect.*detached HEAD" actual &&
                test_must_fail git worktree add new-bisect under-bisect &&
-               ! test -d new-bisect
+               test_path_is_missing new-bisect
        )
 '
 
@@ -1165,7 +1165,7 @@ test_expect_success '"add" not tripped up by magic worktree matching"' '
 
 test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
        git worktree add --detach ".  weird*..?.lock.lock" &&
-       test -d .git/worktrees/---weird-.-
+       test_path_is_dir .git/worktrees/---weird-.-
 '
 
 test_expect_success '"add" should not fail because of another bad worktree' '