t0028: add more tests

After I discovered that UTF-16-LE-BOM test was buggy, 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>
Reviewed-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index 5493cf3ca9595fd4851a4423e8f16dc44582fd28..7aa0945d8d711d14739da69510b835fcc0e8edb3 100755 (executable)
--- 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