Signed-off-by: Brian Henderson <henderson...@gmail.com>
---
contrib/diff-highlight/Makefile | 5 +
contrib/diff-highlight/t/Makefile | 22 ++++
contrib/diff-highlight/t/t9400-diff-highlight.sh | 150 +++++++++++++++++++++++
3 files changed, 177 insertions(+)
create mode 100644 contrib/diff-highlight/Makefile
create mode 100644 contrib/diff-highlight/t/Makefile
create mode 100755 contrib/diff-highlight/t/t9400-diff-highlight.sh
diff --git a/contrib/diff-highlight/Makefile b/contrib/diff-highlight/Makefile
new file mode 100644
index 0000000..9018724
--- /dev/null
+++ b/contrib/diff-highlight/Makefile
@@ -0,0 +1,5 @@
+# nothing to build
+all:
+
+test:
+ $(MAKE) -C t
diff --git a/contrib/diff-highlight/t/Makefile
b/contrib/diff-highlight/t/Makefile
new file mode 100644
index 0000000..5ff5275
--- /dev/null
+++ b/contrib/diff-highlight/t/Makefile
@@ -0,0 +1,22 @@
+-include ../../../config.mak.autogen
+-include ../../../config.mak
+
+# copied from ../../t/Makefile
+SHELL_PATH ?= $(SHELL)
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
+
+all: test
+test: $(T)
+
+.PHONY: help clean all test $(T)
+
+help:
+ @echo 'Run "$(MAKE) test" to launch test scripts'
+ @echo 'Run "$(MAKE) clean" to remove trash folders'
+
+$(T):
+ @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+clean:
+ $(RM) -r 'trash directory'.*
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
b/contrib/diff-highlight/t/t9400-diff-highlight.sh
new file mode 100755
index 0000000..6b8a461
--- /dev/null
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+test_description='Test diff-highlight'
+
+CURR_DIR=$(pwd)
+TEST_OUTPUT_DIRECTORY=$(pwd)
+TEST_DIRECTORY="$CURR_DIR"/../../../t
+DIFF_HIGHLIGHT="$CURR_DIR"/../diff-highlight
+
+CW="\033[7m" # white
+CR="\033[27m" # reset
+
+. "$TEST_DIRECTORY"/test-lib.sh
+
+if ! test_have_prereq PERL
+then
+ skip_all='skipping diff-highlight tests; perl not available'
+ test_done
+fi
+
+# dh_test is a test helper function which takes 1) some file data, 2) some
+# change of the file data, creates a diff and commit of the changes and passes
+# that through diff-highlight. The optional 3rd parameter is the expected
+# output of diff-highlight minus the diff/commit header. Don't include a 3rd
+# parameter if diff-highlight is stupposed to leave the input unmodified.
+dh_test () {
+ dh_diff_test "$@" &&
+ dh_commit_test "$@"
+}
+
+# see dh_test for usage
+dh_diff_test () {
+ a="$1" b="$2"
+
+ printf "$a" >file
+ git add file
+
+ printf "$b" >file
+ git diff file >diff.raw
+
+ if test $# -ge 3
+ then
+ # Add the diff header to the expected file
+ # we remove the trailing newline to make the test a little more
readable
+ # this means $3 should start with a newline
+ head -n5 diff.raw | test_chomp_eof >diff.exp
+ printf "$3" >>diff.exp
+ else
+ cat diff.raw >diff.exp
+ fi
+
+ "$DIFF_HIGHLIGHT" <diff.raw >diff.act &&
+ # check that at least one of the files is not empty (any of the above
+ # commands could have failed resulting in an empty file)
+ test -s diff.act &&
+ test_cmp diff.exp diff.act
+}
+
+# see dh_test for usage
+dh_commit_test () {
+ a="$1" b="$2"
+
+ printf "$a" >file
+ git add file
+ git commit -m "Add a file" >/dev/null
+
+ printf "$b" >file
+ git commit -am "Update a file" >/dev/null
+
+ git show >commit.raw
+
+ if test $# -ge 3
+ then
+ # same as dh_diff_test
+ head -n11 commit.raw | test_chomp_eof >commit.exp
+ printf "$3" >>commit.exp
+ else
+ cat commit.raw >commit.exp
+ fi
+
+ "$DIFF_HIGHLIGHT" <commit.raw >commit.act &&
+ # check that at least one of the files is not empty (any of the above
+ # commands could have failed resulting in an empty file)
+ test -s commit.act &&
+ test_cmp commit.exp commit.act
+}
+
+test_chomp_eof () {
+ "$PERL_PATH" -pe 'chomp if eof'
+}
+
+test_expect_success 'diff-highlight highlights the beginning of a line' '
+ dh_test \
+ "aaa\nbbb\nccc\n" \
+ "aaa\n0bb\nccc\n" \
+"
+ aaa
+-${CW}b${CR}bb
++${CW}0${CR}bb
+ ccc
+"
+'
+
+test_expect_success 'diff-highlight highlights the end of a line' '
+ dh_test \
+ "aaa\nbbb\nccc\n" \
+ "aaa\nbb0\nccc\n" \
+"
+ aaa
+-bb${CW}b${CR}
++bb${CW}0${CR}
+ ccc
+"
+'
+
+test_expect_success 'diff-highlight highlights the middle of a line' '
+ dh_test \
+ "aaa\nbbb\nccc\n" \
+ "aaa\nb0b\nccc\n" \
+"
+ aaa
+-b${CW}b${CR}b
++b${CW}0${CR}b
+ ccc
+"
+'
+
+test_expect_success 'diff-highlight does not highlight whole line' '
+ dh_test \
+ "aaa\nbbb\nccc\n" \
+ "aaa\n000\nccc\n"
+'
+
+test_expect_failure 'diff-highlight highlights mismatched hunk size' '
+ dh_test \
+ "aaa\nbbb\n" \
+ "aaa\nb0b\nccc\n" \
+"
+ aaa
+-b${CW}b${CR}b
++b${CW}0${CR}b
++ccc
+"
+'
+
+# TODO add multi-byte test
+
+test_done
+
+# vim: set noet
--
2.9.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
