Merge branch 'jk/sort-iter-test-output'
* jk/sort-iter-test-output: t: sort output of hashmap iteration
This commit is contained in:
@ -170,31 +170,45 @@ NULL
|
|||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'iterate' '
|
test_expect_success 'iterate' '
|
||||||
|
test-tool hashmap >actual.raw <<-\EOF &&
|
||||||
|
put key1 value1
|
||||||
|
put key2 value2
|
||||||
|
put fooBarFrotz value3
|
||||||
|
iterate
|
||||||
|
EOF
|
||||||
|
|
||||||
test_hashmap "put key1 value1
|
cat >expect <<-\EOF &&
|
||||||
put key2 value2
|
NULL
|
||||||
put fooBarFrotz value3
|
NULL
|
||||||
iterate" "NULL
|
NULL
|
||||||
NULL
|
fooBarFrotz value3
|
||||||
NULL
|
key1 value1
|
||||||
key2 value2
|
key2 value2
|
||||||
key1 value1
|
EOF
|
||||||
fooBarFrotz value3"
|
|
||||||
|
|
||||||
|
sort <actual.raw >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'iterate (case insensitive)' '
|
test_expect_success 'iterate (case insensitive)' '
|
||||||
|
test-tool hashmap ignorecase >actual.raw <<-\EOF &&
|
||||||
|
put key1 value1
|
||||||
|
put key2 value2
|
||||||
|
put fooBarFrotz value3
|
||||||
|
iterate
|
||||||
|
EOF
|
||||||
|
|
||||||
test_hashmap "put key1 value1
|
cat >expect <<-\EOF &&
|
||||||
put key2 value2
|
NULL
|
||||||
put fooBarFrotz value3
|
NULL
|
||||||
iterate" "NULL
|
NULL
|
||||||
NULL
|
fooBarFrotz value3
|
||||||
NULL
|
key1 value1
|
||||||
fooBarFrotz value3
|
key2 value2
|
||||||
key2 value2
|
EOF
|
||||||
key1 value1" ignorecase
|
|
||||||
|
|
||||||
|
sort <actual.raw >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'grow / shrink' '
|
test_expect_success 'grow / shrink' '
|
||||||
|
@ -86,17 +86,25 @@ NULL"
|
|||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'iterate' '
|
test_expect_success 'iterate' '
|
||||||
|
test-tool oidmap >actual.raw <<-\EOF &&
|
||||||
|
put one 1
|
||||||
|
put two 2
|
||||||
|
put three 3
|
||||||
|
iterate
|
||||||
|
EOF
|
||||||
|
|
||||||
test_oidmap "put one 1
|
# sort "expect" too so we do not rely on the order of particular oids
|
||||||
put two 2
|
sort >expect <<-EOF &&
|
||||||
put three 3
|
NULL
|
||||||
iterate" "NULL
|
NULL
|
||||||
NULL
|
NULL
|
||||||
NULL
|
$(git rev-parse one) 1
|
||||||
$(git rev-parse two) 2
|
$(git rev-parse two) 2
|
||||||
$(git rev-parse one) 1
|
$(git rev-parse three) 3
|
||||||
$(git rev-parse three) 3"
|
EOF
|
||||||
|
|
||||||
|
sort <actual.raw >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Reference in New Issue
Block a user