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>
137 lines
4.3 KiB
Dart
137 lines
4.3 KiB
Dart
// Copyright (c) 2013, 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:async';
|
|
import 'dart:html';
|
|
|
|
import 'package:expect/minitest.dart'; // ignore: deprecated_member_use_from_same_package
|
|
|
|
main() {
|
|
void initPage() {
|
|
var level1 = new UListElement()
|
|
..classes.add('level-1')
|
|
..children.add(new LIElement()..innerHtml = 'I');
|
|
var itemii = new LIElement()
|
|
..classes.add('item-ii')
|
|
..style.position = 'relative'
|
|
..style.top = '4px'
|
|
..innerHtml = 'II';
|
|
level1.children.add(itemii);
|
|
var level2 = new UListElement();
|
|
itemii.children.add(level2);
|
|
var itema = new LIElement()
|
|
..classes.add('item-a')
|
|
..innerHtml = 'A';
|
|
var item1 = new LIElement()
|
|
..classes.add('item-1')
|
|
..innerHtml = '1';
|
|
var item2 = new LIElement()
|
|
..classes.add('item-2')
|
|
..innerHtml = '2';
|
|
var level3 = new UListElement()..children.addAll([item1, item2]);
|
|
var itemb = new LIElement()
|
|
..classes.add('item-b')
|
|
..style.position = 'relative'
|
|
..style.top = '20px'
|
|
..style.left = '150px'
|
|
..innerHtml = 'B'
|
|
..children.add(level3);
|
|
level2.children.addAll([itema, itemb, new LIElement()..innerHtml = 'C']);
|
|
document.body!.append(level1);
|
|
document.body!.style.whiteSpace = 'nowrap';
|
|
|
|
var bar = new DivElement()..classes.add('bar');
|
|
var style = bar.style;
|
|
style
|
|
..position = 'absolute'
|
|
..top = '8px'
|
|
..left = '90px';
|
|
var baz = new DivElement()..classes.add('baz');
|
|
style = baz.style;
|
|
style
|
|
..position = 'absolute'
|
|
..top = '600px'
|
|
..left = '7000px';
|
|
bar.children.add(baz);
|
|
|
|
var quux = new DivElement()..classes.add('quux');
|
|
var qux = new DivElement()..classes.add('qux')..children.add(quux);
|
|
|
|
document.body!.append(bar);
|
|
document.body!.append(qux);
|
|
}
|
|
|
|
group('offset', () {
|
|
setUp(initPage);
|
|
|
|
test('offsetTo', () {
|
|
var itema = querySelector('.item-a')!;
|
|
var itemb = querySelector('.item-b')!;
|
|
var item1 = querySelector('.item-1')!;
|
|
var itemii = querySelector('.item-ii')!;
|
|
var level1 = querySelector('.level-1')!;
|
|
var baz = querySelector('.baz')!;
|
|
var bar = querySelector('.bar')!;
|
|
var qux = querySelector('.qux')!;
|
|
var quux = querySelector('.quux')!;
|
|
|
|
var point = itema.offsetTo(itemii);
|
|
expect(point.x, 40);
|
|
expect(point.y, inInclusiveRange(16, 20));
|
|
|
|
expect(baz.offsetTo(bar).x, 7000);
|
|
expect(baz.offsetTo(bar).y, inInclusiveRange(599, 604));
|
|
|
|
qux.style.position = 'fixed';
|
|
expect(quux.offsetTo(qux).x, 0);
|
|
expect(quux.offsetTo(qux).y, 0);
|
|
|
|
point = item1.offsetTo(itemb);
|
|
expect(point.x, 40);
|
|
expect(point.y, inInclusiveRange(16, 20));
|
|
point = itemb.offsetTo(itemii);
|
|
expect(point.x, 190);
|
|
expect(point.y, inInclusiveRange(52, 60));
|
|
point = item1.offsetTo(itemii);
|
|
expect(point.x, 230);
|
|
expect(point.y, inInclusiveRange(68, 80));
|
|
});
|
|
|
|
test('documentOffset', () {
|
|
var bar = querySelector('.bar')!;
|
|
var baz = querySelector('.baz')!;
|
|
var qux = querySelector('.qux')!;
|
|
var quux = querySelector('.quux')!;
|
|
var itema = querySelector('.item-a')!;
|
|
var itemb = querySelector('.item-b')!;
|
|
var item1 = querySelector('.item-1')!;
|
|
var itemii = querySelector('.item-ii')!;
|
|
|
|
expect(itema.documentOffset.x, 88);
|
|
expect(itema.documentOffset.y, inInclusiveRange(111, 160));
|
|
|
|
expect(itemii.documentOffset.x, 48);
|
|
expect(itemii.documentOffset.y, inInclusiveRange(95, 145));
|
|
|
|
expect(itemb.documentOffset.x, 238);
|
|
expect(itemb.documentOffset.y, inInclusiveRange(147, 205));
|
|
|
|
expect(item1.documentOffset.x, 278);
|
|
expect(item1.documentOffset.y, inInclusiveRange(163, 222));
|
|
|
|
expect(bar.documentOffset.x, 90);
|
|
expect(bar.documentOffset.y, 8);
|
|
|
|
expect(baz.documentOffset.x, 7090);
|
|
expect(baz.documentOffset.y, 608);
|
|
|
|
expect(qux.documentOffset.x, 8);
|
|
expect(qux.documentOffset.y, inInclusiveRange(203, 240));
|
|
|
|
expect(quux.documentOffset.x, 8);
|
|
expect(quux.documentOffset.y, inInclusiveRange(203, 240));
|
|
});
|
|
});
|
|
}
|