t0064: make hash size independent

Compute test values of the appropriate size instead of hard-coding
40-character values.  Rename the echo20 function to echoid, since the
values may be of varying sizes.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2018-09-13 05:17:36 +00:00 committed by Junio C Hamano
parent 0de267b292
commit 1374003db1
1 changed files with 27 additions and 22 deletions

View File

@ -3,30 +3,30 @@
test_description='basic tests for the SHA1 array implementation' test_description='basic tests for the SHA1 array implementation'
. ./test-lib.sh . ./test-lib.sh


echo20 () { echoid () {
prefix="${1:+$1 }" prefix="${1:+$1 }"
shift shift
while test $# -gt 0 while test $# -gt 0
do do
echo "$prefix$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1" echo "$prefix$ZERO_OID" | sed -e "s/00/$1/g"
shift shift
done done
} }


test_expect_success 'ordered enumeration' ' test_expect_success 'ordered enumeration' '
echo20 "" 44 55 88 aa >expect && echoid "" 44 55 88 aa >expect &&
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo for_each_unique echo for_each_unique
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success 'ordered enumeration with duplicate suppression' ' test_expect_success 'ordered enumeration with duplicate suppression' '
echo20 "" 44 55 88 aa >expect && echoid "" 44 55 88 aa >expect &&
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo for_each_unique echo for_each_unique
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
test_cmp expect actual test_cmp expect actual
@ -34,8 +34,8 @@ test_expect_success 'ordered enumeration with duplicate suppression' '


test_expect_success 'lookup' ' test_expect_success 'lookup' '
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 lookup 55 echoid lookup 55
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -eq 1 test "$n" -eq 1
@ -43,8 +43,8 @@ test_expect_success 'lookup' '


test_expect_success 'lookup non-existing entry' ' test_expect_success 'lookup non-existing entry' '
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 lookup 33 echoid lookup 33
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -lt 0 test "$n" -lt 0
@ -52,9 +52,9 @@ test_expect_success 'lookup non-existing entry' '


test_expect_success 'lookup with duplicates' ' test_expect_success 'lookup with duplicates' '
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 lookup 55 echoid lookup 55
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -ge 2 && test "$n" -ge 2 &&
@ -63,19 +63,24 @@ test_expect_success 'lookup with duplicates' '


test_expect_success 'lookup non-existing entry with duplicates' ' test_expect_success 'lookup non-existing entry with duplicates' '
{ {
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 append 88 44 aa 55 && echoid append 88 44 aa 55 &&
echo20 lookup 66 echoid lookup 66
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -lt 0 test "$n" -lt 0
' '


test_expect_success 'lookup with almost duplicate values' ' test_expect_success 'lookup with almost duplicate values' '
# n-1 5s
root=$(echoid "" 55) &&
root=${root%5} &&
{ {
echo "append 5555555555555555555555555555555555555555" && id1="${root}5" &&
echo "append 555555555555555555555555555555555555555f" && id2="${root}f" &&
echo20 lookup 55 echo "append $id1" &&
echo "append $id2" &&
echoid lookup 55
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -eq 0 test "$n" -eq 0
@ -83,8 +88,8 @@ test_expect_success 'lookup with almost duplicate values' '


test_expect_success 'lookup with single duplicate value' ' test_expect_success 'lookup with single duplicate value' '
{ {
echo20 append 55 55 && echoid append 55 55 &&
echo20 lookup 55 echoid lookup 55
} | test-tool sha1-array >actual && } | test-tool sha1-array >actual &&
n=$(cat actual) && n=$(cat actual) &&
test "$n" -ge 0 && test "$n" -ge 0 &&