t4034 (diff --word-diff): style suggestions

Rearrange code to be easier to browse:

- first data
- then functions
- then test assertions

Mark up inline test vectors as

cat >vector <<-\EOF
data
data
EOF

for visual scannability.  Use words like "set up" for tests that set
up for other tests, to make it obvious which tests are safe to skip.
Use repeated function calls instead of a loop for the
language-specific tests, so the invocations can be easily tweaked
individually (for example if one starts to fail).

This means if you add a new subdirectory to t4034/, it will not be
automatically used.  I think that's worth it for the added
explicitness.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 2647191e7fe24d1763554f478b65c200343179d0..c3b1c481ceba8bade0846c1c5e684047c7834055 100755 (executable)
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -4,346 +4,306 @@ test_description='word diff colors'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-test_expect_success setup '
+cat >pre.simple <<-\EOF
+       h(4)

 
 

-       git config diff.color.old red &&
-       git config diff.color.new green &&
-       git config diff.color.func magenta
+       a = b + c
+EOF
+cat >post.simple <<-\EOF
+       h(4),hh[44]

 
 

-'
+       a = b + c

 
 

-word_diff () {
-       test_must_fail git diff --no-index "$@" pre post > output &&
-       test_decode_color <output >output.decrypted &&
-       test_cmp expect output.decrypted
-}
+       aa = a

 
 

-cat > pre <<\EOF
-h(4)
-
-a = b + c
+       aeff = aeff * ( aaa )

 EOF
 EOF

+cat >expect.letter-runs-are-words <<-\EOF
+       <BOLD>diff --git a/pre b/post<RESET>
+       <BOLD>index 330b04f..5ed8eff 100644<RESET>
+       <BOLD>--- a/pre<RESET>
+       <BOLD>+++ b/post<RESET>
+       <CYAN>@@ -1,3 +1,7 @@<RESET>
+       h(4),<GREEN>hh<RESET>[44]

 
 

-cat > post <<\EOF
-h(4),hh[44]
-
-a = b + c
+       a = b + c<RESET>

 
 

-aa = a
+       <GREEN>aa = a<RESET>

 
 

-aeff = aeff * ( aaa )
+       <GREEN>aeff = aeff * ( aaa<RESET> )

 EOF
 EOF

+cat >expect.non-whitespace-is-word <<-\EOF
+       <BOLD>diff --git a/pre b/post<RESET>
+       <BOLD>index 330b04f..5ed8eff 100644<RESET>
+       <BOLD>--- a/pre<RESET>
+       <BOLD>+++ b/post<RESET>
+       <CYAN>@@ -1,3 +1,7 @@<RESET>
+       h(4)<GREEN>,hh[44]<RESET>

 
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-<RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
-
-a = b + c<RESET>
+       a = b + c<RESET>

 
 

-<GREEN>aa = a<RESET>
+       <GREEN>aa = a<RESET>

 
 

-<GREEN>aeff = aeff * ( aaa )<RESET>
+       <GREEN>aeff = aeff * ( aaa )<RESET>

 EOF
 
 EOF
 

-test_expect_success 'word diff with runs of whitespace' '
+word_diff () {
+       test_must_fail git diff --no-index "$@" pre post >output &&
+       test_decode_color <output >output.decrypted &&
+       test_cmp expect output.decrypted
+}

 
 

-       word_diff --color-words
+test_language_driver () {
+       lang=$1
+       test_expect_success "diff driver '$lang'" '
+               cp "$TEST_DIRECTORY/t4034/'"$lang"'/pre" \
+                       "$TEST_DIRECTORY/t4034/'"$lang"'/post" \
+                       "$TEST_DIRECTORY/t4034/'"$lang"'/expect" . &&
+               echo "* diff='"$lang"'" >.gitattributes &&
+               word_diff --color-words
+       '
+}

 
 

+test_expect_success setup '
+       git config diff.color.old red &&
+       git config diff.color.new green &&
+       git config diff.color.func magenta

 '
 
 '
 

-test_expect_success '--word-diff=color' '
-
-       word_diff --word-diff=color
-
+test_expect_success 'set up pre and post with runs of whitespace' '
+       cp pre.simple pre &&
+       cp post.simple post

 '
 
 '
 

