convert: modernize tests

Use `test_config` to set the config, check that files are empty with
`test_must_be_empty`, compare files with `test_cmp`, and remove spaces
after ">" and "<".

Please note that the "rot13" filter configured in "setup" keeps using
`git config` instead of `test_config` because subsequent tests might
depend on it.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index e799e5954437e08df4a013f9796c5ec5a9bb077d..dc509381c9a590e6b92cac116567c0df7ca2dc4f 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -38,8 +38,8 @@ script='s/^\$Id: \([0-9a-f]*\) \$/\1/p'
 
 test_expect_success check '
 
-       cmp test.o test &&
-       cmp test.o test.t &&
+       test_cmp test.o test &&
+       test_cmp test.o test.t &&
 
        # ident should be stripped in the repository
        git diff --raw --exit-code :test :test.i &&
@@ -47,10 +47,10 @@ test_expect_success check '
        embedded=$(sed -ne "$script" test.i) &&
        test "z$id" = "z$embedded" &&
 
-       git cat-file blob :test.t > test.r &&
+       git cat-file blob :test.t >test.r &&
 
-       ./rot13.sh < test.o > test.t &&
-       cmp test.r test.t
+       ./rot13.sh <test.o >test.t &&
+       test_cmp test.r test.t
 '
 
 # If an expanded ident ever gets into the repository, we want to make sure that
@@ -130,7 +130,7 @@ test_expect_success 'filter shell-escaped filenames' '
 
        # delete the files and check them out again, using a smudge filter
        # that will count the args and echo the command-line back to us
-       git config filter.argc.smudge "sh ./argc.sh %f" &&
+       test_config filter.argc.smudge "sh ./argc.sh %f" &&
        rm "$normal" "$special" &&
        git checkout -- "$normal" "$special" &&
 
@@ -141,7 +141,7 @@ test_expect_success 'filter shell-escaped filenames' '
        test_cmp expect "$special" &&
 
        # do the same thing, but with more args in the filter expression
-       git config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
+       test_config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
        rm "$normal" "$special" &&
        git checkout -- "$normal" "$special" &&
 
@@ -154,9 +154,9 @@ test_expect_success 'filter shell-escaped filenames' '
 '
 
 test_expect_success 'required filter should filter data' '
-       git config filter.required.smudge ./rot13.sh &&
-       git config filter.required.clean ./rot13.sh &&
-       git config filter.required.required true &&
+       test_config filter.required.smudge ./rot13.sh &&
+       test_config filter.required.clean ./rot13.sh &&
+       test_config filter.required.required true &&
 
        echo "*.r filter=required" >.gitattributes &&
 
@@ -165,17 +165,17 @@ test_expect_success 'required filter should filter data' '
 
        rm -f test.r &&
        git checkout -- test.r &&
-       cmp test.o test.r &&
+       test_cmp test.o test.r &&
 
        ./rot13.sh <test.o >expected &&
        git cat-file blob :test.r >actual &&
-       cmp expected actual
+       test_cmp expected actual
 '
 
 test_expect_success 'required filter smudge failure' '
-       git config filter.failsmudge.smudge false &&
-       git config filter.failsmudge.clean cat &&
-       git config filter.failsmudge.required true &&
+       test_config filter.failsmudge.smudge false &&
+       test_config filter.failsmudge.clean cat &&
+       test_config filter.failsmudge.required true &&
 
        echo "*.fs filter=failsmudge" >.gitattributes &&
 
@@ -186,9 +186,9 @@ test_expect_success 'required filter smudge failure' '
 '
 
 test_expect_success 'required filter clean failure' '
-       git config filter.failclean.smudge cat &&
-       git config filter.failclean.clean false &&
-       git config filter.failclean.required true &&
+       test_config filter.failclean.smudge cat &&
+       test_config filter.failclean.clean false &&
+       test_config filter.failclean.required true &&
 
        echo "*.fc filter=failclean" >.gitattributes &&
 
@@ -197,8 +197,8 @@ test_expect_success 'required filter clean failure' '
 '
 
 test_expect_success 'filtering large input to small output should use little memory' '
-       git config filter.devnull.clean "cat >/dev/null" &&
-       git config filter.devnull.required true &&
+       test_config filter.devnull.clean "cat >/dev/null" &&
+       test_config filter.devnull.required true &&
        for i in $(test_seq 1 30); do printf "%1048576d" 1; done >30MB &&
        echo "30MB filter=devnull" >.gitattributes &&
        GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
@@ -207,7 +207,7 @@ test_expect_success 'filtering large input to small output should use little mem
 test_expect_success 'filter that does not read is fine' '
        test-genrandom foo $((128 * 1024 + 1)) >big &&
        echo "big filter=epipe" >.gitattributes &&
-       git config filter.epipe.clean "echo xyzzy" &&
+       test_config filter.epipe.clean "echo xyzzy" &&
        git add big &&
        git cat-file blob :big >actual &&
        echo xyzzy >expect &&
@@ -215,20 +215,20 @@ test_expect_success 'filter that does not read is fine' '
 '
 
 test_expect_success EXPENSIVE 'filter large file' '
-       git config filter.largefile.smudge cat &&
-       git config filter.largefile.clean cat &&
+       test_config filter.largefile.smudge cat &&
+       test_config filter.largefile.clean cat &&
        for i in $(test_seq 1 2048); do printf "%1048576d" 1; done >2GB &&
        echo "2GB filter=largefile" >.gitattributes &&
        git add 2GB 2>err &&
-       ! test -s err &&
+       test_must_be_empty err &&
        rm -f 2GB &&
        git checkout -- 2GB 2>err &&
-       ! test -s err
+       test_must_be_empty err
 '
 
 test_expect_success "filter: clean empty file" '
-       git config filter.in-repo-header.clean  "echo cleaned && cat" &&
-       git config filter.in-repo-header.smudge "sed 1d" &&
+       test_config filter.in-repo-header.clean  "echo cleaned && cat" &&
+       test_config filter.in-repo-header.smudge "sed 1d" &&
 
        echo "empty-in-worktree    filter=in-repo-header" >>.gitattributes &&
        >empty-in-worktree &&
@@ -240,8 +240,8 @@ test_expect_success "filter: clean empty file" '
 '
 
 test_expect_success "filter: smudge empty file" '
-       git config filter.empty-in-repo.clean "cat >/dev/null" &&
-       git config filter.empty-in-repo.smudge "echo smudged && cat" &&
+       test_config filter.empty-in-repo.clean "cat >/dev/null" &&
+       test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
 
        echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
        echo dead data walking >empty-in-repo &&