Re: [PATCH 2/8] t3206: add color test for range-diff --dual-color
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 31, 2018, 20:51 UTC
- Message-ID
- <xmqqmuu79lii.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180731003141.105192-3-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 17 quoted lines
> The 'expect'ed outcome has been taken by running the 'range-diff | decode'. > > Signed-off-by: Stefan Beller <sbeller@google.com> > --- > t/t3206-range-diff.sh | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh > index 2237c7f4af9..019724e61a0 100755 > --- a/t/t3206-range-diff.sh > +++ b/t/t3206-range-diff.sh > @@ -142,4 +142,43 @@ test_expect_success 'changed message' ' > test_cmp expected actual > ' > > +test_expect_success 'dual-coloring' ' > + cat >expect <<-\EOF &&
It is a good idea to use something like "sed -e 's/^|//'" instead of "cat" here; that way allows you to mark the left-edge of the data with "|", for a test vector like this one that has a line that would otherwise violate the whitespace style rules.
An inferiour alternative would be to add .gitaddtibute entry to make this file exempt from indent-with-tab rule, but even in this 40-line block there only is one line that requires such a workaround, and it won't help the initial application of this patch to get modified when applied with "am --whitespace=fix".
Show 38 quoted lines
> + <YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET> > + <RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET> > + <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET> > + <RESET> > + s/4/A/<RESET> > + <RESET> > + <REVERSE><GREEN>+<RESET> <BOLD> Also a silly comment here!<RESET> > + <REVERSE><GREEN>+<RESET> > + diff --git a/file b/file<RESET> > + <RED> --- a/file<RESET> > + <GREEN> +++ b/file<RESET> > + <RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> > + <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET> > + 9<RESET> > + 10<RESET> > + <RED> -11<RESET> > + <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET> > + <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET> > + 12<RESET> > + 13<RESET> > + 14<RESET> > + <RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> > + <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET> > + <CYAN> @@<RESET> > + 9<RESET> > + 10<RESET> > + <REVERSE><RED>-<RESET><FAINT> BB<RESET> > + <REVERSE><GREEN>+<RESET> <BOLD>B<RESET> > + <RED> -12<RESET> > + <GREEN> +B<RESET> > + 13<RESET> > + EOF > + git range-diff changed...changed-message --color --dual-color >actual.raw && > + test_decode_color >actual <actual.raw && > + test_cmp expect actual > +' > + > test_done