t4214: generate expect in their own test cases

Before, the expect files of the test case were being generated in the
setup method. However, it would make more sense to generate these files
within the test cases that actually use them so that it's obvious to
future readers where the expected values are coming from.

Move the generation of the expect files in their own respective test
cases.

While we're at it, we want to establish a pattern in this test suite
that, firstly, a non-colored test case is given then, immediately after,
the colored version is given.

Switch test cases "log --graph with tricky octopus merge, no color" and
"log --graph with tricky octopus merge with colors" so that the "no
color" version appears first.

This patch is best viewed with `--color-moved`.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index f6e22ec82584d9f2127e68cbbe11aa007f624d54..16776e347c68970cf33aa474a96e7a79cc62beda 100755 (executable)
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -5,6 +5,20 @@ test_description='git log --graph of skewed left octopus merge.'
 . ./test-lib.sh
 
 test_expect_success 'set up merge history' '
+       test_commit initial &&
+       for i in 1 2 3 4 ; do
+               git checkout master -b $i || return $?
+               # Make tag name different from branch name, to avoid
+               # ambiguity error when calling checkout.
+               test_commit $i $i $i tag$i || return $?
+       done &&
+       git checkout 1 -b merge &&
+       test_merge octopus-merge 1 2 3 4 &&
+       git checkout 1 -b L &&
+       test_commit left
+'
+
+test_expect_success 'log --graph with tricky octopus merge, no color' '
        cat >expect.uncolored <<-\EOF &&
        * left
        | *---.   octopus-merge
@@ -19,6 +33,13 @@ test_expect_success 'set up merge history' '
        |/
        * initial
        EOF
+       git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
+       sed "s/ *\$//" actual.raw >actual &&
+       test_cmp expect.uncolored actual
+'
+
+test_expect_success 'log --graph with tricky octopus merge with colors' '
+       test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
        cat >expect.colors <<-\EOF &&
        * left
        <RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
@@ -33,32 +54,11 @@ test_expect_success 'set up merge history' '
        <MAGENTA>|<RESET><MAGENTA>/<RESET>
        * initial
        EOF
-       test_commit initial &&
-       for i in 1 2 3 4 ; do
-               git checkout master -b $i || return $?
-               # Make tag name different from branch name, to avoid
-               # ambiguity error when calling checkout.
-               test_commit $i $i $i tag$i || return $?
-       done &&
-       git checkout 1 -b merge &&
-       test_merge octopus-merge 1 2 3 4 &&
-       git checkout 1 -b L &&
-       test_commit left
-'
-
-test_expect_success 'log --graph with tricky octopus merge with colors' '
-       test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
        git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw &&
        test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
        test_cmp expect.colors actual.colors
 '
 
-test_expect_success 'log --graph with tricky octopus merge, no color' '
-       git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
-       sed "s/ *\$//" actual.raw >actual &&
-       test_cmp expect.uncolored actual
-'
-
 # Repeat the previous two tests with "normal" octopus merge (i.e.,
 # without the first parent skewing to the "left" branch column).