summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2014-03-22 18:15:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-24 15:12:42 -0700
commite7880fcd41dd4424a79efb0a939f1c008c5519c0 (patch)
tree80fcaa37b7fe2f2ee9b63b222116d29e17b63458
parentt4209: factor out helper function test_log() (diff)
downloadtgif-e7880fcd41dd4424a79efb0a939f1c008c5519c0.tar.xz
t4209: factor out helper function test_log_icase()
Reduce code duplication by introducing test_log_icase() that runs the same test with both --regexp-ignore-case and -i. The specification of the four basic test scenarios (matching/nomatching combined with case sensitive/insensitive) becomes easier to read and write. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4209-log-pickaxe.sh26
1 files changed, 14 insertions, 12 deletions
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 9c3b596366..919b371169 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -33,6 +33,12 @@ test_log () {
"
}
+# test -i and --regexp-ignore-case and expect both to behave the same way
+test_log_icase () {
+ test_log $@ --regexp-ignore-case
+ test_log $@ -i
+}
+
test_expect_success setup '
>expect_nomatch &&
@@ -74,12 +80,10 @@ test_expect_success 'log --author -i' '
test_cmp expect_second actual
'
-test_log expect_nomatch -G picked
-test_log expect_second -G Picked
-test_log expect_nomatch -G pickle --regexp-ignore-case
-test_log expect_nomatch -G pickle -i
-test_log expect_second -G picked --regexp-ignore-case
-test_log expect_second -G picked -i
+test_log expect_nomatch -G picked
+test_log expect_second -G Picked
+test_log_icase expect_nomatch -G pickle
+test_log_icase expect_second -G picked
test_expect_success 'log -G --textconv (missing textconv tool)' '
echo "* diff=test" >.gitattributes &&
@@ -94,12 +98,10 @@ test_expect_success 'log -G --no-textconv (missing textconv tool)' '
rm .gitattributes
'
-test_log expect_nomatch -S picked
-test_log expect_second -S Picked
-test_log expect_second -S picked --regexp-ignore-case
-test_log expect_second -S picked -i
-test_log expect_nomatch -S pickle --regexp-ignore-case
-test_log expect_nomatch -S pickle -i
+test_log expect_nomatch -S picked
+test_log expect_second -S Picked
+test_log_icase expect_second -S picked
+test_log_icase expect_nomatch -S pickle
test_expect_success 'log -S --textconv (missing textconv tool)' '
echo "* diff=test" >.gitattributes &&