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

t4015: split out the "setup" part of ws-error-highlight test

Browse Source 
We'd want to run this same set of test twice, once with the option
and another time with an equivalent configuration setting.  Split
out the step that prepares the test data and expected output and
move the test for the command line option into a separate test.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2016-10-04 15:21:38 -07:00
parent e46579643d
commit f3f5c7f520
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
t/t4015-diff-whitespace.sh
View File

@ -869,7 +869,8 @@ test_expect_success 'diff that introduces and removes ws breakages' '
test_cmp expected current test_cmp expected current
' '
test_expect_success 'the same with --ws-error-highlight' ' test_expect_success 'ws-error-highlight test setup' '
git reset --hard && git reset --hard &&
{ {
echo "0. blank-at-eol " && echo "0. blank-at-eol " &&
@ -882,10 +883,7 @@ test_expect_success 'the same with --ws-error-highlight' '
echo "2. and a new line " echo "2. and a new line "
} >x && } >x &&
git -c color.diff=always diff --ws-error-highlight=default,old | cat >expect.default-old <<-\EOF &&
test_decode_color >current &&
cat >expected <<-\EOF &&
<BOLD>diff --git a/x b/x<RESET> <BOLD>diff --git a/x b/x<RESET>
<BOLD>index d0233a2..700886e 100644<RESET> <BOLD>index d0233a2..700886e 100644<RESET>
<BOLD>--- a/x<RESET> <BOLD>--- a/x<RESET>
@ -897,12 +895,7 @@ test_expect_success 'the same with --ws-error-highlight' '
<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET> <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
EOF EOF
test_cmp expected current && cat >expect.all <<-\EOF &&
git -c color.diff=always diff --ws-error-highlight=all |
test_decode_color >current &&
cat >expected <<-\EOF &&
<BOLD>diff --git a/x b/x<RESET> <BOLD>diff --git a/x b/x<RESET>
<BOLD>index d0233a2..700886e 100644<RESET> <BOLD>index d0233a2..700886e 100644<RESET>
<BOLD>--- a/x<RESET> <BOLD>--- a/x<RESET>
@ -914,12 +907,7 @@ test_expect_success 'the same with --ws-error-highlight' '
<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET> <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
EOF EOF
test_cmp expected current && cat >expect.none <<-\EOF
git -c color.diff=always diff --ws-error-highlight=none |
test_decode_color >current &&
cat >expected <<-\EOF &&
<BOLD>diff --git a/x b/x<RESET> <BOLD>diff --git a/x b/x<RESET>
<BOLD>index d0233a2..700886e 100644<RESET> <BOLD>index d0233a2..700886e 100644<RESET>
<BOLD>--- a/x<RESET> <BOLD>--- a/x<RESET>
@ -931,7 +919,22 @@ test_expect_success 'the same with --ws-error-highlight' '
<GREEN>+2. and a new line <RESET> <GREEN>+2. and a new line <RESET>
EOF EOF
test_cmp expected current '
test_expect_success 'test --ws-error-highlight option' '
git -c color.diff=always diff --ws-error-highlight=default,old |
test_decode_color >current &&
test_cmp expect.default-old current &&
git -c color.diff=always diff --ws-error-highlight=all |
test_decode_color >current &&
test_cmp expect.all current &&
git -c color.diff=always diff --ws-error-highlight=none |
test_decode_color >current &&
test_cmp expect.none current
' '
test_done test_done