Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consolidates asserts#equal branches for keyed collections (Map/Set) and supports deep equality of Map keys #3258

Merged
merged 13 commits into from
Nov 4, 2019
Merged

Consolidates asserts#equal branches for keyed collections (Map/Set) and supports deep equality of Map keys #3258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e560e70
Adds array test cases for asserts#equal
jamesseanwright Oct 31, 2019
06668ae
Implements common deep equality logic for keyed collections
jamesseanwright Nov 1, 2019
6b3e73f
Declares type for keyed collections
jamesseanwright Nov 1, 2019
23c8a45
Replaces duck typing with explicit instanceof operators for consistency
jamesseanwright Nov 1, 2019
6951b6a
Formats asserts changes
jamesseanwright Nov 1, 2019
a67eb30
Supports deep equality of Map and Set keys
jamesseanwright Nov 3, 2019
71f1cd3
Inverts condition for keyed collection entry matching
jamesseanwright Nov 3, 2019
3b5c42b
Formats changes
jamesseanwright Nov 3, 2019
d104913
Tweaks assertion in test
jamesseanwright Nov 3, 2019
6f4de57
Removes superfluous line breaks
jamesseanwright Nov 3, 2019
4a42219
Adds key-value strict equality check to avoid double-verification of …
jamesseanwright Nov 4, 2019
5aec22b
Tweaks comment
jamesseanwright Nov 4, 2019
db90fef
Reverts third_party submodule update
jamesseanwright Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Formats changes
  • Loading branch information
@jamesseanwright
jamesseanwright committed Nov 3, 2019
commit 3b5c42bbb3d1568239a8c83e958b3fa194aadd55
6 changes: 2 additions & 4 deletions std/testing/asserts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ function buildMessage(diffResult: ReadonlyArray<DiffResult<string>>): string[] {
return messages;
}

function isKeyedCollection(
x: unknown
): x is Set<unknown> {
return [Symbol.iterator, 'size'].every(k => k in (x as Set<unknown>));
function isKeyedCollection(x: unknown): x is Set<unknown> {
return [Symbol.iterator, "size"].every(k => k in (x as Set<unknown>));
}

export function equal(c: unknown, d: unknown): boolean {
Expand Down
21 changes: 3 additions & 18 deletions std/testing/asserts_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,11 @@ test(function testingEqual(): void {
)
);

assert(
equal(
new Map([[{x: 1}, true]]),
new Map([[{x: 1}, true]])
)
);
assert(equal(new Map([[{ x: 1 }, true]]), new Map([[{ x: 1 }, true]])));

assert(
!equal(
new Map([[{x: 1}, true]]),
new Map([[{x: 1}, false]])
)
);
assert(!equal(new Map([[{ x: 1 }, true]]), new Map([[{ x: 1 }, false]])));

assert(
!equal(
new Map([[{x: 1}, true]]),
new Map([[{x: 2}, false]])
)
);
assert(!equal(new Map([[{ x: 1 }, true]]), new Map([[{ x: 2 }, false]])));

assert(equal([1, 2, 3], [1, 2, 3]));
assert(equal([1, [2, 3]], [1, [2, 3]]));
Expand Down