[PATCH] t7610: use test_path_is_* helpers

@@ -382,15 +382,15 @@ test_expect_success 'mergetool delete/delete conflict' '
 	git checkout -b test$test_count move-to-c &&
 	test_must_fail git merge move-to-b &&
 	echo d | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt &&
+	! test_path_is_file a/a/file.txt &&
 	git reset --hard &&
 	test_must_fail git merge move-to-b &&
 	echo m | git mergetool a/a/file.txt &&
-	test -f b/b/file.txt &&
+	test_path_is_file b/b/file.txt &&
 	git reset --hard &&
 	test_must_fail git merge move-to-b &&
 	! echo a | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt
+	! test_path_is_file a/a/file.txt
 '
 
 test_expect_success 'mergetool produces no errors when keepBackup is used' '

@@ -400,7 +400,7 @@ test_expect_success 'mergetool produces no errors when keepBackup is used' '
 	test_must_fail git merge move-to-b &&
 	echo d | git mergetool a/a/file.txt 2>actual &&
 	test_must_be_empty actual &&
-	! test -d a
+	! test_path_is_dir a
 '
 
 test_expect_success 'mergetool honors tempfile config for deleted files' '

@@ -409,7 +409,7 @@ test_expect_success 'mergetool honors tempfile config for deleted files' '
 	test_config mergetool.keepTemporaries false &&
 	test_must_fail git merge move-to-b &&
 	echo d | git mergetool a/a/file.txt &&
-	! test -d a
+	! test_path_is_dir a
 '
 
 test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' '

@@ -419,7 +419,7 @@ test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' '
 	test_config mergetool.keepTemporaries true &&
 	test_must_fail git merge move-to-b &&
 	! test_write_lines a n | git mergetool a/a/file.txt &&
-	test -d a/a &&
+	test_path_is_dir a/a &&
 	cat >expect <<-\EOF &&
 	file_BASE_.txt
 	file_LOCAL_.txt

@@ -462,7 +462,7 @@ test_expect_success 'deleted vs modified submodule' '
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
 	yes "l" | git mergetool submod &&
-	test ! -e submod &&
+	test_path_is_missing submod &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&
 	git commit -m "Merge resolved by deleting module" &&

@@ -476,8 +476,8 @@ test_expect_success 'deleted vs modified submodule' '
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
 	yes "r" | git mergetool submod &&
-	test ! -e submod &&
-	test -d submod.orig &&
+	test_path_is_missing submod &&
+	test_path_is_dir submod.orig &&
 	git submodule update -N &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&

@@ -547,7 +547,7 @@ test_expect_success 'file vs modified submodule' '
 
 	git checkout -b test$test_count.c main &&
 	rmdir submod && mv submod-movedaside submod &&
-	test ! -e submod.orig &&
+	test_path_is_missing submod.orig &&
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
 	test -n "$(git ls-files -u)" &&

@@ -558,7 +558,7 @@ test_expect_success 'file vs modified submodule' '
 	git rm --cached submod &&
 	yes "c" | git mergetool submod~test19 &&
 	git mv submod~test19 submod &&
-	test -d submod.orig &&
+	test_path_is_dir submod.orig &&
 	git submodule update -N &&
 	echo "not a submodule" >expect &&
 	test_cmp expect submod &&

@@ -672,11 +672,11 @@ test_expect_success 'directory vs modified submodule' '
 	git reset --hard &&
 	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
+	test_path_is_missing submod.orig &&
 	yes "r" | git mergetool submod~main &&
 	git mv submod submod.orig &&
 	git mv submod~main submod &&
-	test -d submod.orig &&
+	test_path_is_dir submod.orig &&
 	echo "not a submodule" >expect &&
 	test_cmp expect submod.orig/file16 &&
 	rm -r submod.orig &&

@@ -701,7 +701,7 @@ test_expect_success 'directory vs modified submodule' '
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
 	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
+	test_path_is_missing submod.orig &&
 	yes "r" | git mergetool submod &&
 	echo "not a submodule" >expect &&
 	test_cmp expect submod/file16 &&

@@ -743,7 +743,7 @@ test_expect_success 'filenames seen by tools start with ./' '
 
 test_lazy_prereq MKTEMP '
 	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir" &&
+	test_path_is_dir "$tempdir" &&
 	rmdir "$tempdir"
 '