From 56d34235bb54f136226a76add3ed9411e57587b7 Mon Sep 17 00:00:00 2001 From: CismonX Date: Tue, 28 Aug 2018 22:11:09 +0800 Subject: [PATCH] Fix bug. Refactor test code. --- src/collections_methods.c | 2 +- tests/000-loaded.phpt | 3 ++- tests/001-pair.phpt | 3 ++- tests/002-init.phpt | 3 ++- tests/003-add-all.phpt | 3 ++- tests/004-all-any-none.phpt | 9 ++++++--- tests/005-associate.phpt | 6 ++++-- tests/006-associate-by.phpt | 12 +++++++----- tests/007-average.phpt | 3 ++- tests/008-contains-all.phpt | 3 ++- tests/009-contains-key-value.phpt | 6 ++++-- tests/010-copy-of.phpt | 8 ++++++-- tests/011-copy-of-range.phpt | 3 ++- tests/012-countable.phpt | 6 ++++-- tests/013-array-access.phpt | 12 ++++++++---- tests/014-drop.phpt | 8 +++++--- tests/015-drop-while.phpt | 8 +++++--- tests/016-fill.phpt | 3 ++- tests/017-filter.phpt | 6 ++++-- tests/018-first-last.phpt | 8 +++++--- tests/019-flat-map.phpt | 6 ++++-- tests/020-to-collection.phpt | 3 ++- tests/021-to-pairs.phpt | 6 ++++-- tests/022-flatten.phpt | 3 ++- tests/023-min-max.phpt | 17 +++++++++++------ tests/024-keys-values.phpt | 6 ++++-- tests/025-single.phpt | 3 ++- tests/026-is-empty.phpt | 6 ++++-- tests/027-get-set-remove.phpt | 13 +++++++++---- tests/028-min-max-by.phpt | 12 ++++++++---- tests/029-remove-retain-all.phpt | 9 ++++++--- tests/030-foreach-oneach.phpt | 9 ++++++--- tests/031-partition.phpt | 3 ++- tests/032-reverse-reversed.phpt | 6 ++++-- tests/033-take.phpt | 14 ++++++++++---- tests/034-take-while.phpt | 6 ++++-- tests/035-index-of.phpt | 12 ++++++++---- tests/036-slice.phpt | 3 ++- tests/037-map.phpt | 8 ++++++-- tests/038-put-all.phpt | 3 ++- tests/039-reduce.phpt | 6 ++++-- tests/040-packed.phpt | 3 ++- tests/041-fold.phpt | 6 ++++-- tests/042-shuffle-shuffled.phpt | 12 ++++++++---- tests/043-min-max-with.phpt | 6 ++++-- tests/044-sort-with-sorted-with.phpt | 6 ++++-- tests/045-sort-sorted.phpt | 15 ++++++++++----- tests/046-sort-by-sorted-by.phpt | 15 ++++++++++----- tests/047-distinct.phpt | 14 +++++++++----- 49 files changed, 230 insertions(+), 116 deletions(-) diff --git a/src/collections_methods.c b/src/collections_methods.c index 369d44a..075c36d 100644 --- a/src/collections_methods.c +++ b/src/collections_methods.c @@ -361,7 +361,7 @@ static zend_always_inline void zend_hash_distinct(zend_array* ht, Bucket* ref, c { ref[num_elements].h = UINT32_MAX; ZVAL_UNDEF(&ref[num_elements].val); - uint32_t min_offset = UINT32_MAX; + uint32_t min_offset = ref[0].h; for (idx = 1; idx <= num_elements; ++idx) { Bucket* bucket = &ref[idx]; diff --git a/tests/000-loaded.phpt b/tests/000-loaded.phpt index 9dbe333..1841399 100644 --- a/tests/000-loaded.phpt +++ b/tests/000-loaded.phpt @@ -2,7 +2,8 @@ Check whether the extension is loaded. --FILE-- --EXPECT-- diff --git a/tests/001-pair.phpt b/tests/001-pair.phpt index 1a49e61..7e0c2a2 100644 --- a/tests/001-pair.phpt +++ b/tests/001-pair.phpt @@ -3,7 +3,8 @@ Test Pair. --FILE-- first != 'foo' || $pair->second != 'bar') +if ($pair->first != 'foo' || $pair->second != 'bar') { echo 'Test for Pair failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/002-init.phpt b/tests/002-init.phpt index 10060d4..09964c5 100644 --- a/tests/002-init.phpt +++ b/tests/002-init.phpt @@ -6,7 +6,8 @@ $array = ['a' => 'b']; $collection = Collection::init($array); $collection1 = Collection::init($collection); $collection2 = Collection::init(); -if ($array != $collection1->toArray() || $collection2->toArray() != []) +if ($array != $collection1->toArray() || $collection2->toArray() != []) { echo 'Collection::init() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/003-add-all.phpt b/tests/003-add-all.phpt index 7936fca..4a067d7 100644 --- a/tests/003-add-all.phpt +++ b/tests/003-add-all.phpt @@ -6,7 +6,8 @@ $array = [3, 7, 5, 6, 1, 2]; $collection = Collection::init([6, 1, 2]); $collection2 = Collection::init([3, 7, 5]); $collection2->addAll($collection); -if ($array != $collection2->toArray()) +if ($array != $collection2->toArray()) { echo 'Collection::addAll() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/004-all-any-none.phpt b/tests/004-all-any-none.phpt index e591f2c..270482b 100644 --- a/tests/004-all-any-none.phpt +++ b/tests/004-all-any-none.phpt @@ -9,23 +9,26 @@ $result = $collection->all(function ($value) { $result1 = $collection->all(function ($value, $key) { return strlen($key) < 4; }); -if ($result || !$result1) +if ($result || !$result1) { echo 'Collection::all() failed.', PHP_EOL; +} $result = $collection->any(function ($value) { return $value % 3 == 0; }); $result1 = $collection->any(function ($value, $key) { return strpos($key, 'g') !== false; }); -if (!$result || $result1) +if (!$result || $result1) { echo 'Collection::any() failed.', PHP_EOL; +} $result = $collection->none(function ($value) { return $value < 0; }); $result1 = $collection->none(function ($value, $key) { return ctype_alnum($value . $key); }); -if (!$result || $result1) +if (!$result || $result1) { echo 'Collection::none() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/005-associate.phpt b/tests/005-associate.phpt index f7a602c..e1242f0 100644 --- a/tests/005-associate.phpt +++ b/tests/005-associate.phpt @@ -7,15 +7,17 @@ $collection = Collection::init($array) ->associate(function ($value, $key) { return new Pair($value, $key); }); -if ($collection->toArray() != array_flip($array)) +if ($collection->toArray() != array_flip($array)) { echo 'Collection::associate() failed.', PHP_EOL; +} $array1 = ['baz' => 1]; $collection1 = Collection::init($array1); $array2 = $collection->associateTo($collection1, function ($value, $key) { return new Pair($key, $value); })->toArray(); -if ($array2 != $array1 + array_flip($array) || $collection1->toArray() != $array2) +if ($array2 != $array1 + array_flip($array) || $collection1->toArray() != $array2) { echo 'Collection::associateTo() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/006-associate-by.phpt b/tests/006-associate-by.phpt index 1e93a86..74c4aa4 100644 --- a/tests/006-associate-by.phpt +++ b/tests/006-associate-by.phpt @@ -7,14 +7,16 @@ $collection = Collection::init($array) ->associateBy(function ($value, $key) { return strlen($key) - 1; }); -if ($collection->toArray() != array_values($array)) +if ($collection->toArray() != array_values($array)) { echo 'Collection::associateBy() failed.', PHP_EOL; -$array1 = ['foo' => 'bar']; -$collection1 = Collection::init($array1); -$array2 = $collection->associateByTo($collection1, function ($value, $key) { +} +$array = ['foo' => 'bar']; +$collection = Collection::init($array); +$array1 = $collection->associateByTo($collection, function ($value, $key) { return $key; })->toArray(); -if ($array2 != $array1 + $collection->toArray() || $collection1->toArray() != $array2) +if ($array1 != $array + $collection->toArray() || $collection->toArray() != $array1) { echo 'Collection::associateTo() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/007-average.phpt b/tests/007-average.phpt index c6ec97e..47c2f39 100644 --- a/tests/007-average.phpt +++ b/tests/007-average.phpt @@ -4,7 +4,8 @@ Test Collection::average(). average(); -if ($average != array_sum($array) / count($array)) +if ($average != array_sum($array) / count($array)) { echo 'Collection::average() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/008-contains-all.phpt b/tests/008-contains-all.phpt index a0842c0..dd8a44e 100644 --- a/tests/008-contains-all.phpt +++ b/tests/008-contains-all.phpt @@ -5,7 +5,8 @@ Test Collection::containsAll(). $array = [[], 1, 't']; $array1 = [2, ['t'], 5]; $collection = Collection::init([1, 2, 't', [], 5]); -if (!$collection->containsAll($array) || $collection->containsAll($array1)) +if (!$collection->containsAll($array) || $collection->containsAll($array1)) { echo 'Collection::containsAll() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/009-contains-key-value.phpt b/tests/009-contains-key-value.phpt index f63f44a..2a8ad90 100644 --- a/tests/009-contains-key-value.phpt +++ b/tests/009-contains-key-value.phpt @@ -3,9 +3,11 @@ Test Collection::containsKey() and Collection::containsValue(). --FILE-- 'bar', 12 => 6, 'baz' => 27]); -if (!$collection->containsKey('foo') || $collection->containsKey('Baz')) +if (!$collection->containsKey('foo') || $collection->containsKey('Baz')) { echo 'Collection::containsKey() failed.', PHP_EOL; -if (!$collection->containsValue(27) || $collection->containsValue(3)) +} +if (!$collection->containsValue(27) || $collection->containsValue(3)) { echo 'Collection::containsValue() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/010-copy-of.phpt b/tests/010-copy-of.phpt index 5fd2aa0..62a90f9 100644 --- a/tests/010-copy-of.phpt +++ b/tests/010-copy-of.phpt @@ -5,8 +5,12 @@ Test Collection::copyOf(); $array = ['a' => 2, 3 => 'd', 'e' => 'f']; $collection = Collection::init($array); $collection1 = $collection->copyOf(2); -$collection2 = $collection->copyOf(); -if ($collection1->toArray() != array_slice($array, 0, 2, true) || $collection2->toArray() != $array) +if ($collection1->toArray() != array_slice($array, 0, 2, true)) { echo 'Collection::copyOf() failed.', PHP_EOL; +} +$collection1 = $collection->copyOf(); +if ($collection1->toArray() != $array) { + echo 'Collection::copyOf() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/011-copy-of-range.phpt b/tests/011-copy-of-range.phpt index 706905b..df6d81a 100644 --- a/tests/011-copy-of-range.phpt +++ b/tests/011-copy-of-range.phpt @@ -9,7 +9,8 @@ $array = [3, 7, 6, 9, 2]; $array1 = ['a' => 'b', 'c', 'd' => 'e']; $array2 = Collection::init($array)->copyOfRange(2, 4)->toArray(); $array3 = Collection::init($array1)->copyOfRange(1, 2)->toArray(); -if ($array2 != array_slice($array, 2, 4) || $array3 != array_slice($array1, 1, 2)) +if ($array2 != array_slice($array, 2, 4) || $array3 != array_slice($array1, 1, 2)) { echo 'Collection::copyOfRange() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/012-countable.phpt b/tests/012-countable.phpt index 17b32cf..c787694 100644 --- a/tests/012-countable.phpt +++ b/tests/012-countable.phpt @@ -4,9 +4,11 @@ Test Collection::count() and implementation of interface Countable. count() != count($array)) +if ($collection->count() != count($array)) { echo 'Collection::count() failed.', PHP_EOL; -if (count($collection) != count($array)) +} +if (count($collection) != count($array)) { echo 'Test for handlers.count_elements failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/013-array-access.phpt b/tests/013-array-access.phpt index a75367d..f60a520 100644 --- a/tests/013-array-access.phpt +++ b/tests/013-array-access.phpt @@ -7,13 +7,17 @@ $collection = Collection::init($array); $collection['a'] = 'foo'.strval(123); $collection['h'] = 'bar'; unset($collection['c']); -if (empty($collection) || isset($collection['t']) || !isset($collection['e'])) +if (empty($collection) || isset($collection['t']) || !isset($collection['e'])) { echo 'Test for handlers.has_dimension failed.', PHP_EOL; -if ($collection['e']['f'] != 'g') +} +if ($collection['e']['f'] != 'g') { echo 'Test for handlers.read_dimension failed.', PHP_EOL; -if ($collection['a'] != 'foo'.strval(123) || $collection['h'] != 'bar') +} +if ($collection['a'] != 'foo'.strval(123) || $collection['h'] != 'bar') { echo 'Test for handlers.write_dimension failed.', PHP_EOL; -if (isset($collection['c'])) +} +if (isset($collection['c'])) { echo 'Test for handlers.unset_dimension failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/014-drop.phpt b/tests/014-drop.phpt index d98554c..14869c2 100644 --- a/tests/014-drop.phpt +++ b/tests/014-drop.phpt @@ -4,10 +4,12 @@ Test Collection::drop() and Collection::dropLast(). 'c', 'd', 'e' => 'f', 12, 34]); $collection1 = $collection->drop(2); -$collection2 = $collection->dropLast(3); -if ($collection1->toArray() != ['e' => 'f', 1 => 12, 2 => 34]) +if ($collection1->toArray() != ['e' => 'f', 1 => 12, 2 => 34]) { echo 'Collection::drop() failed.', PHP_EOL; -if ($collection2->toArray() != ['ab' => 'c', 'd']) +} +$collection1 = $collection->dropLast(3); +if ($collection1->toArray() != ['ab' => 'c', 'd']) { echo 'Collection::dropLast() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/015-drop-while.phpt b/tests/015-drop-while.phpt index 012e046..7630048 100644 --- a/tests/015-drop-while.phpt +++ b/tests/015-drop-while.phpt @@ -6,12 +6,14 @@ $collection = Collection::init([5, 7, 1, 4, 3]); $collection1 = $collection->dropWhile(function ($value) { return $value % 2; }); -if ($collection1->toArray() != [3 => 4, 4 => 3]) +if ($collection1->toArray() != [3 => 4, 4 => 3]) { echo 'Collection::dropWhile() failed.', PHP_EOL; -$collection2 = $collection->dropLastWhile(function ($value) { +} +$collection1 = $collection->dropLastWhile(function ($value) { return $value < 6; }); -if ($collection2->toArray() != [5, 7]) +if ($collection1->toArray() != [5, 7]) { echo 'Collection::dropLastWhile() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/016-fill.phpt b/tests/016-fill.phpt index f386991..1fb5d7c 100644 --- a/tests/016-fill.phpt +++ b/tests/016-fill.phpt @@ -9,7 +9,8 @@ $array1 = ['foo', 'bar' => 't', 't', 't', 3]; $collection1 = Collection::init($array); $collection1->fill(0); $array2 = [0, 'bar' => 0, 0, 0, 0]; -if ($collection->toArray() != $array1 || $collection1->toArray() != $array2) +if ($collection->toArray() != $array1 || $collection1->toArray() != $array2) { echo 'Collection::fill() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/017-filter.phpt b/tests/017-filter.phpt index 0dc333e..d583fee 100644 --- a/tests/017-filter.phpt +++ b/tests/017-filter.phpt @@ -11,10 +11,12 @@ $pred_is_even = function ($value) { }; $collection = Collection::init($array)->filter($pred_is_odd); $collection1 = Collection::init($array)->filterNot($pred_is_odd); -if ($collection->toArray() != array_values(array_filter($array, $pred_is_odd))) +if ($collection->toArray() != array_values(array_filter($array, $pred_is_odd))) { echo 'Collection::filter() failed.', PHP_EOL; -if ($collection1->toArray() != array_values(array_filter($array, $pred_is_even))) +} +if ($collection1->toArray() != array_values(array_filter($array, $pred_is_even))) { echo 'Collection::filterNot() failed.', PHP_EOL; +} $dest = Collection::init($array); $collection2 = Collection::init($array)->filterTo($dest, $pred_is_odd); if ($collection2->toArray() != array_merge($array, $collection->toArray())) diff --git a/tests/018-first-last.phpt b/tests/018-first-last.phpt index 09ebf0b..5d467b6 100644 --- a/tests/018-first-last.phpt +++ b/tests/018-first-last.phpt @@ -8,12 +8,14 @@ $collection1 = Collection::init(); $value = $collection->first(function ($value) { return $value > 0; }); -if ($value != 1 || $collection->first() != -5 || $collection1->first() != null) +if ($value != 1 || $collection->first() != -5 || $collection1->first() != null) { echo 'Collection::first() failed.', PHP_EOL; +} $value1 = $collection->last(function ($value) { return $value % 2 == 0; }); -if ($value1 != 8 || $collection->last() != 9 || $collection1->last() != null) - echo 'Collection::last() failed.', PHP_EOL; +if ($value1 != 8 || $collection->last() != 9 || $collection1->last() != null) { + echo 'Collection::last() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/019-flat-map.phpt b/tests/019-flat-map.phpt index c42ef66..3d6f2c8 100644 --- a/tests/019-flat-map.phpt +++ b/tests/019-flat-map.phpt @@ -6,13 +6,15 @@ $array = [['a' => ['b', 'c'], 'd' => ['e', 'f']], ['a' => ['g', 'h'], 'd' => ['i $collection = Collection::init($array)->flatMap(function ($value) { return $value['a']; }); -if ($collection->toArray() != ['b', 'c', 'g', 'h']) +if ($collection->toArray() != ['b', 'c', 'g', 'h']) { echo 'Collection::flatMap() failed.', PHP_EOL; +} $collection1 = Collection::init(['k', 'l']); $collection2 = Collection::init($array)->flatMapTo($collection1, function ($value) { return Collection::init($value['d']); }); -if ($collection2->toArray() != ['k', 'l', 'e', 'f', 'i', 'j']) +if ($collection2->toArray() != ['k', 'l', 'e', 'f', 'i', 'j']) { echo 'Collection::flatMap() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/020-to-collection.phpt b/tests/020-to-collection.phpt index 4ab06d2..7898a2d 100644 --- a/tests/020-to-collection.phpt +++ b/tests/020-to-collection.phpt @@ -4,7 +4,8 @@ Test Collection::toCollection(). toCollection($collection); -if ($collection->toArray() != ['a', 'b', 'foo', 'bar']) +if ($collection->toArray() != ['a', 'b', 'foo', 'bar']) { echo 'Collection::toCollection() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/021-to-pairs.phpt b/tests/021-to-pairs.phpt index 4d1f8dd..020193d 100644 --- a/tests/021-to-pairs.phpt +++ b/tests/021-to-pairs.phpt @@ -4,9 +4,11 @@ Test Collection::toPairs(). 'b', 'c' => 'd'])->toPairs(); $test = ''; -foreach ($pairs as $pair) +foreach ($pairs as $pair) { $test .= $pair->first . ',' . $pair->second . ';'; -if ($test != 'a,b;c,d;') +} +if ($test != 'a,b;c,d;') { echo 'Collection::toPairs() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/022-flatten.phpt b/tests/022-flatten.phpt index 0e2f835..629c5aa 100644 --- a/tests/022-flatten.phpt +++ b/tests/022-flatten.phpt @@ -4,7 +4,8 @@ Test Collection::flatten(). 'b'], ['c', 'd', ['e']], 'bar' => 'f']; $collection = Collection::init($array)->flatten(); -if ($collection->toArray() != ['a', 'foo' => 'b', 'c', 'd', ['e'], 'bar' => 'f']) +if ($collection->toArray() != ['a', 'foo' => 'b', 'c', 'd', ['e'], 'bar' => 'f']) { echo 'Collection::flatten() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/023-min-max.phpt b/tests/023-min-max.phpt index 9e8cfee..d683195 100644 --- a/tests/023-min-max.phpt +++ b/tests/023-min-max.phpt @@ -4,15 +4,20 @@ Test Collection::min() and Collection::max(). max() != max($array) || Collection::init()->max() != null) +if ($collection->max() != max($array) || Collection::init()->max() != null) { echo 'Collection::max() failed.', PHP_EOL; -if ($collection->min() != min($array) || Collection::init()->min() != null) +} +if ($collection->min() != min($array) || Collection::init()->min() != null) { echo 'Collection::min() failed.', PHP_EOL; -$array1 = ['p3.4', 'p3.32', 'p10.2']; -$collection1 = Collection::init($array1); -if ($collection1->max() != $array1[0] || $collection1->max(Collection::COMPARE_NATRUAL) != $array1[2]) +} + +$array = ['p3.4', 'p3.32', 'p10.2']; +$collection = Collection::init($array); +if ($collection->max() != $array[0] || $collection->max(Collection::COMPARE_NATRUAL) != $array[2]) { echo 'Collection::max() failed.', PHP_EOL; -if ($collection1->min() != $array1[2] || $collection1->min(Collection::COMPARE_NATRUAL) != $array1[0]) +} +if ($collection->min() != $array[2] || $collection->min(Collection::COMPARE_NATRUAL) != $array[0]) { echo 'Collection::min() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/024-keys-values.phpt b/tests/024-keys-values.phpt index 667b39e..6b60eaf 100644 --- a/tests/024-keys-values.phpt +++ b/tests/024-keys-values.phpt @@ -4,9 +4,11 @@ Test Collection::keys() and Collection::values(). 'b', 'c' => ['d'], 10 => 'f']; $collection = Collection::init($array); -if ($collection->keys()->toArray() != array_keys($array)) +if ($collection->keys()->toArray() != array_keys($array)) { echo 'Collection::keys() failed.', PHP_EOL; -if ($collection->values()->toArray() != array_values($array)) +} +if ($collection->values()->toArray() != array_values($array)) { echo 'Collection::values() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/025-single.phpt b/tests/025-single.phpt index c78a57a..e3072d0 100644 --- a/tests/025-single.phpt +++ b/tests/025-single.phpt @@ -13,7 +13,8 @@ $value1 = $collection->single(function ($value) { $value2 = $collection->single(function ($value, $key) { return $key > 5; }); -if (isset($value) || $value1 != 'cd' || isset($value2)) +if (isset($value) || $value1 != 'cd' || isset($value2)) { echo 'Collection::single() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/026-is-empty.phpt b/tests/026-is-empty.phpt index 62d0baf..81230ca 100644 --- a/tests/026-is-empty.phpt +++ b/tests/026-is-empty.phpt @@ -2,9 +2,11 @@ Test Collection::isEmpty() and Collection::isNotEmpty(). --FILE-- isEmpty()) +if (!Collection::init()->isEmpty()) { echo 'Collection::isEmpty() failed.', PHP_EOL; -if (!Collection::init(['foo', 'bar'])->isNotEmpty()) +} +if (!Collection::init(['foo', 'bar'])->isNotEmpty()) { echo 'Collection::isNotEmpty() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/027-get-set-remove.phpt b/tests/027-get-set-remove.phpt index f733133..0ceb6e5 100644 --- a/tests/027-get-set-remove.phpt +++ b/tests/027-get-set-remove.phpt @@ -8,14 +8,19 @@ $collection->set('a', 'foo'); $collection->set('e', 'bar'); $array['a'] = 'foo'; $array['e'] = 'bar'; -if ($collection->toArray() != $array) +if ($collection->toArray() != $array) { echo 'Collection::set() failed.', PHP_EOL; +} if ($collection->get('a') != $array['a'] || - $collection->get('f', function ($key) { return $key; }) != 'f') + $collection->get('f', function ($key) { return $key; }) != 'f' +) { echo 'Collection::get() failed.', PHP_EOL; -if (!$collection->remove('a') || !is_null($collection->get('a'))) +} +if (!$collection->remove('a') || !is_null($collection->get('a'))) { echo 'Collection::remove() failed.', PHP_EOL; -if ($collection->remove('c', 'e') || $collection->get('c') != 'd') +} +if ($collection->remove('c', 'e') || $collection->get('c') != 'd') { echo 'Collection::remove() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/028-min-max-by.phpt b/tests/028-min-max-by.phpt index f534341..b8d6ea4 100644 --- a/tests/028-min-max-by.phpt +++ b/tests/028-min-max-by.phpt @@ -11,13 +11,15 @@ $collection = Collection::init($array); $result = $collection->maxBy(function ($value) { return $value[0]; }); -if ($result != $array[1]) +if ($result != $array[1]) { echo 'Collection::maxBy() failed.', PHP_EOL; +} $result = $collection->minBy(function ($value) { return $value[2]; }); -if ($result != $array[0]) +if ($result != $array[0]) { echo 'Collection::minBy() failed.', PHP_EOL; +} $array1 = [ ['abc', 'ABD'], ['ACE', 'ABC'], @@ -27,12 +29,14 @@ $collection1 = Collection::init($array1); $result = $collection1->maxBy(function ($value) { return $value[0]; }); -if ($result != $array1[2]) +if ($result != $array1[2]) { echo 'Collection::maxBy() failed.', PHP_EOL; +} $result = $collection1->minBy(function ($value) { return $value[1]; }, Collection::FOLD_CASE); -if ($result != $array1[2]) +if ($result != $array1[2]) { echo 'Collection::minBy() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/029-remove-retain-all.phpt b/tests/029-remove-retain-all.phpt index f10d883..64e5566 100644 --- a/tests/029-remove-retain-all.phpt +++ b/tests/029-remove-retain-all.phpt @@ -8,14 +8,17 @@ $pred_is_odd = function ($value) { }; $collection = Collection::init($array); $collection->removeAll($pred_is_odd); -if ($collection->toArray() != ['a' => 4, 'd' => -2, 'e' => 0]) +if ($collection->toArray() != ['a' => 4, 'd' => -2, 'e' => 0]) { echo 'Collection::removeAll() failed.', PHP_EOL; +} $collection->removeAll(); -if ($collection->toArray() != []) +if ($collection->toArray() != []) { echo 'Collection::removeAll() failed.', PHP_EOL; +} $collection = Collection::init($array); $collection->retainAll($pred_is_odd); -if ($collection->toArray() != ['b' => 1, 'c' => 9]) +if ($collection->toArray() != ['b' => 1, 'c' => 9]) { echo 'Collection::retainAll() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/030-foreach-oneach.phpt b/tests/030-foreach-oneach.phpt index e4eb3e9..23d57c2 100644 --- a/tests/030-foreach-oneach.phpt +++ b/tests/030-foreach-oneach.phpt @@ -4,8 +4,9 @@ Test Collection::forEach() and Collection::onEach(). forEach(function ($value) use (&$result1) { $result1 .= $value; @@ -13,9 +14,11 @@ $collection->forEach(function ($value) use (&$result1) { $collection1 = $collection->onEach(function ($value) use (&$result2) { $result2 .= $value; }); -if ($result1 != $result) +if ($result1 != $result) { echo 'Collection::forEach() failed.', PHP_EOL; -if ($result2 != $result || $collection1->toArray() != $collection->toArray()) +} +if ($result2 != $result || $collection1->toArray() != $collection->toArray()) { echo 'Collection::onEach() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/031-partition.phpt b/tests/031-partition.phpt index 9374945..1e16917 100644 --- a/tests/031-partition.phpt +++ b/tests/031-partition.phpt @@ -6,7 +6,8 @@ $array = ['abc', 'd', 'ef', 'ghij']; $pair = Collection::init($array)->partition(function ($value) { return strlen($value) % 2; }); -if ($pair->first != ['abc', 'd'] || $pair->second != ['ef', 'ghij']) +if ($pair->first != ['abc', 'd'] || $pair->second != ['ef', 'ghij']) { echo 'Collection::partition() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/032-reverse-reversed.phpt b/tests/032-reverse-reversed.phpt index 21ee017..fb709bb 100644 --- a/tests/032-reverse-reversed.phpt +++ b/tests/032-reverse-reversed.phpt @@ -5,9 +5,11 @@ Test Collection::reverse() and Collection::reversed(). $array = ['a', 'b', 'c', 'd', 'e']; $collection = Collection::init($array); $collection->reverse(); -if ($collection->toArray() != array_reverse($array)) +if ($collection->toArray() != array_reverse($array)) { echo 'Collection::reverse() failed.', PHP_EOL; -if ($collection->reversed()->toArray() != $array) +} +if ($collection->reversed()->toArray() != $array) { echo 'Collection::reversed() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/033-take.phpt b/tests/033-take.phpt index 61ee3f9..7dbabda 100644 --- a/tests/033-take.phpt +++ b/tests/033-take.phpt @@ -4,11 +4,17 @@ Test Collection::take() and Collection::takeLast(). take(0)->toArray() != [] || $collection->take(6)->toArray() != $array || - $collection->take(3)->toArray() != array_slice($array, 0, 3)) +if ($collection->take(0)->toArray() != [] || + $collection->take(6)->toArray() != $array || + $collection->take(3)->toArray() != array_slice($array, 0, 3) +) { echo 'Collection::take() failed.', PHP_EOL; -if ($collection->takeLast(0)->toArray() != [] || $collection->takeLast(10)->toArray() != $array || - $collection->takeLast(4)->toArray() != array_slice($array, -4, 4)) +} +if ($collection->takeLast(0)->toArray() != [] || + $collection->takeLast(10)->toArray() != $array || + $collection->takeLast(4)->toArray() != array_slice($array, -4, 4) +) { echo 'Collection::takeLast() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/034-take-while.phpt b/tests/034-take-while.phpt index 3969d9d..6e41f1a 100644 --- a/tests/034-take-while.phpt +++ b/tests/034-take-while.phpt @@ -7,12 +7,14 @@ $collection = Collection::init($array); $collection1 = $collection->takeWhile(function ($value) { return ord($value) > ord('Z'); }); -if ($collection1->toArray() != ['a', 'b']) +if ($collection1->toArray() != ['a', 'b']) { echo 'Collection::takeWhile() failed.', PHP_EOL; +} $collection2 = $collection->takeLastWhile(function ($value) { return $value != 'b'; }); -if ($collection2->toArray() != ['C', 'D', 'e']) +if ($collection2->toArray() != ['C', 'D', 'e']) { echo 'Collection::takeLastWhile() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/035-index-of.phpt b/tests/035-index-of.phpt index a99db7b..613ebc8 100644 --- a/tests/035-index-of.phpt +++ b/tests/035-index-of.phpt @@ -4,20 +4,24 @@ Test Collection::indexOf(), Collection::lastIndexOf(), Collection::indexOfFirst( indexOf('f'); -if ($first_f_at != 3) +if ($first_f_at != 3) { echo 'Collection::indexOf() failed.', PHP_EOL; +} $last_f_at = $collection->lastIndexOf('f'); -if ($last_f_at != 7) +if ($last_f_at != 7) { echo 'Collection::lastIndexOf() failed.', PHP_EOL; +} $first_numeric_at = $collection->indexOfFirst(function ($value) { return is_numeric($value); }); -if ($first_numeric_at != 2) +if ($first_numeric_at != 2) { echo 'Collection::indexOfFirst() failed.', PHP_EOL; +} $last_upper_case_at = $collection->indexOfLast(function ($value) { return ctype_upper($value); }); -if ($last_upper_case_at != 6) +if ($last_upper_case_at != 6) { echo 'Collection::indexOfLast() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/036-slice.phpt b/tests/036-slice.phpt index ec3b550..3b43582 100644 --- a/tests/036-slice.phpt +++ b/tests/036-slice.phpt @@ -6,7 +6,8 @@ $array = [1, 2, 3, 4, 5, 6]; $collection = Collection::init($array)->slice([2, -1, 3, 6]); $array1 = ['a' => 'b', 'c' => 'd', 'e' => 'f']; $collection1 = Collection::init($array1)->slice(['c', 'a', 'g']); -if ($collection->toArray() != [3, 4] || $collection1->toArray() != ['c' => 'd', 'a' => 'b']) +if ($collection->toArray() != [3, 4] || $collection1->toArray() != ['c' => 'd', 'a' => 'b']) { echo 'Collection::slice() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/037-map.phpt b/tests/037-map.phpt index 449ab8c..3b060a9 100644 --- a/tests/037-map.phpt +++ b/tests/037-map.phpt @@ -6,13 +6,17 @@ $array = ['foo' => 'bar', 'bar' => 'baz']; $collection = Collection::init($array)->map(function ($value, $key) { return $key.$value; }); -if ($collection->toArray() != ['foobar', 'barbaz']) +if ($collection->toArray() != ['foobar', 'barbaz']) { echo 'Collection::map() failed.', PHP_EOL; +} $collection1 = Collection::init(['dummy']); $collection2 = Collection::init($array)->mapTo($collection1, function ($value, $key) { return $value.$key; }); -if ($collection1->toArray() != $collection2->toArray() || $collection1->toArray() != ['dummy', 'barfoo','bazbar']) +if ($collection1->toArray() != $collection2->toArray() || + $collection1->toArray() != ['dummy', 'barfoo','bazbar'] +) { echo 'Collection::mapTo() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/038-put-all.phpt b/tests/038-put-all.phpt index 554d89f..813ed11 100644 --- a/tests/038-put-all.phpt +++ b/tests/038-put-all.phpt @@ -6,7 +6,8 @@ $array = ['a' => 'foo', 'b' => 'bar']; $array1 = ['a' => 'b', 'c' => 'd', 'e' => 'f']; $collection = Collection::init($array); $collection->putAll($array1); -if ($collection->toArray() != array_merge($array, $array1)) +if ($collection->toArray() != array_merge($array, $array1)) { echo 'Collection::putAll() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/039-reduce.phpt b/tests/039-reduce.phpt index 64c6869..ba33e12 100644 --- a/tests/039-reduce.phpt +++ b/tests/039-reduce.phpt @@ -6,9 +6,11 @@ $collection = Collection::init(['a', 'b', 'c', 'd', 'e']); $reduce_cb = function ($acc, $value, $key) { return $acc.$value.strval($key); }; -if ($collection->reduce($reduce_cb) != 'ab1c2d3e4') +if ($collection->reduce($reduce_cb) != 'ab1c2d3e4') { echo 'Collection::reduce() failed.', PHP_EOL; -if ($collection->reduceRight($reduce_cb) != 'ed3c2b1a0') +} +if ($collection->reduceRight($reduce_cb) != 'ed3c2b1a0') { echo 'Collection::reduceRight() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/040-packed.phpt b/tests/040-packed.phpt index 7f47f05..2910a73 100644 --- a/tests/040-packed.phpt +++ b/tests/040-packed.phpt @@ -5,7 +5,8 @@ Test Collection::packed(). $case = Collection::init(['a', 'b', 'c'])->packed(); $case1 = Collection::init(['foo' => 'bar', 'baz'])->packed(); $case2 = Collection::init()->packed(); -if (!$case || $case1 || $case2) +if (!$case || $case1 || $case2) { echo 'Collection::packed() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/041-fold.phpt b/tests/041-fold.phpt index 4b22faa..618f5fb 100644 --- a/tests/041-fold.phpt +++ b/tests/041-fold.phpt @@ -6,9 +6,11 @@ $collection = Collection::init(['a', 'b', 'c', 'd', 'e']); $reduce_cb = function ($acc, $value, $key) { return $acc.$value.strval($key); }; -if ($collection->fold('foo', $reduce_cb) != 'fooa0b1c2d3e4') +if ($collection->fold('foo', $reduce_cb) != 'fooa0b1c2d3e4') { echo 'Collection::fold() failed.', PHP_EOL; -if ($collection->foldRight('bar', $reduce_cb) != 'bare4d3c2b1a0') +} +if ($collection->foldRight('bar', $reduce_cb) != 'bare4d3c2b1a0') { echo 'Collection::foldRight() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/042-shuffle-shuffled.phpt b/tests/042-shuffle-shuffled.phpt index 43b8a2f..666b717 100644 --- a/tests/042-shuffle-shuffled.phpt +++ b/tests/042-shuffle-shuffled.phpt @@ -7,26 +7,30 @@ $array = ['a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5]; for ($i = 0; ; ++$i) { $collection = Collection::init($array); $collection->shuffle(); - if ($collection->toArray() != array_values($array)) + if ($collection->toArray() != array_values($array)) { break; + } if ($i > 10) { echo 'Collection::shuffle() failed.', PHP_EOL; exit; } } -if (array_sum($array) != array_sum($collection->toArray())) +if (array_sum($array) != array_sum($collection->toArray())) { echo 'Collection::shuffle() failed.', PHP_EOL; +} for ($i = 0; ; ++$i) { $shuffled = Collection::init($array)->shuffled(); - if ($shuffled->toArray() != array_values($array)) + if ($shuffled->toArray() != array_values($array)) { break; + } if ($i > 10) { echo 'Collection::shuffled() failed.', PHP_EOL; exit; } } -if (array_sum($array) != array_sum($shuffled->toArray())) +if (array_sum($array) != array_sum($shuffled->toArray())) { echo 'Collection::shuffled() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/043-min-max-with.phpt b/tests/043-min-max-with.phpt index f8bc7c0..d034760 100644 --- a/tests/043-min-max-with.phpt +++ b/tests/043-min-max-with.phpt @@ -14,9 +14,11 @@ $by_b = function ($p1, $p2) { $by_c = function ($p1, $p2) { return strval($p1->second['c'] - $p2->second['c']); }; -if ($collection->minWith($by_b) != $array['a'] || $collection->minWith($by_c) != $array['d']) +if ($collection->minWith($by_b) != $array['a'] || $collection->minWith($by_c) != $array['d']) { echo 'Collection::minWith() failed.', PHP_EOL; -if ($collection->maxWith($by_b) != $array['e'] || $collection->maxWith($by_c) != $array['a']) +} +if ($collection->maxWith($by_b) != $array['e'] || $collection->maxWith($by_c) != $array['a']) { echo 'Collection::maxWith() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/044-sort-with-sorted-with.phpt b/tests/044-sort-with-sorted-with.phpt index 19e0bbd..8e21686 100644 --- a/tests/044-sort-with-sorted-with.phpt +++ b/tests/044-sort-with-sorted-with.phpt @@ -18,8 +18,9 @@ $usort_by_b = function ($v1, $v2) { $sorted_by_b = $collection->sortedWith($by_b); $array1 = $array; usort($array1, $usort_by_b); -if ($sorted_by_b->toArray() != $array1) +if ($sorted_by_b->toArray() != $array1) { echo 'Collection::sortedWith() failed.', PHP_EOL; +} $by_c = function ($p1, $p2) { return $p1->second['c'] - $p2->second['c']; }; @@ -29,7 +30,8 @@ $usort_by_c = function ($v1, $v2) { $collection->sortWith($by_c); $array2 = $array; usort($array2, $usort_by_c); -if ($collection->toArray() != $array2) +if ($collection->toArray() != $array2) { echo 'Collection::sortedWith() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/045-sort-sorted.phpt b/tests/045-sort-sorted.phpt index 0b446ef..2ed03e4 100644 --- a/tests/045-sort-sorted.phpt +++ b/tests/045-sort-sorted.phpt @@ -3,33 +3,38 @@ Test Collection::sort(), Collection::sortDescending(), Collection::sorted(), Col --FILE-- sort(); $array1 = $array; sort($array1, SORT_NUMERIC); -if ($array1 != $collection->toArray()) +if ($array1 != $collection->toArray()) { echo 'Collection::sort() failed.', PHP_EOL; +} $collection = Collection::init($array); $collection->sortDescending(); $array1 = $array; rsort($array1, SORT_NUMERIC); -if ($array1 != $collection->toArray()) +if ($array1 != $collection->toArray()) { echo 'Collection::sortDescending() failed.', PHP_EOL; +} $collection = Collection::init($array); $array1 = $array; sort($array1, SORT_NUMERIC); -if ($array1 != $collection->sorted()->toArray()) +if ($array1 != $collection->sorted()->toArray()) { echo 'Collection::sorted() failed.', PHP_EOL; +} $collection = Collection::init($array); $array1 = $array; rsort($array1, SORT_NUMERIC); -if ($array1 != $collection->sortedDescending()->toArray()) +if ($array1 != $collection->sortedDescending()->toArray()) { echo 'Collection::sortedDescending() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/046-sort-by-sorted-by.phpt b/tests/046-sort-by-sorted-by.phpt index 467cad6..caae9bf 100644 --- a/tests/046-sort-by-sorted-by.phpt +++ b/tests/046-sort-by-sorted-by.phpt @@ -3,8 +3,9 @@ Test Collection::sortBy(), Collection::sortByDescending(), Collection::sortedBy( --FILE-- sortBy($sort_by); $array1 = $array; usort($array1, $sort_with); -if ($array1 != $collection->toArray()) +if ($array1 != $collection->toArray()) { echo 'Collection::sortBy() failed.', PHP_EOL; +} $collection = Collection::init($array); $collection->sortByDescending($sort_by); $array1 = $array; usort($array1, $sort_with_descending); -if ($array1 != $collection->toArray()) +if ($array1 != $collection->toArray()) { echo 'Collection::sortByDescending() failed.', PHP_EOL; +} $collection = Collection::init($array); $array1 = $array; usort($array1, $sort_with); -if ($array1 != $collection->sortedBy($sort_by)->toArray()) +if ($array1 != $collection->sortedBy($sort_by)->toArray()) { echo 'Collection::sortedBy() failed.', PHP_EOL; +} $collection = Collection::init($array); $array1 = $array; usort($array1, $sort_with_descending); -if ($array1 != $collection->sortedByDescending($sort_by)->toArray()) +if ($array1 != $collection->sortedByDescending($sort_by)->toArray()) { echo 'Collection::sortedByDescending() failed.', PHP_EOL; +} ?> --EXPECT-- diff --git a/tests/047-distinct.phpt b/tests/047-distinct.phpt index e67ec2d..fca1e98 100644 --- a/tests/047-distinct.phpt +++ b/tests/047-distinct.phpt @@ -3,17 +3,21 @@ Test Collection::distinct(). --FILE-- distinct(); -if ($collection->toArray() != array_values(array_unique($array))) +if ($collection->toArray() != array_values(array_unique($array))) { echo 'Collection::distinct() failed.', PHP_EOL; +} $array = []; -for ($i = 0; $i < 100; ++$i) +for ($i = 0; $i < 100; ++$i) { $array[random_bytes(4)] = random_int(1, 10); +} $collection = Collection::init($array)->distinct(); -if (array_diff($collection->toArray(), array_unique($array))) +if (array_diff($collection->toArray(), array_unique($array))) { echo 'Collection::distinct() failed.', PHP_EOL; +} ?> --EXPECT--