From: Dragan Simic <dsimic@manjaro.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, rsbecker@nexbridge.com, github@seichter.de
Subject: [PATCH 3/4] t1300: add more tests for whitespace and inline comments
Date: Fri, 15 Mar 2024 14:22:09 +0100 [thread overview]
Message-ID: <590731e15a01558d1bbcdfc01df4f78573138742.1710508691.git.dsimic@manjaro.org> (raw)
In-Reply-To: <cover.1710508691.git.dsimic@manjaro.org>
Add a handful of additional automated tests, to improve the coverage of
configuration file entries whose values contain internal whitespace, leading
and/or trailing whitespace, or which contain an additional inline comment.
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
---
t/t1300-config.sh | 102 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 101 insertions(+), 1 deletion(-)
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 31c387868708..6eef8a48098c 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -11,6 +11,96 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
+cat > .git/config << EOF
+[section]
+ solid = rock
+ sparse = big blue
+ sparseAndTail = big blue
+ sparseAndTailQuoted = "big blue "
+ sparseAndBiggerTail = big blue
+ sparseAndBiggerTailQuoted = "big blue "
+ sparseAndBiggerTailQuotedPlus = "big blue "
+ headAndTail = big blue
+ headAndTailQuoted = " big blue "
+ headAndTailQuotedPlus = " big blue "
+ annotated = big blue # to be discarded
+ annotatedQuoted = "big blue" # to be discarded
+EOF
+
+echo 'rock' > expect
+
+test_expect_success 'no internal whitespace' '
+ git config --get section.solid > output &&
+ test_cmp expect output
+'
+
+echo 'big blue' > expect
+
+test_expect_success 'internal whitespace' '
+ git config --get section.sparse > output &&
+ test_cmp expect output
+'
+
+test_expect_success 'internal and trailing whitespace' '
+ git config --get section.sparseAndTail > output &&
+ test_cmp expect output
+'
+
+test_expect_success 'internal and more trailing whitespace' '
+ git config --get section.sparseAndBiggerTail > output &&
+ test_cmp expect output
+'
+
+echo 'big blue ' > expect
+
+test_expect_success 'internal and trailing whitespace, all quoted' '
+ git config --get section.sparseAndTailQuoted > output &&
+ test_cmp expect output
+'
+
+echo 'big blue ' > expect
+
+test_expect_success 'internal and more trailing whitespace, all quoted' '
+ git config --get section.sparseAndBiggerTailQuoted > output &&
+ test_cmp expect output
+'
+
+test_expect_success 'internal and more trailing whitespace, not all quoted' '
+ git config --get section.sparseAndBiggerTailQuotedPlus > output &&
+ test_cmp expect output
+'
+
+echo 'big blue' > expect
+
+test_expect_success 'leading and trailing whitespace' '
+ git config --get section.headAndTail > output &&
+ test_cmp expect output
+'
+
+echo ' big blue ' > expect
+
+test_expect_success 'leading and trailing whitespace, all quoted' '
+ git config --get section.headAndTailQuoted > output &&
+ test_cmp expect output
+'
+
+test_expect_success 'leading and trailing whitespace, not all quoted' '
+ git config --get section.headAndTailQuotedPlus > output &&
+ test_cmp expect output
+'
+
+echo 'big blue' > expect
+
+test_expect_success 'inline comment' '
+ git config --get section.annotated > output &&
+ test_cmp expect output
+'
+
+test_expect_success 'inline comment, quoted' '
+ git config --get section.annotatedQuoted > output &&
+ test_cmp expect output
+'
+
test_expect_success 'clear default config' '
rm -f .git/config
'
@@ -1066,7 +1156,17 @@ test_expect_success '--null --get-regexp' '
test_cmp expect result
'
-test_expect_success 'inner whitespace kept verbatim' '
+test_expect_success 'inner whitespace kept verbatim, spaces only' '
+ git config section.val "foo bar" &&
+ test_cmp_config "foo bar" section.val
+'
+
+test_expect_success 'inner whitespace kept verbatim, horizontal tabs only' '
+ git config section.val "foo bar" &&
+ test_cmp_config "foo bar" section.val
+'
+
+test_expect_success 'inner whitespace kept verbatim, horizontal tabs and spaces' '
git config section.val "foo bar" &&
test_cmp_config "foo bar" section.val
'
next prev parent reply other threads:[~2024-03-15 13:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 13:22 [PATCH 0/4] Fix a bug in configuration parsing, and improve tests and documentation Dragan Simic
2024-03-15 13:22 ` [PATCH 1/4] config: minor addition of whitespace Dragan Simic
2024-03-15 13:22 ` [PATCH 2/4] config: really keep value-internal whitespace verbatim Dragan Simic
2024-03-15 17:46 ` Junio C Hamano
2024-03-15 19:50 ` Dragan Simic
2024-03-15 13:22 ` Dragan Simic [this message]
2024-03-15 19:39 ` [PATCH 3/4] t1300: add more tests for whitespace and inline comments Eric Sunshine
2024-03-15 20:04 ` Dragan Simic
2024-03-15 20:29 ` Eric Sunshine
2024-03-15 21:42 ` Dragan Simic
2024-03-15 13:22 ` [PATCH 4/4] config.txt: describe handling of whitespace further Dragan Simic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=590731e15a01558d1bbcdfc01df4f78573138742.1710508691.git.dsimic@manjaro.org \
--to=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
--cc=github@seichter.de \
--cc=gitster@pobox.com \
--cc=rsbecker@nexbridge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.