diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-01 19:10:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-01 19:10:50 +0300 |
| commit | 49541dbb36b4a6f68dfe341850aa20dcebbe7641 (patch) | |
| tree | 6a8f965ff0ed2c3b77e0fffea9d8e98f4e534c92 | |
| parent | cc2a7403fef8c3e19e8d5b3939e5a9ee4789fd86 (diff) | |
| parent | e1e7a77141bda8f2ab02f5ed8b0030cba793ec2d (diff) | |
Merge branch 'jk/sort-iter-test-output'
* jk/sort-iter-test-output:
t: sort output of hashmap iteration
| -rwxr-xr-x | t/t0011-hashmap.sh | 58 | ||||
| -rwxr-xr-x | t/t0016-oidmap.sh | 30 |
2 files changed, 55 insertions, 33 deletions
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh index 9c96b3e3b10..5343ffd3f92 100755 --- a/t/t0011-hashmap.sh +++ b/t/t0011-hashmap.sh @@ -170,31 +170,45 @@ NULL ' test_expect_success 'iterate' ' - -test_hashmap "put key1 value1 -put key2 value2 -put fooBarFrotz value3 -iterate" "NULL -NULL -NULL -key2 value2 -key1 value1 -fooBarFrotz value3" - + test-tool hashmap >actual.raw <<-\EOF && + put key1 value1 + put key2 value2 + put fooBarFrotz value3 + iterate + EOF + + cat >expect <<-\EOF && + NULL + NULL + NULL + fooBarFrotz value3 + key1 value1 + key2 value2 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_expect_success 'iterate (case insensitive)' ' - -test_hashmap "put key1 value1 -put key2 value2 -put fooBarFrotz value3 -iterate" "NULL -NULL -NULL -fooBarFrotz value3 -key2 value2 -key1 value1" ignorecase - + test-tool hashmap ignorecase >actual.raw <<-\EOF && + put key1 value1 + put key2 value2 + put fooBarFrotz value3 + iterate + EOF + + cat >expect <<-\EOF && + NULL + NULL + NULL + fooBarFrotz value3 + key1 value1 + key2 value2 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_expect_success 'grow / shrink' ' diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh index bbe719e9509..31f8276ba82 100755 --- a/t/t0016-oidmap.sh +++ b/t/t0016-oidmap.sh @@ -86,17 +86,25 @@ NULL" ' test_expect_success 'iterate' ' - -test_oidmap "put one 1 -put two 2 -put three 3 -iterate" "NULL -NULL -NULL -$(git rev-parse two) 2 -$(git rev-parse one) 1 -$(git rev-parse three) 3" - + test-tool oidmap >actual.raw <<-\EOF && + put one 1 + put two 2 + put three 3 + iterate + EOF + + # sort "expect" too so we do not rely on the order of particular oids + sort >expect <<-EOF && + NULL + NULL + NULL + $(git rev-parse one) 1 + $(git rev-parse two) 2 + $(git rev-parse three) 3 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_done |