git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 03/10] t4209: factor out helper function test_log_icase()

From
René Scharfe <l.s.r@web.de>
Date
Mar 22, 2014, 17:15 UTC
Message-ID
<1395508560-19893-4-git-send-email-l.s.r@web.de>
In-Reply-To
<1395508560-19893-1-git-send-email-l.s.r@web.de>

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>
---
 t/t4209-log-pickaxe.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 9f3bb40..dd911c2 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -25,6 +25,11 @@ test_log() {
 	"
 }
 
+test_log_icase() {
+	test_log $@ --regexp-ignore-case
+	test_log $@ -i
+}
+
 test_expect_success setup '
 	>expect_nomatch &&
 
@@ -66,12 +71,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 &&
@@ -86,12 +89,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 &&
-- 
1.9.1
Previous: René ScharfeNext: Junio C Hamano
Message 4 of 21 in “pickaxe: honor -i when used with -S and --pickaxe-regex; cleanups”
  1. 00/10 pickaxe: honor -i when used with -S and --pickaxe-regex; cleanupsRené Scharfe, Mar 22, 2014
  2. 01/10 t4209: set up expectations up frontRené Scharfe, Mar 22, 2014
  3. 02/10 t4209: factor out helper function test_log()René Scharfe, Mar 22, 2014
  4. 03/10 t4209: factor out helper function test_log_icase()René Scharfe, Mar 22, 2014
  5. Junio C HamanoMar 24, 2014
  6. Jeff KingMar 24, 2014
  7. René ScharfeMar 24, 2014
  8. Junio C HamanoMar 24, 2014
  9. 04/10 t4209: use helper functions to test --grepRené Scharfe, Mar 22, 2014
  10. Junio C HamanoMar 24, 2014
  11. Jeff KingMar 24, 2014
  12. René ScharfeMar 24, 2014
  13. 05/10 t4209: use helper functions to test --authorRené Scharfe, Mar 22, 2014
  14. 06/10 pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe, Mar 22, 2014
  15. 07/10 pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()René Scharfe, Mar 22, 2014
  16. 08/10 pickaxe: move pickaxe() after pickaxe_match()René Scharfe, Mar 22, 2014
  17. Jeff KingMar 24, 2014
  18. 09/10 pickaxe: call strlen only when necessary in diffcore_pickaxe_count()René Scharfe, Mar 22, 2014
  19. 10/10 pickaxe: simplify kwset loop in contains()René Scharfe, Mar 22, 2014
  20. Junio C HamanoMar 24, 2014
  21. Jeff KingMar 24, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.