From: "Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Subject: [PATCH v2 2/2] t0028: add more tests
Date: Mon, 23 Sep 2019 03:04:19 -0700 (PDT) [thread overview]
Message-ID: <40e54cf5ce74d1404187e31c94644df29134b4ff.1569233057.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.347.v2.git.gitgitgadget@gmail.com>
From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
After I discovered that UTF-16-LE-BOM test was bugged and still
succeeded, I decided that better tests are required. Possibly the best
option here is to compare git results against hardcoded ground truth.
The new tests also cover more interesting chars where (ANSI != UTF-8).
Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
---
t/t0028-working-tree-encoding.sh | 39 ++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index 5493cf3ca9..d0dd5dd0ea 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -280,4 +280,43 @@ test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' '
git reset
'
+# $1: checkout encoding
+# $2: test string
+# $3: binary test string in checkout encoding
+test_commit_utf8_checkout_other () {
+ encoding="$1"
+ orig_string="$2"
+ expect_bytes="$3"
+
+ test_expect_success "Commit utf-8, checkout ${encoding}" '
+ test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+ test_ext="commit_utf8_checkout_${encoding}" &&
+ test_file="test.${test_ext}" &&
+
+ # Commit as utf-8
+ echo "*.${test_ext} text working-tree-encoding=utf-8" >.gitattributes &&
+ printf "${orig_string}" >"${test_file}" &&
+ git add "${test_file}" &&
+ git commit -m "Test data" &&
+
+ # Checkout in tested encoding
+ rm "${test_file}" &&
+ echo "*.${test_ext} text working-tree-encoding=${encoding}" >.gitattributes &&
+ git checkout HEAD -- "${test_file}" &&
+
+ # Test
+ printf "${expect_bytes}" > "${test_file}.raw" &&
+ test_cmp_bin "${test_file}.raw" "${test_file}"
+ '
+}
+
+test_commit_utf8_checkout_other "UTF-8" "Test Тест" "\124\145\163\164\040\320\242\320\265\321\201\321\202"
+test_commit_utf8_checkout_other "UTF-16LE" "Test Тест" "\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
+test_commit_utf8_checkout_other "UTF-16BE" "Test Тест" "\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
+test_commit_utf8_checkout_other "UTF-16LE-BOM" "Test Тест" "\377\376\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
+test_commit_utf8_checkout_other "UTF-16BE-BOM" "Test Тест" "\376\377\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
+test_commit_utf8_checkout_other "UTF-32LE" "Test Тест" "\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\000\042\004\000\000\065\004\000\000\101\004\000\000\102\004\000\000"
+test_commit_utf8_checkout_other "UTF-32BE" "Test Тест" "\000\000\000\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\004\042\000\000\004\065\000\000\004\101\000\000\004\102"
+
test_done
--
gitgitgadget
next prev parent reply other threads:[~2019-09-23 10:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 8:33 [PATCH 0/2] t0028 fix test + more tests Alexandr Miloslavskiy via GitGitGadget
2019-09-23 8:33 ` [PATCH 1/2] t0028: fix test for UTF-16-LE-BOM Alexandr Miloslavskiy via GitGitGadget
2019-09-23 8:33 ` [PATCH 2/2] t0028: add more tests Alexandr Miloslavskiy via GitGitGadget
2019-09-23 10:04 ` [PATCH v2 0/2] Update: fixed typos in commit message Alexandr Miloslavskiy via GitGitGadget
2019-09-23 10:04 ` [PATCH v2 1/2] t0028: fix test for UTF-16-LE-BOM Alexandr Miloslavskiy via GitGitGadget
2019-09-24 3:46 ` Torsten Bögershausen
2019-09-24 9:53 ` Alexandr Miloslavskiy
2019-09-23 10:04 ` Alexandr Miloslavskiy via GitGitGadget [this message]
2019-09-24 4:06 ` [PATCH v2 2/2] t0028: add more tests Torsten Bögershausen
2019-09-24 10:03 ` Alexandr Miloslavskiy
2019-09-24 6:21 ` Johannes Sixt
2019-09-24 10:31 ` Alexandr Miloslavskiy
2019-09-24 10:40 ` [PATCH v3 0/2] Update: fixed typos in commit message Alexandr Miloslavskiy via GitGitGadget
2019-09-24 10:40 ` [PATCH v3 1/2] t0028: fix test for UTF-16-LE-BOM Alexandr Miloslavskiy via GitGitGadget
2019-09-24 10:40 ` [PATCH v3 2/2] t0028: add more tests Alexandr Miloslavskiy via GitGitGadget
2019-09-28 4:47 ` Junio C Hamano
2019-09-30 7:26 ` Alexandr Miloslavskiy
2019-09-26 19:37 ` [PATCH v3 0/2] Update: fixed typos in commit message Torsten Bögershausen
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=40e54cf5ce74d1404187e31c94644df29134b4ff.1569233057.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=alexandr.miloslavskiy@syntevo.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.