-test_expect_success '--color --word-diff=color' '
-
+test_expect_success 'word diff with runs of whitespace' '
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 330b04f..5ed8eff 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1,3 +1,7 @@<RESET>
+               <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
+
+               a = b + c<RESET>
+
+               <GREEN>aa = a<RESET>
+
+               <GREEN>aeff = aeff * ( aaa )<RESET>
+       EOF
+       word_diff --color-words &&
+       word_diff --word-diff=color &&

        word_diff --color --word-diff=color
        word_diff --color --word-diff=color

-

 '
 
 '
 

-sed 's/#.*$//' > expect <<EOF
-diff --git a/pre b/post
-index 330b04f..5ed8eff 100644
---- a/pre
-+++ b/post
-@@ -1,3 +1,7 @@
--h(4)
-+h(4),hh[44]
-~
- # significant space
-~
- a = b + c
-~
-~
-+aa = a
-~
-~
-+aeff = aeff * ( aaa )
-~
-EOF
-

 test_expect_success '--word-diff=porcelain' '
 test_expect_success '--word-diff=porcelain' '

-
+       sed 's/#.*$//' >expect <<-\EOF &&
+               diff --git a/pre b/post
+               index 330b04f..5ed8eff 100644
+               --- a/pre
+               +++ b/post
+               @@ -1,3 +1,7 @@
+               -h(4)
+               +h(4),hh[44]
+               ~
+                # significant space
+               ~
+                a = b + c
+               ~
+               ~
+               +aa = a
+               ~
+               ~
+               +aeff = aeff * ( aaa )
+               ~
+       EOF

        word_diff --word-diff=porcelain
        word_diff --word-diff=porcelain

-

 '
 
 '
 

-cat > expect <<EOF
-diff --git a/pre b/post
-index 330b04f..5ed8eff 100644
---- a/pre
-+++ b/post
-@@ -1,3 +1,7 @@
-[-h(4)-]{+h(4),hh[44]+}
-
-a = b + c
-
-{+aa = a+}
-
-{+aeff = aeff * ( aaa )+}
-EOF
-

 test_expect_success '--word-diff=plain' '
 test_expect_success '--word-diff=plain' '

+       cat >expect <<-\EOF &&
+               diff --git a/pre b/post
+               index 330b04f..5ed8eff 100644
+               --- a/pre
+               +++ b/post
+               @@ -1,3 +1,7 @@
+               [-h(4)-]{+h(4),hh[44]+}

 
 

-       word_diff --word-diff=plain
-
-'
+               a = b + c

 
 

-test_expect_success '--word-diff=plain --no-color' '
+               {+aa = a+}

 
 

+               {+aeff = aeff * ( aaa )+}
+       EOF
+       word_diff --word-diff=plain &&

        word_diff --word-diff=plain --no-color
        word_diff --word-diff=plain --no-color

-

 '
 
 '
 

-cat > expect <<EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-<RED>[-h(4)-]<RESET><GREEN>{+h(4),hh[44]+}<RESET>
-
-a = b + c<RESET>
-
-<GREEN>{+aa = a+}<RESET>
+test_expect_success '--word-diff=plain --color' '
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 330b04f..5ed8eff 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1,3 +1,7 @@<RESET>
+               <RED>[-h(4)-]<RESET><GREEN>{+h(4),hh[44]+}<RESET>

 
 

-<GREEN>{+aeff = aeff * ( aaa )+}<RESET>
-EOF
+               a = b + c<RESET>

 
 

-test_expect_success '--word-diff=plain --color' '
+               <GREEN>{+aa = a+}<RESET>

 
 

+               <GREEN>{+aeff = aeff * ( aaa )+}<RESET>
+       EOF

        word_diff --word-diff=plain --color
        word_diff --word-diff=plain --color

-

 '
 
 '
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1 +1 @@<RESET>
-<RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
-<CYAN>@@ -3,0 +4,4 @@<RESET> <RESET><MAGENTA>a = b + c<RESET>
-
-<GREEN>aa = a<RESET>
-
-<GREEN>aeff = aeff * ( aaa )<RESET>
-EOF
-

 test_expect_success 'word diff without context' '
 test_expect_success 'word diff without context' '

