b464fc9037
This reverts commitcd2c566bcf. Reason for revert: Updating to not remove field used by Flutter engine. Original change's description: > Revert "Tweak `expect.dart` library." > > This reverts commitff5f391c0a. > > Reason for revert: The expect library is used by Flutter engine, and some of its tests use assertStatementsEnabled. There should be a migration path that doesn't require an atomic change, like adding the replacement api before removing the old one. > > Original change's description: > > Tweak `expect.dart` library. > > > > Make API more consistent for a few methods. > > Reduce the number of language features used in tests: > > * Never iterating an iterable, always converting it > > using `.toList()` first and iterating using indices > > (fx `setEquals`). > > Also require a `List` in places where an `Iterable` > > wasn't necessary. > > * Avoid doing complicated computations that are also > > used for the error message. Do simple check first, > > then recompute to get better error messages > > (fx `allDistinct`). > > > > Renamed some rarely used members for consistency > > (`stringContainsInOrder`->`containsInOrder`, > > where other string-contains functions just start > > with `contains`, and `containsOneOf` -> `containsAny` > > to match `Iterable.any` phrasing, and also it accepts > > if containing at least one, not precisely one.) > > > > Removed a function that wasn't used anywhere. > > > > Moved `assertStatementsEnabled` to `variations.dart` as `asserts`. > > Removed `typeAssertionsEnabled` and `checkedModeEnabled`. The former used in one place, where it was replaced with `checkedImplicitDowncasts` from `variations.dart`, the latter wasn't used anywhere. > > > > Deprecates `package:expect/minitest.dart`. It was never intended > > to be used for new tests, only as a help to convert existing tests > > written against `package:unit_test`. > > All existing imports marked as `// ignore: deprecated_member_use`. > > > > Change-Id: I07e21d4c0f3ccf11b82ee34af2668fdbb22264d2 > > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352360 > > Reviewed-by: Slava Egorov <vegorov@google.com> > > Reviewed-by: Ömer Ağacan <omersa@google.com> > > Reviewed-by: Nate Bosch <nbosch@google.com> > > Reviewed-by: Stephen Adams <sra@google.com> > > Commit-Queue: Lasse Nielsen <lrn@google.com> > > Change-Id: I360b4347470a0bb2b63c3108e2b83ee2a771bf3f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362020 > Reviewed-by: Nate Bosch <nbosch@google.com> > Reviewed-by: Ömer Ağacan <omersa@google.com> > Reviewed-by: Stephen Adams <sra@google.com> > Reviewed-by: Leaf Petersen <leafp@google.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: William Hesse <whesse@google.com> CoreLibraryReviewExempt: Reland Change-Id: I53db40edc0733842a008839c3913d51c885e39ab Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362502 Reviewed-by: Alexander Thomas <athom@google.com> Reviewed-by: Nate Bosch <nbosch@google.com> Reviewed-by: Ömer Ağacan <omersa@google.com> Reviewed-by: Slava Egorov <vegorov@google.com> Reviewed-by: William Hesse <whesse@google.com> Commit-Queue: Lasse Nielsen <lrn@google.com>
161 lines
5.2 KiB
Dart
161 lines
5.2 KiB
Dart
// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
import 'dart:html';
|
|
import 'dart:typed_data';
|
|
|
|
import 'package:expect/minitest.dart'; // ignore: deprecated_member_use_from_same_package
|
|
|
|
/**
|
|
* Verifies that [actual] has the same graph structure as [expected].
|
|
* Detects cycles and DAG structure in Maps and Lists.
|
|
*/
|
|
verifyGraph(expected, actual) {
|
|
var eItems = [];
|
|
var aItems = [];
|
|
|
|
message(path, reason) => path == ''
|
|
? reason
|
|
: reason == null
|
|
? "path: $path"
|
|
: "path: $path, $reason";
|
|
|
|
walk(path, expected, actual) {
|
|
if (expected is String || expected is num || expected == null) {
|
|
expect(actual, equals(expected), reason: message(path, 'not equal'));
|
|
return;
|
|
}
|
|
|
|
// Cycle or DAG?
|
|
for (int i = 0; i < eItems.length; i++) {
|
|
if (identical(expected, eItems[i])) {
|
|
expect(actual, same(aItems[i]),
|
|
reason: message(path, 'missing back or side edge'));
|
|
return;
|
|
}
|
|
}
|
|
for (int i = 0; i < aItems.length; i++) {
|
|
if (identical(actual, aItems[i])) {
|
|
expect(expected, same(eItems[i]),
|
|
reason: message(path, 'extra back or side edge'));
|
|
return;
|
|
}
|
|
}
|
|
eItems.add(expected);
|
|
aItems.add(actual);
|
|
|
|
if (expected is Blob) {
|
|
expect(actual is Blob, isTrue, reason: '$actual is Blob');
|
|
expect(expected.type, equals(actual.type),
|
|
reason: message(path, '.type'));
|
|
expect(expected.size, equals(actual.size),
|
|
reason: message(path, '.size'));
|
|
return;
|
|
}
|
|
|
|
if (expected is ByteBuffer) {
|
|
expect(actual is ByteBuffer, isTrue, reason: '$actual is ByteBuffer');
|
|
expect(expected.lengthInBytes, equals(actual.lengthInBytes),
|
|
reason: message(path, '.lengthInBytes'));
|
|
// TODO(antonm): one can create a view on top of those
|
|
// and check if contents identical. Let's do it later.
|
|
return;
|
|
}
|
|
|
|
if (expected is DateTime) {
|
|
expect(actual is DateTime, isTrue, reason: '$actual is DateTime');
|
|
expect(expected.millisecondsSinceEpoch,
|
|
equals(actual.millisecondsSinceEpoch),
|
|
reason: message(path, '.millisecondsSinceEpoch'));
|
|
return;
|
|
}
|
|
|
|
if (expected is ImageData) {
|
|
expect(actual is ImageData, isTrue, reason: '$actual is ImageData');
|
|
expect(expected.width, equals(actual.width),
|
|
reason: message(path, '.width'));
|
|
expect(expected.height, equals(actual.height),
|
|
reason: message(path, '.height'));
|
|
walk('$path.data', expected.data, actual.data);
|
|
return;
|
|
}
|
|
|
|
if (expected is TypedData) {
|
|
expect(actual is TypedData, isTrue, reason: '$actual is TypedData');
|
|
walk('$path/.buffer', expected.buffer, actual.buffer);
|
|
expect(expected.offsetInBytes, equals(actual.offsetInBytes),
|
|
reason: message(path, '.offsetInBytes'));
|
|
expect(expected.lengthInBytes, equals(actual.lengthInBytes),
|
|
reason: message(path, '.lengthInBytes'));
|
|
// And also fallback to elements check below.
|
|
}
|
|
|
|
if (expected is List) {
|
|
expect(actual, predicate((v) => v is List),
|
|
reason: message(path, '$actual is List'));
|
|
expect(actual.length, expected.length,
|
|
reason: message(path, 'different list lengths'));
|
|
for (var i = 0; i < expected.length; i++) {
|
|
walk('$path[$i]', expected[i], actual[i]);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (expected is Map) {
|
|
expect(actual, predicate((v) => v is Map),
|
|
reason: message(path, '$actual is Map'));
|
|
for (var key in expected.keys) {
|
|
if (!actual.containsKey(key)) {
|
|
expect(false, isTrue, reason: message(path, 'missing key "$key"'));
|
|
}
|
|
walk('$path["$key"]', expected[key], actual[key]);
|
|
}
|
|
for (var key in actual.keys) {
|
|
if (!expected.containsKey(key)) {
|
|
expect(false, isTrue, reason: message(path, 'extra key "$key"'));
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
expect(false, isTrue, reason: 'Unhandled type: $expected');
|
|
}
|
|
|
|
walk('', expected, actual);
|
|
}
|
|
|
|
/**
|
|
* Sanitizer which does nothing.
|
|
*/
|
|
class NullTreeSanitizer implements NodeTreeSanitizer {
|
|
void sanitizeTree(Node node) {}
|
|
}
|
|
|
|
/**
|
|
* Validate that two DOM trees are equivalent.
|
|
*/
|
|
void validateNodeTree(Node a, Node b, [String path = '']) {
|
|
path = '${path}${a.runtimeType}';
|
|
expect(a.nodeType, b.nodeType, reason: '$path nodeTypes differ');
|
|
expect(a.nodeValue, b.nodeValue, reason: '$path nodeValues differ');
|
|
expect(a.text, b.text, reason: '$path texts differ');
|
|
expect(a.nodes.length, b.nodes.length, reason: '$path nodes.lengths differ');
|
|
|
|
if (a is Element) {
|
|
Element bE = b as Element;
|
|
Element aE = a;
|
|
|
|
expect(aE.tagName, bE.tagName, reason: '$path tagNames differ');
|
|
expect(aE.attributes.length, bE.attributes.length,
|
|
reason: '$path attributes.lengths differ');
|
|
for (var key in aE.attributes.keys) {
|
|
expect(aE.attributes[key], bE.attributes[key],
|
|
reason: '$path attribute [$key] values differ');
|
|
}
|
|
}
|
|
for (var i = 0; i < a.nodes.length; ++i) {
|
|
validateNodeTree(a.nodes[i], b.nodes[i], '$path[$i].');
|
|
}
|
|
}
|