@@ -26,19 +26,20 @@ import 'package:checks/context.dart';
2626/// Collections may be nested to a maximum depth of 1000. Recursive collections
2727/// are not allowed.
2828/// {@endtemplate}
29- Iterable <String >? deepCollectionEquals (Object actual, Object expected) {
29+ Iterable <String > Function ()? deepCollectionEquals (
30+ Object actual, Object expected) {
3031 try {
3132 return _deepCollectionEquals (actual, expected, 0 );
3233 } on _ExceededDepthError {
33- return ['exceeds the depth limit of $_maxDepth ' ];
34+ return () => ['exceeds the depth limit of $_maxDepth ' ];
3435 }
3536}
3637
3738const _maxDepth = 1000 ;
3839
3940class _ExceededDepthError extends Error {}
4041
41- Iterable <String >? _deepCollectionEquals (
42+ Iterable <String > Function () ? _deepCollectionEquals (
4243 Object actual, Object expected, int depth) {
4344 assert (actual is Iterable || actual is Map );
4445 assert (expected is Iterable || expected is Map );
@@ -50,7 +51,7 @@ Iterable<String>? _deepCollectionEquals(
5051 final currentExpected = toCheck.expected;
5152 final path = toCheck.path;
5253 final currentDepth = toCheck.depth;
53- Iterable <String >? rejectionWhich;
54+ Iterable <String > Function () ? rejectionWhich;
5455 if (currentExpected is Set ) {
5556 rejectionWhich = _findSetDifference (
5657 currentActual, currentExpected, path, currentDepth);
@@ -67,10 +68,10 @@ Iterable<String>? _deepCollectionEquals(
6768 return null ;
6869}
6970
70- List <String >? _findIterableDifference (Object ? actual,
71+ List <String > Function () ? _findIterableDifference (Object ? actual,
7172 Iterable <Object ?> expected, _Path path, Queue <_Search > queue, int depth) {
7273 if (actual is ! Iterable ) {
73- return ['${path }is not an Iterable' ];
74+ return () => ['${path }is not an Iterable' ];
7475 }
7576 var actualIterator = actual.iterator;
7677 var expectedIterator = expected.iterator;
@@ -79,13 +80,13 @@ List<String>? _findIterableDifference(Object? actual,
7980 var expectedNext = expectedIterator.moveNext ();
8081 if (! expectedNext && ! actualNext) break ;
8182 if (! expectedNext) {
82- return [
83+ return () => [
8384 '${path }has more elements than expected' ,
8485 'expected an iterable with $index element(s)'
8586 ];
8687 }
8788 if (! actualNext) {
88- return [
89+ return () => [
8990 '${path }has too few elements' ,
9091 'expected an iterable with at least ${index + 1 } element(s)'
9192 ];
@@ -99,19 +100,19 @@ List<String>? _findIterableDifference(Object? actual,
99100 } else if (expectedValue is Condition ) {
100101 final failure = softCheck (actualValue, expectedValue);
101102 if (failure != null ) {
102- final which = failure.rejection.which;
103- return [
103+ final which = failure.rejection.which? . call () ;
104+ return () => [
104105 'has an element ${path .append (index )}that:' ,
105106 ...indent (failure.detail.actual.skip (1 )),
106- ...indent (prefixFirst ('Actual: ' , failure.rejection.actual),
107+ ...indent (prefixFirst ('Actual: ' , failure.rejection.actual () ),
107108 failure.detail.depth + 1 ),
108109 if (which != null )
109110 ...indent (prefixFirst ('which ' , which), failure.detail.depth + 1 )
110111 ];
111112 }
112113 } else {
113114 if (actualValue != expectedValue) {
114- return [
115+ return () => [
115116 ...prefixFirst ('${path .append (index )}is ' , literal (actualValue)),
116117 ...prefixFirst ('which does not equal ' , literal (expectedValue))
117118 ];
@@ -134,30 +135,30 @@ bool _elementMatches(Object? actual, Object? expected, int depth) {
134135 return expected == actual;
135136}
136137
137- Iterable <String >? _findSetDifference (
138+ Iterable <String > Function () ? _findSetDifference (
138139 Object ? actual, Set <Object ?> expected, _Path path, int depth) {
139140 if (actual is ! Set ) {
140- return ['${path }is not a Set' ];
141+ return () => ['${path }is not a Set' ];
141142 }
142143 return unorderedCompare (
143144 actual,
144145 expected,
145146 (actual, expected) => _elementMatches (actual, expected, depth),
146- (expected, _, count) => [
147+ (expected, _, count) => () => [
147148 ...prefixFirst ('${path }has no element to match ' , literal (expected)),
148149 if (count > 1 ) 'or ${count - 1 } other elements' ,
149150 ],
150- (actual, _, count) => [
151+ (actual, _, count) => () => [
151152 ...prefixFirst ('${path }has an unexpected element ' , literal (actual)),
152153 if (count > 1 ) 'and ${count - 1 } other unexpected elements' ,
153154 ],
154155 );
155156}
156157
157- Iterable <String >? _findMapDifference (
158+ Iterable <String > Function () ? _findMapDifference (
158159 Object ? actual, Map <Object ?, Object ?> expected, _Path path, int depth) {
159160 if (actual is ! Map ) {
160- return ['${path }is not a Map' ];
161+ return () => ['${path }is not a Map' ];
161162 }
162163 Iterable <String > describeEntry (MapEntry <Object ?, Object ?> entry) {
163164 final key = literal (entry.key);
@@ -175,12 +176,12 @@ Iterable<String>? _findMapDifference(
175176 (actual, expected) =>
176177 _elementMatches (actual.key, expected.key, depth) &&
177178 _elementMatches (actual.value, expected.value, depth),
178- (expectedEntry, _, count) => [
179+ (expectedEntry, _, count) => () => [
179180 ...prefixFirst (
180181 '${path }has no entry to match ' , describeEntry (expectedEntry)),
181182 if (count > 1 ) 'or ${count - 1 } other entries' ,
182183 ],
183- (actualEntry, _, count) => [
184+ (actualEntry, _, count) => () => [
184185 ...prefixFirst (
185186 '${path }has unexpected entry ' , describeEntry (actualEntry)),
186187 if (count > 1 ) 'and ${count - 1 } other unexpected entries' ,
@@ -241,12 +242,14 @@ class _Search {
241242/// Runtime is at least `O(|actual||expected|)` , and for collections with many
242243/// elements which compare as equal the runtime can reach
243244/// `O((|actual| + |expected|)^2.5)` .
244- Iterable <String >? unorderedCompare <T , E >(
245+ Iterable <String > Function () ? unorderedCompare <T , E >(
245246 Iterable <T > actual,
246247 Iterable <E > expected,
247248 bool Function (T , E ) elementsEqual,
248- Iterable <String > Function (E , int index, int count) unmatchedExpected,
249- Iterable <String > Function (T , int index, int count) unmatchedActual) {
249+ Iterable <String > Function () Function (E , int index, int count)
250+ unmatchedExpected,
251+ Iterable <String > Function () Function (T , int index, int count)
252+ unmatchedActual) {
250253 final indexedExpected = expected.toList ();
251254 final indexedActual = actual.toList ();
252255 final adjacency = < List <int >> [];
0 commit comments