-
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 330b04f..5ed8eff 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1 +1 @@<RESET>
+               <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
+               <CYAN>@@ -3,0 +4,4 @@<RESET> <RESET><MAGENTA>a = b + c<RESET>
+
+               <GREEN>aa = a<RESET>
+
+               <GREEN>aeff = aeff * ( aaa )<RESET>
+       EOF

        word_diff --color-words --unified=0
        word_diff --color-words --unified=0

-

 '
 
 '
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-h(4),<GREEN>hh<RESET>[44]
-
-a = b + c<RESET>
-
-<GREEN>aa = a<RESET>
-
-<GREEN>aeff = aeff * ( aaa<RESET> )
-EOF
-cp expect expect.letter-runs-are-words
-

 test_expect_success 'word diff with a regular expression' '
 test_expect_success 'word diff with a regular expression' '

-
+       cp expect.letter-runs-are-words expect &&

        word_diff --color-words="[a-z]+"
        word_diff --color-words="[a-z]+"

-

 '
 
 '
 

-test_expect_success 'set a diff driver' '
+test_expect_success 'set up a diff driver' '

        git config diff.testdriver.wordRegex "[^[:space:]]" &&
        git config diff.testdriver.wordRegex "[^[:space:]]" &&

-       cat <<EOF > .gitattributes
-pre diff=testdriver
-post diff=testdriver
-EOF
+       cat <<-\EOF >.gitattributes
+               pre diff=testdriver
+               post diff=testdriver
+       EOF

 '
 
 test_expect_success 'option overrides .gitattributes' '
 '
 
 test_expect_success 'option overrides .gitattributes' '

-
+       cp expect.letter-runs-are-words expect &&

        word_diff --color-words="[a-z]+"
        word_diff --color-words="[a-z]+"

-

 '
 
 '
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-h(4)<GREEN>,hh[44]<RESET>
-
-a = b + c<RESET>
-
-<GREEN>aa = a<RESET>
-
-<GREEN>aeff = aeff * ( aaa )<RESET>
-EOF
-cp expect expect.non-whitespace-is-word
-

 test_expect_success 'use regex supplied by driver' '
 test_expect_success 'use regex supplied by driver' '

-
+       cp expect.non-whitespace-is-word expect &&

        word_diff --color-words
        word_diff --color-words

-

 '
 
 '
 

-test_expect_success 'set diff.wordRegex option' '
+test_expect_success 'set up diff.wordRegex option' '

        git config diff.wordRegex "[[:alnum:]]+"
 '
 
        git config diff.wordRegex "[[:alnum:]]+"
 '
 

-cp expect.letter-runs-are-words expect
-

 test_expect_success 'command-line overrides config' '
 test_expect_success 'command-line overrides config' '

+       cp expect.letter-runs-are-words expect &&

        word_diff --color-words="[a-z]+"
 '
 
        word_diff --color-words="[a-z]+"
 '
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-h(4),<GREEN>{+hh+}<RESET>[44]
-
-a = b + c<RESET>
+test_expect_success 'command-line overrides config: --word-diff-regex' '
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 330b04f..5ed8eff 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1,3 +1,7 @@<RESET>
+               h(4),<GREEN>{+hh+}<RESET>[44]

 
 

-<GREEN>{+aa = a+}<RESET>
+               a = b + c<RESET>

 
 

-<GREEN>{+aeff = aeff * ( aaa+}<RESET> )
-EOF
+               <GREEN>{+aa = a+}<RESET>

 
 

-test_expect_success 'command-line overrides config: --word-diff-regex' '
+               <GREEN>{+aeff = aeff * ( aaa+}<RESET> )
+       EOF

        word_diff --color --word-diff-regex="[a-z]+"
 '
 
        word_diff --color --word-diff-regex="[a-z]+"
 '
 

-cp expect.non-whitespace-is-word expect
-

 test_expect_success '.gitattributes override config' '
 test_expect_success '.gitattributes override config' '

+       cp expect.non-whitespace-is-word expect &&

        word_diff --color-words
 '
 
        word_diff --color-words
 '
 

-test_expect_success 'remove diff driver regex' '
-       git config --unset diff.testdriver.wordRegex
+test_expect_success 'setup: remove diff driver regex' '
+       test_might_fail git config --unset diff.testdriver.wordRegex

 '
 
 '
 

