undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0030: Remove repeated instructions and add missing &&

Browse Source 
Moved some tests to another test_expect_success block.

Many tests now reuse the same "expect" file. Also replacing
many printf "" >expect with one >expect instruction.

Added missing && which concatenated tests in some
test_expect_success blocks.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Carlos Rica 2007-07-10 23:53:45 +02:00 committed by Junio C Hamano
parent 36d56de649
commit defd53142e
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
t/t0030-stripspace.sh
View File

@ -85,39 +85,36 @@ test_expect_success \
' '
test_expect_success \ test_expect_success \
'consecutive blank lines at the beginning should be removed' ' 'only consecutive blank lines should be completely removed' '
printf "" > expect && > expect &&
printf "\n" | git stripspace >actual && printf "\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "\n\n\n" | git stripspace >actual && printf "\n\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "$sss\n$sss\n$sss\n" | git stripspace >actual && printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "$sss$sss\n$sss\n\n" | git stripspace >actual && printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "\n$sss\n$sss$sss\n" | git stripspace >actual && printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual && printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual && printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "" > expect &&
printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual && printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual
'
test_expect_success \
'consecutive blank lines at the beginning should be removed' '
printf "$ttt\n" > expect && printf "$ttt\n" > expect &&
printf "\n$ttt\n" | git stripspace >actual && printf "\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
@ -139,26 +136,22 @@ test_expect_success \
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect && printf "$ttt\n" > expect &&
printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual && printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual && printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual && printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual && printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual && printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual && printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual git diff expect actual
' '
@ -186,26 +179,22 @@ test_expect_success \
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect && printf "$ttt\n" > expect &&
printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual && printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual && printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual && printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual && printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual && printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
git diff expect actual && git diff expect actual &&
printf "$ttt\n" > expect &&
printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual && printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
git diff expect actual git diff expect actual
' '
@ -224,7 +213,7 @@ test_expect_success \
'text plus spaces without newline at end should end with newline' ' 'text plus spaces without newline at end should end with newline' '
test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 && test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 && test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 && test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 && test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0 test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0
@ -340,13 +329,13 @@ test_expect_success \
printf "" >expect && printf "" >expect &&
printf "" | git stripspace >actual && printf "" | git stripspace >actual &&
git diff expect actual git diff expect actual &&
printf "$sss$sss" | git stripspace >actual && printf "$sss$sss" | git stripspace >actual &&
git diff expect actual git diff expect actual &&
printf "$sss$sss$sss" | git stripspace >actual && printf "$sss$sss$sss" | git stripspace >actual &&
git diff expect actual git diff expect actual &&
printf "$sss$sss$sss$sss" | git stripspace >actual && printf "$sss$sss$sss$sss" | git stripspace >actual &&
git diff expect actual git diff expect actual