[v12,08/26] stash: add tests for `git stash show` config

Message ID	29c2db2e73bae6b8249a5b4d73ce784a4c861953.1545331726.git.ungureanupaulsebastian@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com> To: git@vger.kernel.org Cc: t.gummerer@gmail.com, Johannes.Schindelin@gmx.de Subject: [PATCH v12 08/26] stash: add tests for `git stash show` config Date: Thu, 20 Dec 2018 21:44:24 +0200 Message-Id: <29c2db2e73bae6b8249a5b4d73ce784a4c861953.1545331726.git.ungureanupaulsebastian@gmail.com> In-Reply-To: <cover.1545331726.git.ungureanupaulsebastian@gmail.com> References: <cover.1545331726.git.ungureanupaulsebastian@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Convert "git stash" to C builtin \| expand [v12,00/26] Convert "git stash" to C builtin [v12,01/26] sha1-name.c: add `get_oidf()` which acts like `get_oid()` [v12,02/26] strbuf.c: add `strbuf_join_argv()` [v12,03/26] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` [v12,04/26] ident: add the ability to provide a "fallback identity" [v12,05/26] stash: improve option parsing test coverage [v12,06/26] t3903: modernize style [v12,07/26] stash: rename test cases to be more descriptive [v12,08/26] stash: add tests for `git stash show` config [v12,09/26] stash: mention options in `show` synopsis [v12,10/26] stash: convert apply to builtin [v12,11/26] stash: convert drop and clear to builtin [v12,12/26] stash: convert branch to builtin [v12,13/26] stash: convert pop to builtin [v12,14/26] stash: convert list to builtin [v12,15/26] stash: convert show to builtin [v12,16/26] stash: convert store to builtin [v12,17/26] stash: convert create to builtin [v12,18/26] stash: convert push to builtin [v12,19/26] stash: make push -q quiet [v12,20/26] stash: convert save to builtin [v12,21/26] stash: optimize `get_untracked_files()` and `check_changes()` [v12,22/26] stash: replace all `write-tree` child processes with API calls [v12,23/26] stash: convert `stash--helper.c` into `stash.c` [v12,24/26] stash: add back the original, scripted `git stash` [v12,25/26] stash: optionally use the scripted version again [v12,26/26] tests: add a special setup where stash.useBuiltin is off

Message ID

29c2db2e73bae6b8249a5b4d73ce784a4c861953.1545331726.git.ungureanupaulsebastian@gmail.com (mailing list archive)

State

New, archived

Headers

From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
To: git@vger.kernel.org
Cc: t.gummerer@gmail.com, Johannes.Schindelin@gmx.de
Subject: [PATCH v12 08/26] stash: add tests for `git stash show` config
Date: Thu, 20 Dec 2018 21:44:24 +0200
Message-Id: 
 <29c2db2e73bae6b8249a5b4d73ce784a4c861953.1545331726.git.ungureanupaulsebastian@gmail.com>
In-Reply-To: <cover.1545331726.git.ungureanupaulsebastian@gmail.com>
References: <cover.1545331726.git.ungureanupaulsebastian@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Convert "git stash" to C builtin | expand

Commit Message

Paul-Sebastian Ungureanu Dec. 20, 2018, 7:44 p.m. UTC

This commit introduces tests for `git stash show`
config. It tests all the cases where `stash.showStat`
and `stash.showPatch` are unset or set to true / false.

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
---
 t/t3907-stash-show-config.sh | 83 ++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100755 t/t3907-stash-show-config.sh

diff --git a/t/t3907-stash-show-config.sh b/t/t3907-stash-show-config.sh
new file mode 100755
index 0000000000..10914bba7b
--- /dev/null
+++ b/t/t3907-stash-show-config.sh
@@ -0,0 +1,83 @@ 
+#!/bin/sh
+
+test_description='Test git stash show configuration.'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit file
+'
+
+# takes three parameters:
+# 1. the stash.showStat value (or "<unset>")
+# 2. the stash.showPatch value (or "<unset>")
+# 3. the diff options of the expected output (or nothing for no output)
+test_stat_and_patch () {
+	if test "<unset>" = "$1"
+	then
+		test_unconfig stash.showStat
+	else
+		test_config stash.showStat "$1"
+	fi &&
+
+	if test "<unset>" = "$2"
+	then
+		test_unconfig stash.showPatch
+	else
+		test_config stash.showPatch "$2"
+	fi &&
+
+	shift 2 &&
+	echo 2 >file.t &&
+	if test $# != 0
+	then
+		git diff "$@" >expect
+	fi &&
+	git stash &&
+	git stash show >actual &&
+
+	if test $# = 0
+	then
+		test_must_be_empty actual
+	else
+		test_cmp expect actual
+	fi
+}
+
+test_expect_success 'showStat unset showPatch unset' '
+	test_stat_and_patch "<unset>" "<unset>" --stat
+'
+
+test_expect_success 'showStat unset showPatch false' '
+	test_stat_and_patch "<unset>" false --stat
+'
+
+test_expect_success 'showStat unset showPatch true' '
+	test_stat_and_patch "<unset>" true --stat -p
+'
+
+test_expect_success 'showStat false showPatch unset' '
+	test_stat_and_patch false "<unset>"
+'
+
+test_expect_success 'showStat false showPatch false' '
+	test_stat_and_patch false false
+'
+
+test_expect_success 'showStat false showPatch true' '
+	test_stat_and_patch false true -p
+'
+
+test_expect_success 'showStat true showPatch unset' '
+	test_stat_and_patch true "<unset>" --stat
+'
+
+test_expect_success 'showStat true showPatch false' '
+	test_stat_and_patch true false --stat
+'
+
+test_expect_success 'showStat true showPatch true' '
+	test_stat_and_patch true true --stat -p
+'
+
+test_done