-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 330b04f..5ed8eff 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,3 +1,7 @@<RESET>
-h(4),<GREEN>hh[44<RESET>]
-
-a = b + c<RESET>
+test_expect_success 'use configured regex' '
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 330b04f..5ed8eff 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1,3 +1,7 @@<RESET>
+               h(4),<GREEN>hh[44<RESET>]

 
 

-<GREEN>aa = a<RESET>
+               a = b + c<RESET>

 
 

-<GREEN>aeff = aeff * ( aaa<RESET> )
-EOF
+               <GREEN>aa = a<RESET>

 
 

-test_expect_success 'use configured regex' '
+               <GREEN>aeff = aeff * ( aaa<RESET> )
+       EOF

        word_diff --color-words
 '
 
        word_diff --color-words
 '
 

-echo 'aaa (aaa)' > pre
-echo 'aaa (aaa) aaa' > post
-
-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index c29453b..be22f37 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1 +1 @@<RESET>
-aaa (aaa) <GREEN>aaa<RESET>
-EOF
-

 test_expect_success 'test parsing words for newline' '
 test_expect_success 'test parsing words for newline' '

-
+       echo "aaa (aaa)" >pre &&
+       echo "aaa (aaa) aaa" >post &&
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index c29453b..be22f37 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1 +1 @@<RESET>
+               aaa (aaa) <GREEN>aaa<RESET>
+       EOF

        word_diff --color-words="a+"
        word_diff --color-words="a+"

-
-

 '
 
 '
 

-echo '(:' > pre
-echo '(' > post
-
-cat > expect <<\EOF
-<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 289cb9d..2d06f37 100644<RESET>
-<BOLD>--- a/pre<RESET>
-<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1 +1 @@<RESET>
-(<RED>:<RESET>
-EOF
-

 test_expect_success 'test when words are only removed at the end' '
 test_expect_success 'test when words are only removed at the end' '

-
+       echo "(:" >pre &&
+       echo "(" >post &&
+       cat >expect <<-\EOF &&
+               <BOLD>diff --git a/pre b/post<RESET>
+               <BOLD>index 289cb9d..2d06f37 100644<RESET>
+               <BOLD>--- a/pre<RESET>
+               <BOLD>+++ b/post<RESET>
+               <CYAN>@@ -1 +1 @@<RESET>
+               (<RED>:<RESET>
+       EOF

        word_diff --color-words=.
        word_diff --color-words=.

-

 '
 
 '
 

-cat > expect <<\EOF
-diff --git a/pre b/post
-index 289cb9d..2d06f37 100644
---- a/pre
-+++ b/post
-@@ -1 +1 @@
--(:
-+(
-EOF
-

 test_expect_success '--word-diff=none' '
 test_expect_success '--word-diff=none' '

-
+       echo "(:" >pre &&
+       echo "(" >post &&
+       cat >expect <<-\EOF &&
+               diff --git a/pre b/post
+               index 289cb9d..2d06f37 100644
+               --- a/pre
+               +++ b/post
+               @@ -1 +1 @@
+               -(:
+               +(
+       EOF

        word_diff --word-diff=plain --word-diff=none
        word_diff --word-diff=plain --word-diff=none

-

 '
 
 '
 

-word_diff_for_language () {
-       cp "$TEST_DIRECTORY/t4034/$1/pre" \
-               "$TEST_DIRECTORY/t4034/$1/post" \
-               "$TEST_DIRECTORY/t4034/$1/expect" . &&
-       echo "* diff=$1" >.gitattributes &&
-       word_diff --color-words && cp output output.$1
-}
-
-for lang_dir in $TEST_DIRECTORY/t4034/*; do
-       lang=${lang_dir#$TEST_DIRECTORY/t4034/}
-       test_expect_success "diff driver '$lang' has sane word regex" "
-               word_diff_for_language $lang
-       "
-done
+test_language_driver bibtex
+test_language_driver cpp
+test_language_driver csharp
+test_language_driver fortran
+test_language_driver html
+test_language_driver java
+test_language_driver objc
+test_language_driver pascal
+test_language_driver php
+test_language_driver python
+test_language_driver ruby
+test_language_driver tex

 
 test_done
 
 test_done