Skip to content

Commit 3ea922f

Browse files
peffgitster
authored andcommitted
t0064: make duplicate tests more robust
Our tests for handling duplicates in oid-array provide only a single duplicate for each number, so our sorted array looks like: 44 44 55 55 88 88 aa aa A slightly more interesting test is to have multiple duplicates, which makes sure that we not only skip the duplicate, but keep skipping until we are out of the set of matching duplicates. Unsurprisingly this works just fine, but it's worth beefing up this test since we're about to change the duplicate-detection code. Note that we do need to adjust the results on the lookup test, since it is returning the index of the found item (and now we have more items before our range, and the range itself is slightly larger, since we'll accept a match of any element). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9ca6f8 commit 3ea922f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

t/t0064-oid-array.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ test_expect_success 'ordered enumeration' '
2525
test_expect_success 'ordered enumeration with duplicate suppression' '
2626
echoid "" 44 55 88 aa >expect &&
2727
{
28+
echoid append 88 44 aa 55 &&
2829
echoid append 88 44 aa 55 &&
2930
echoid append 88 44 aa 55 &&
3031
echo for_each_unique
@@ -52,17 +53,19 @@ test_expect_success 'lookup non-existing entry' '
5253

5354
test_expect_success 'lookup with duplicates' '
5455
{
56+
echoid append 88 44 aa 55 &&
5557
echoid append 88 44 aa 55 &&
5658
echoid append 88 44 aa 55 &&
5759
echoid lookup 55
5860
} | test-tool oid-array >actual &&
5961
n=$(cat actual) &&
60-
test "$n" -ge 2 &&
61-
test "$n" -le 3
62+
test "$n" -ge 3 &&
63+
test "$n" -le 5
6264
'
6365

6466
test_expect_success 'lookup non-existing entry with duplicates' '
6567
{
68+
echoid append 88 44 aa 55 &&
6669
echoid append 88 44 aa 55 &&
6770
echoid append 88 44 aa 55 &&
6871
echoid lookup 66

0 commit comments

Comments
 (0)