diff --git a/packages/flutter/lib/src/cassowary/constant_member.dart b/packages/flutter/lib/src/cassowary/constant_member.dart index 3ab53211cb..2d077656db 100644 --- a/packages/flutter/lib/src/cassowary/constant_member.dart +++ b/packages/flutter/lib/src/cassowary/constant_member.dart @@ -4,6 +4,7 @@ import 'expression.dart'; import 'equation_member.dart'; +import 'term.dart'; class ConstantMember extends EquationMember { /// Creates a [ConstantMember] object. @@ -13,7 +14,7 @@ class ConstantMember extends EquationMember { ConstantMember(this.value); @override - Expression asExpression() => new Expression([], this.value); + Expression asExpression() => new Expression([], this.value); @override final double value; diff --git a/packages/flutter/lib/src/cassowary/expression.dart b/packages/flutter/lib/src/cassowary/expression.dart index b8e655bfa1..55742aa6e3 100644 --- a/packages/flutter/lib/src/cassowary/expression.dart +++ b/packages/flutter/lib/src/cassowary/expression.dart @@ -156,7 +156,7 @@ class Expression extends EquationMember { EquationMember operator /(EquationMember m) { if (!m.isConstant) { throw new ParserException( - 'The divisor was not a constant expression', [this, m]); + 'The divisor was not a constant expression', [this, m]); return null; } diff --git a/packages/flutter/lib/src/cassowary/solver.dart b/packages/flutter/lib/src/cassowary/solver.dart index 0f66b6cc67..dcbc227f2d 100644 --- a/packages/flutter/lib/src/cassowary/solver.dart +++ b/packages/flutter/lib/src/cassowary/solver.dart @@ -250,7 +250,7 @@ class Solver { return Result.badRequiredStrength; Constraint constraint = new Constraint( - new Expression([new Term(variable, 1.0)], 0.0), + new Expression([new Term(variable, 1.0)], 0.0), Relation.equalTo ); constraint.priority = priority; diff --git a/packages/flutter/lib/src/cassowary/term.dart b/packages/flutter/lib/src/cassowary/term.dart index 59840bc257..d161196534 100644 --- a/packages/flutter/lib/src/cassowary/term.dart +++ b/packages/flutter/lib/src/cassowary/term.dart @@ -15,7 +15,7 @@ class Term extends EquationMember { @override Expression asExpression() => - new Expression([new Term(this.variable, this.coefficient)], 0.0); + new Expression([new Term(this.variable, this.coefficient)], 0.0); @override bool get isConstant => false; diff --git a/packages/flutter/lib/src/foundation/binding.dart b/packages/flutter/lib/src/foundation/binding.dart index b9fb06ebb4..f420d3659d 100644 --- a/packages/flutter/lib/src/foundation/binding.dart +++ b/packages/flutter/lib/src/foundation/binding.dart @@ -239,7 +239,7 @@ abstract class BindingBase { )); return new developer.ServiceExtensionResponse.error( developer.ServiceExtensionResponse.extensionError, - JSON.encode({ + JSON.encode({ 'exception': caughtException.toString(), 'stack': caughtStack.toString(), 'method': method diff --git a/packages/flutter/lib/src/http/response.dart b/packages/flutter/lib/src/http/response.dart index 56d294559e..155a8ad9bd 100644 --- a/packages/flutter/lib/src/http/response.dart +++ b/packages/flutter/lib/src/http/response.dart @@ -10,7 +10,7 @@ class Response { /// Creates a [Response] object with the given fields. /// /// If [bodyBytes] is non-null, it is used to populate [body]. - Response.bytes(this.bodyBytes, this.statusCode, { this.headers: const {} }); + Response.bytes(this.bodyBytes, this.statusCode, { this.headers: const {} }); /// The result of decoding [bodyBytes] using ISO-8859-1. /// diff --git a/packages/flutter/lib/src/material/input.dart b/packages/flutter/lib/src/material/input.dart index f174727ac0..659b65ece2 100644 --- a/packages/flutter/lib/src/material/input.dart +++ b/packages/flutter/lib/src/material/input.dart @@ -221,7 +221,7 @@ class _InputState extends State { double iconTop = topPadding + (textStyle.fontSize - iconSize) / 2.0; child = new Row( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ new Container( margin: new EdgeInsets.only(right: 16.0, top: iconTop), width: config.isDense ? 40.0 : 48.0, diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart index cbf902b890..fed10e5783 100644 --- a/packages/flutter/lib/src/material/time_picker.dart +++ b/packages/flutter/lib/src/material/time_picker.dart @@ -281,12 +281,12 @@ List _initPainters(List labels) { } List _initHours() { - return _initPainters(['12', '1', '2', '3', '4', '5', + return _initPainters(['12', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11']); } List _initMinutes() { - return _initPainters(['00', '05', '10', '15', '20', '25', + return _initPainters(['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55']); } diff --git a/packages/flutter/lib/src/rendering/editable_line.dart b/packages/flutter/lib/src/rendering/editable_line.dart index 10851f90f3..c490d7fd2c 100644 --- a/packages/flutter/lib/src/rendering/editable_line.dart +++ b/packages/flutter/lib/src/rendering/editable_line.dart @@ -129,12 +129,12 @@ class RenderEditableLine extends RenderBox { // TODO(mpcomplete): This doesn't work well at an RTL/LTR boundary. Offset caretOffset = _textPainter.getOffsetForCaret(selection.extent, _caretPrototype); Point start = new Point(caretOffset.dx, _contentSize.height) + offset; - return [new TextSelectionPoint(localToGlobal(start), null)]; + return [new TextSelectionPoint(localToGlobal(start), null)]; } else { List boxes = _textPainter.getBoxesForSelection(selection); Point start = new Point(boxes.first.start, boxes.first.bottom) + offset; Point end = new Point(boxes.last.end, boxes.last.bottom) + offset; - return [ + return [ new TextSelectionPoint(localToGlobal(start), boxes.first.direction), new TextSelectionPoint(localToGlobal(end), boxes.last.direction), ]; diff --git a/packages/flutter/test/animation/animation_controller_test.dart b/packages/flutter/test/animation/animation_controller_test.dart index bc247f7744..66fbecd895 100644 --- a/packages/flutter/test/animation/animation_controller_test.dart +++ b/packages/flutter/test/animation/animation_controller_test.dart @@ -54,50 +54,50 @@ void main() { valueLog.add(controller.value); }); - expect(log, equals([])); - expect(valueLog, equals([])); + expect(log, equals([])); + expect(valueLog, equals([])); controller.forward(); - expect(log, equals([AnimationStatus.forward])); - expect(valueLog, equals([])); + expect(log, equals([AnimationStatus.forward])); + expect(valueLog, equals([])); controller.reverse(); - expect(log, equals([AnimationStatus.forward, AnimationStatus.dismissed])); - expect(valueLog, equals([])); + expect(log, equals([AnimationStatus.forward, AnimationStatus.dismissed])); + expect(valueLog, equals([])); controller.reverse(); - expect(log, equals([AnimationStatus.forward, AnimationStatus.dismissed])); - expect(valueLog, equals([])); + expect(log, equals([AnimationStatus.forward, AnimationStatus.dismissed])); + expect(valueLog, equals([])); log.clear(); controller.forward(); - expect(log, equals([AnimationStatus.forward])); - expect(valueLog, equals([])); + expect(log, equals([AnimationStatus.forward])); + expect(valueLog, equals([])); controller.forward(); - expect(log, equals([AnimationStatus.forward])); - expect(valueLog, equals([])); + expect(log, equals([AnimationStatus.forward])); + expect(valueLog, equals([])); controller.reverse(); log.clear(); WidgetsBinding.instance.handleBeginFrame(const Duration(seconds: 10)); - expect(log, equals([])); - expect(valueLog, equals([])); + expect(log, equals([])); + expect(valueLog, equals([])); WidgetsBinding.instance.handleBeginFrame(const Duration(seconds: 20)); - expect(log, equals([])); - expect(valueLog, equals([])); + expect(log, equals([])); + expect(valueLog, equals([])); WidgetsBinding.instance.handleBeginFrame(const Duration(seconds: 30)); - expect(log, equals([])); - expect(valueLog, equals([])); + expect(log, equals([])); + expect(valueLog, equals([])); WidgetsBinding.instance.handleBeginFrame(const Duration(seconds: 40)); - expect(log, equals([])); - expect(valueLog, equals([])); + expect(log, equals([])); + expect(valueLog, equals([])); controller.stop(); }); @@ -118,15 +118,15 @@ void main() { }); controller.reverse(from: 0.2); - expect(statusLog, equals([ AnimationStatus.reverse ])); - expect(valueLog, equals([ 0.2 ])); + expect(statusLog, equals([ AnimationStatus.reverse ])); + expect(valueLog, equals([ 0.2 ])); expect(controller.value, equals(0.2)); statusLog.clear(); valueLog.clear(); controller.forward(from: 0.0); - expect(statusLog, equals([ AnimationStatus.dismissed, AnimationStatus.forward ])); - expect(valueLog, equals([ 0.0 ])); + expect(statusLog, equals([ AnimationStatus.dismissed, AnimationStatus.forward ])); + expect(valueLog, equals([ 0.0 ])); expect(controller.value, equals(0.0)); }); } diff --git a/packages/flutter/test/cassowary/cassowary_test.dart b/packages/flutter/test/cassowary/cassowary_test.dart index ac69187809..b7b5fccff8 100644 --- a/packages/flutter/test/cassowary/cassowary_test.dart +++ b/packages/flutter/test/cassowary/cassowary_test.dart @@ -210,7 +210,7 @@ void main() { expect((t * cm(2.0)).value, 40.0); // Expression - Expression e = new Expression([t], 0.0); + Expression e = new Expression([t], 0.0); expect((e * cm(2.0)).value, 40.0); }); @@ -228,7 +228,7 @@ void main() { expect((t / cm(2.0)).value, 10.0); // Expression - Expression e = new Expression([t], 0.0); + Expression e = new Expression([t], 0.0); expect((e / cm(2.0)).value, 10.0); }); @@ -298,7 +298,7 @@ void main() { expect(c3.expression.constant, 0.0); // Expression - Constraint c4 = e >= new Expression([new Term(new Variable(2.0), 1.0)], 20.0); + Constraint c4 = e >= new Expression([new Term(new Variable(2.0), 1.0)], 20.0); expect(c4 is Constraint, true); expect(c4.expression.terms.length, 3); expect(c4.expression.constant, -20.0); @@ -325,8 +325,8 @@ void main() { expect(c3.expression.constant, 0.0); // Expression - Expression e = new Expression([t], 0.0); - Constraint c4 = e >= new Expression([new Term(new Variable(2.0), 1.0)], 20.0); + Expression e = new Expression([t], 0.0); + Constraint c4 = e >= new Expression([new Term(new Variable(2.0), 1.0)], 20.0); expect(c4 is Constraint, true); expect(c4.expression.terms.length, 2); expect(c4.expression.constant, -20.0); @@ -352,7 +352,7 @@ void main() { ConstantMember c = cm(10.0); Param v = new Param(c.value); Term t = new Term(v.variable, 1.0); - Expression e = new Expression([t], 0.0); + Expression e = new Expression([t], 0.0); // Constant expect((c * cm(10.0)).value, 100); @@ -383,7 +383,7 @@ void main() { ConstantMember c = cm(10.0); Param v = new Param(c.value); Term t = new Term(v.variable, 1.0); - Expression e = new Expression([t], 0.0); + Expression e = new Expression([t], 0.0); expect((c * c).value, 100); expect(() => v * v, throwsA(new isInstanceOf())); @@ -457,13 +457,13 @@ void main() { Constraint c = (left >= cm(0.0)); - expect(s.addConstraints([ + expect(s.addConstraints([ (left + right).equals(cm(2.0) * mid), (right - left >= cm(100.0)), c ]), Result.success); - expect(s.addConstraints([(right >= cm(-20.0)), c]), + expect(s.addConstraints([(right >= cm(-20.0)), c]), Result.duplicateConstraint); }); @@ -599,7 +599,7 @@ void main() { Param mid = new Param(0.0); expect(s.addEditVariables( - [left.variable, right.variable, mid.variable], 999.0), Result.success); + [left.variable, right.variable, mid.variable], 999.0), Result.success); }); test('bulk_remove_constraints_and_variables', () { @@ -610,16 +610,16 @@ void main() { Param mid = new Param(0.0); expect(s.addEditVariables( - [left.variable, right.variable, mid.variable], 999.0), Result.success); + [left.variable, right.variable, mid.variable], 999.0), Result.success); Constraint c1 = left <= mid; Constraint c2 = mid <= right; - expect(s.addConstraints([c1, c2]), Result.success); + expect(s.addConstraints([c1, c2]), Result.success); - expect(s.removeConstraints([c1, c2]), Result.success); + expect(s.removeConstraints([c1, c2]), Result.success); expect(s.removeEditVariables( - [left.variable, right.variable, mid.variable]), Result.success); + [left.variable, right.variable, mid.variable]), Result.success); }); } diff --git a/packages/flutter/test/widget/clip_test.dart b/packages/flutter/test/widget/clip_test.dart index 2638f1a60f..a1c6ca2ab3 100644 --- a/packages/flutter/test/widget/clip_test.dart +++ b/packages/flutter/test/widget/clip_test.dart @@ -31,14 +31,14 @@ void main() { ) ) ); - expect(log, equals(['getClip'])); + expect(log, equals(['getClip'])); tester.tapAt(new Point(10.0, 10.0)); - expect(log, equals(['getClip'])); + expect(log, equals(['getClip'])); log.clear(); tester.tapAt(new Point(100.0, 100.0)); - expect(log, equals(['tap'])); + expect(log, equals(['tap'])); log.clear(); }); @@ -52,14 +52,14 @@ void main() { ) ) ); - expect(log, equals([])); + expect(log, equals([])); tester.tapAt(new Point(10.0, 10.0)); - expect(log, equals([])); + expect(log, equals([])); log.clear(); tester.tapAt(new Point(400.0, 300.0)); - expect(log, equals(['tap'])); + expect(log, equals(['tap'])); log.clear(); }); } diff --git a/packages/flutter/test/widget/custom_paint_test.dart b/packages/flutter/test/widget/custom_paint_test.dart index d4df472612..2fc26a9c51 100644 --- a/packages/flutter/test/widget/custom_paint_test.dart +++ b/packages/flutter/test/widget/custom_paint_test.dart @@ -41,6 +41,6 @@ void main() { ) )); - expect(log, equals(['background', 'child', 'foreground'])); + expect(log, equals(['background', 'child', 'foreground'])); }); } diff --git a/packages/flutter/test/widget/dismissable_test.dart b/packages/flutter/test/widget/dismissable_test.dart index 836d0bcce3..a414333294 100644 --- a/packages/flutter/test/widget/dismissable_test.dart +++ b/packages/flutter/test/widget/dismissable_test.dart @@ -139,12 +139,12 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.startToEnd); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); expect(reportedDismissDirection, DismissDirection.startToEnd); dismissItem(tester, 1, gestureDirection: DismissDirection.endToStart); expect(find.text('1'), findsNothing); - expect(dismissedItems, equals([0, 1])); + expect(dismissedItems, equals([0, 1])); expect(reportedDismissDirection, DismissDirection.endToStart); }); @@ -157,12 +157,12 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.up); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); expect(reportedDismissDirection, DismissDirection.up); dismissItem(tester, 1, gestureDirection: DismissDirection.down); expect(find.text('1'), findsNothing); - expect(dismissedItems, equals([0, 1])); + expect(dismissedItems, equals([0, 1])); expect(reportedDismissDirection, DismissDirection.down); }); @@ -180,7 +180,7 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.endToStart); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); dismissItem(tester, 1, gestureDirection: DismissDirection.endToStart); }); @@ -197,7 +197,7 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.startToEnd); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); }); testWidgets('drag-up with DismissDirection.up triggers dismiss', (WidgetTester tester) { @@ -213,7 +213,7 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.up); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); }); testWidgets('drag-down with DismissDirection.down triggers dismiss', (WidgetTester tester) { @@ -229,7 +229,7 @@ void main() { dismissItem(tester, 0, gestureDirection: DismissDirection.down); expect(find.text('0'), findsNothing); - expect(dismissedItems, equals([0])); + expect(dismissedItems, equals([0])); }); // This is a regression test for an fn2 bug where dragging a card caused an diff --git a/packages/flutter/test/widget/flow_test.dart b/packages/flutter/test/widget/flow_test.dart index 4306bcedda..45c8ac3b8d 100644 --- a/packages/flutter/test/widget/flow_test.dart +++ b/packages/flutter/test/widget/flow_test.dart @@ -68,21 +68,21 @@ void main() { ); tester.tap(find.text('0')); - expect(log, equals([0])); + expect(log, equals([0])); tester.tap(find.text('1')); - expect(log, equals([0, 1])); + expect(log, equals([0, 1])); tester.tap(find.text('2')); - expect(log, equals([0, 1, 2])); + expect(log, equals([0, 1, 2])); log.clear(); tester.tapAt(new Point(20.0, 90.0)); - expect(log, equals([1])); + expect(log, equals([1])); startOffset.value = 50.0; tester.pump(); log.clear(); tester.tapAt(new Point(20.0, 90.0)); - expect(log, equals([0])); + expect(log, equals([0])); }); } diff --git a/packages/flutter/test/widget/focus_test.dart b/packages/flutter/test/widget/focus_test.dart index 919db2380a..55e8959bb1 100644 --- a/packages/flutter/test/widget/focus_test.dart +++ b/packages/flutter/test/widget/focus_test.dart @@ -121,7 +121,7 @@ void main() { new Focus( key: keyParentFocus, child: new Row( - children: [ + children: [ new TestFocusable( key: keyA, no: 'a', @@ -148,7 +148,7 @@ void main() { new Focus( key: keyParentFocus, child: new Row( - children: [ + children: [ new TestFocusable( key: keyA, no: 'a', @@ -174,7 +174,7 @@ void main() { new Focus( key: keyParentFocus, child: new Row( - children: [ + children: [ new TestFocusable( key: keyA, no: 'a', diff --git a/packages/flutter/test/widget/inherited_test.dart b/packages/flutter/test/widget/inherited_test.dart index 782b9af252..fc06580a64 100644 --- a/packages/flutter/test/widget/inherited_test.dart +++ b/packages/flutter/test/widget/inherited_test.dart @@ -44,17 +44,17 @@ void main() { TestInherited first = new TestInherited(child: builder); tester.pumpWidget(first); - expect(log, equals([first])); + expect(log, equals([first])); TestInherited second = new TestInherited(child: builder, shouldNotify: false); tester.pumpWidget(second); - expect(log, equals([first])); + expect(log, equals([first])); TestInherited third = new TestInherited(child: builder, shouldNotify: true); tester.pumpWidget(third); - expect(log, equals([first, third])); + expect(log, equals([first, third])); }); testWidgets('Update inherited when reparenting state', (WidgetTester tester) { @@ -79,12 +79,12 @@ void main() { TestInherited first = build(); tester.pumpWidget(first); - expect(log, equals([first])); + expect(log, equals([first])); TestInherited second = build(); tester.pumpWidget(second); - expect(log, equals([first, second])); + expect(log, equals([first, second])); }); testWidgets('Update inherited when removing node', (WidgetTester tester) { diff --git a/packages/flutter/test/widget/lazy_block_viewport_test.dart b/packages/flutter/test/widget/lazy_block_viewport_test.dart index 6550ba43cc..22576fc8e9 100644 --- a/packages/flutter/test/widget/lazy_block_viewport_test.dart +++ b/packages/flutter/test/widget/lazy_block_viewport_test.dart @@ -37,19 +37,19 @@ void main() { FlipWidgetState testWidget = tester.state(find.byType(FlipWidget)); - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); callbackTracker.clear(); testWidget.flip(); tester.pump(); - expect(callbackTracker, equals([])); + expect(callbackTracker, equals([])); callbackTracker.clear(); testWidget.flip(); tester.pump(); - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); }); testWidgets('LazyBlockViewport vertical', (WidgetTester tester) { @@ -84,7 +84,7 @@ void main() { tester.pumpWidget(builder()); // 0 is built to find its height - expect(callbackTracker, equals([0, 1, 2, 3, 4])); + expect(callbackTracker, equals([0, 1, 2, 3, 4])); callbackTracker.clear(); offset = 400.0; // now only 3 should fit, numbered 2-4. @@ -92,13 +92,13 @@ void main() { tester.pumpWidget(builder()); // We build all the children to find their new size. - expect(callbackTracker, equals([0, 1, 2, 3, 4])); + expect(callbackTracker, equals([0, 1, 2, 3, 4])); callbackTracker.clear(); tester.pumpWidget(builder()); // 0 isn't built because they're not visible. - expect(callbackTracker, equals([1, 2, 3, 4])); + expect(callbackTracker, equals([1, 2, 3, 4])); callbackTracker.clear(); }); @@ -135,7 +135,7 @@ void main() { tester.pumpWidget(builder()); // 0 is built to find its width - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); callbackTracker.clear(); @@ -144,13 +144,13 @@ void main() { tester.pumpWidget(builder()); // We build all the children to find their new size. - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); callbackTracker.clear(); tester.pumpWidget(builder()); // 0 isn't built because they're not visible. - expect(callbackTracker, equals([1, 2, 3, 4, 5])); + expect(callbackTracker, equals([1, 2, 3, 4, 5])); callbackTracker.clear(); }); @@ -182,18 +182,18 @@ void main() { tester.pumpWidget(builder()); - expect(callbackTracker, equals([0, 1, 2])); + expect(callbackTracker, equals([0, 1, 2])); callbackTracker.clear(); tester.allWidgets.forEach(collectText); - expect(text, equals(['0', '1', '2'])); + expect(text, equals(['0', '1', '2'])); text.clear(); tester.pumpWidget(builder()); - expect(callbackTracker, equals([0, 1, 2])); + expect(callbackTracker, equals([0, 1, 2])); callbackTracker.clear(); tester.allWidgets.forEach(collectText); - expect(text, equals(['0', '1', '2'])); + expect(text, equals(['0', '1', '2'])); text.clear(); }); diff --git a/packages/flutter/test/widget/listener_test.dart b/packages/flutter/test/widget/listener_test.dart index 8ce725b239..64784e47b0 100644 --- a/packages/flutter/test/widget/listener_test.dart +++ b/packages/flutter/test/widget/listener_test.dart @@ -34,7 +34,7 @@ void main() { tester.tap(find.text('X')); - expect(log, equals([ + expect(log, equals([ 'bottom', 'middle', 'top', diff --git a/packages/flutter/test/widget/overflow_box_test.dart b/packages/flutter/test/widget/overflow_box_test.dart index 582a80458e..a75024c273 100644 --- a/packages/flutter/test/widget/overflow_box_test.dart +++ b/packages/flutter/test/widget/overflow_box_test.dart @@ -39,7 +39,7 @@ void main() { minHeight: 3.0, maxHeight: 4.0 ).debugFillDescription(description); - expect(description, [ + expect(description, [ 'alignment: FractionalOffset(0.5, 0.5)', 'minWidth: 1.0', 'maxWidth: 2.0', diff --git a/packages/flutter/test/widget/positioned_test.dart b/packages/flutter/test/widget/positioned_test.dart index e5e78d5eda..f77c2574f2 100644 --- a/packages/flutter/test/widget/positioned_test.dart +++ b/packages/flutter/test/widget/positioned_test.dart @@ -66,8 +66,8 @@ void main() { tester.pump(const Duration(seconds: 5)); // t=10 recordMetrics(); - expect(sizes, equals([const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0)])); - expect(positions, equals([const Offset(10.0, 10.0), const Offset(10.0, 10.0), const Offset(17.0, 17.0), const Offset(24.0, 24.0), const Offset(45.0, 45.0), const Offset(80.0, 80.0)])); + expect(sizes, equals([const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0), const Size(10.0, 10.0)])); + expect(positions, equals([const Offset(10.0, 10.0), const Offset(10.0, 10.0), const Offset(17.0, 17.0), const Offset(24.0, 24.0), const Offset(45.0, 45.0), const Offset(80.0, 80.0)])); controller.stop(); }); diff --git a/packages/flutter/test/widget/reparent_state_test.dart b/packages/flutter/test/widget/reparent_state_test.dart index bdc0a16208..73cd4e8fee 100644 --- a/packages/flutter/test/widget/reparent_state_test.dart +++ b/packages/flutter/test/widget/reparent_state_test.dart @@ -316,13 +316,13 @@ void main() { new Container(key: new UniqueKey(), child: logger) ); - expect(log, equals(['build'])); + expect(log, equals(['build'])); tester.pumpWidget( new Container(key: new UniqueKey(), child: logger) ); - expect(log, equals(['build', 'deactivate', 'build'])); + expect(log, equals(['build', 'deactivate', 'build'])); log.clear(); tester.pump(); diff --git a/packages/flutter/test/widget/rotated_box_test.dart b/packages/flutter/test/widget/rotated_box_test.dart index 87ecad55e9..bda2c695d9 100644 --- a/packages/flutter/test/widget/rotated_box_test.dart +++ b/packages/flutter/test/widget/rotated_box_test.dart @@ -46,11 +46,11 @@ void main() { expect(box.size.height, equals(175.0)); tester.tapAt(new Point(420.0, 280.0)); - expect(log, equals(['left'])); + expect(log, equals(['left'])); log.clear(); tester.tapAt(new Point(380.0, 320.0)); - expect(log, equals(['right'])); + expect(log, equals(['right'])); log.clear(); }); } diff --git a/packages/flutter/test/widget/routes_test.dart b/packages/flutter/test/widget/routes_test.dart index b7b7ddcd75..0f88253e02 100644 --- a/packages/flutter/test/widget/routes_test.dart +++ b/packages/flutter/test/widget/routes_test.dart @@ -102,7 +102,7 @@ void main() { host, (NavigatorTransaction transaction) { }, - [ + [ 'initial: install', 'initial: didPush', 'initial: didChangeNext null', @@ -115,7 +115,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(second = new TestRoute('second')); }, - [ + [ 'second: install', 'second: didPush', 'second: didChangeNext null', @@ -128,7 +128,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(new TestRoute('third')); }, - [ + [ 'third: install', 'third: didPush', 'third: didChangeNext null', @@ -141,7 +141,7 @@ void main() { (NavigatorTransaction transaction) { transaction.replace(oldRoute: second, newRoute: new TestRoute('two')); }, - [ + [ 'two: install', 'two: didReplace second', 'two: didChangeNext third', @@ -155,7 +155,7 @@ void main() { (NavigatorTransaction transaction) { transaction.pop('hello'); }, - [ + [ 'third: didPop hello', 'third: dispose', 'two: didPopNext third', @@ -167,14 +167,14 @@ void main() { (NavigatorTransaction transaction) { transaction.pop('good bye'); }, - [ + [ 'two: didPop good bye', 'two: dispose', 'initial: didPopNext two', ] ); tester.pumpWidget(new Container()); - expect(results, equals(['initial: dispose'])); + expect(results, equals(['initial: dispose'])); expect(routes.isEmpty, isTrue); results.clear(); }); @@ -191,7 +191,7 @@ void main() { host, (NavigatorTransaction transaction) { }, - [ + [ 'first: install', 'first: didPush', 'first: didChangeNext null', @@ -204,7 +204,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(second = new TestRoute('second')); }, - [ + [ 'second: install', 'second: didPush', 'second: didChangeNext null', @@ -217,7 +217,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(new TestRoute('third')); }, - [ + [ 'third: install', 'third: didPush', 'third: didChangeNext null', @@ -230,7 +230,7 @@ void main() { (NavigatorTransaction transaction) { transaction.removeRouteBefore(second); }, - [ + [ 'first: dispose', ] ); @@ -240,7 +240,7 @@ void main() { (NavigatorTransaction transaction) { transaction.pop('good bye'); }, - [ + [ 'third: didPop good bye', 'third: dispose', 'second: didPopNext third', @@ -252,7 +252,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(new TestRoute('three')); }, - [ + [ 'three: install', 'three: didPush', 'three: didChangeNext null', @@ -266,7 +266,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(four = new TestRoute('four')); }, - [ + [ 'four: install', 'four: didPush', 'four: didChangeNext null', @@ -279,7 +279,7 @@ void main() { (NavigatorTransaction transaction) { transaction.removeRouteBefore(four); }, - [ + [ 'second: didChangeNext four', 'three: dispose', ] @@ -290,14 +290,14 @@ void main() { (NavigatorTransaction transaction) { transaction.pop('the end'); }, - [ + [ 'four: didPop the end', 'four: dispose', 'second: didPopNext four', ] ); tester.pumpWidget(new Container()); - expect(results, equals(['second: dispose'])); + expect(results, equals(['second: dispose'])); expect(routes.isEmpty, isTrue); results.clear(); }); @@ -314,7 +314,7 @@ void main() { host, (NavigatorTransaction transaction) { }, - [ + [ 'A: install', 'A: didPush', 'A: didChangeNext null', @@ -326,7 +326,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(new TestRoute('B')); }, - [ + [ 'B: install', 'B: didPush', 'B: didChangeNext null', @@ -340,7 +340,7 @@ void main() { (NavigatorTransaction transaction) { transaction.push(routeC = new TestRoute('C')); }, - [ + [ 'C: install', 'C: didPush', 'C: didChangeNext null', @@ -354,7 +354,7 @@ void main() { (NavigatorTransaction transaction) { transaction.replaceRouteBefore(anchorRoute: routeC, newRoute: routeB = new TestRoute('b')); }, - [ + [ 'b: install', 'b: didReplace B', 'b: didChangeNext C', @@ -368,14 +368,14 @@ void main() { (NavigatorTransaction transaction) { transaction.popUntil(routeB); }, - [ + [ 'C: didPop null', 'C: dispose', 'b: didPopNext C', ] ); tester.pumpWidget(new Container()); - expect(results, equals(['A: dispose', 'b: dispose'])); + expect(results, equals(['A: dispose', 'b: dispose'])); expect(routes.isEmpty, isTrue); results.clear(); }); diff --git a/packages/flutter/test/widget/scroll_events_test.dart b/packages/flutter/test/widget/scroll_events_test.dart index 827852d3ec..1f6ba413e8 100644 --- a/packages/flutter/test/widget/scroll_events_test.dart +++ b/packages/flutter/test/widget/scroll_events_test.dart @@ -27,19 +27,19 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(log: log)); - expect(log, equals([])); + expect(log, equals([])); TestGesture gesture = tester.startGesture(new Point(100.0, 100.0)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(seconds: 1)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); gesture.moveBy(new Offset(-10.0, -10.0)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); tester.pump(const Duration(seconds: 1)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); gesture.up(); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); tester.pump(const Duration(seconds: 1)); - expect(log, equals(['scrollstart', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scrollend'])); }); testWidgets('Scroll scrollTo animation', (WidgetTester tester) { @@ -47,15 +47,15 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); scrollKey.currentState.scrollTo(100.0, duration: const Duration(seconds: 1)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); tester.pump(const Duration(milliseconds: 1500)); - expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); }); testWidgets('Scroll scrollTo no animation', (WidgetTester tester) { @@ -63,9 +63,9 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); scrollKey.currentState.scrollTo(100.0); - expect(log, equals(['scrollstart', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scrollend'])); }); testWidgets('Scroll during animation', (WidgetTester tester) { @@ -73,19 +73,19 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); scrollKey.currentState.scrollTo(100.0, duration: const Duration(seconds: 1)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); scrollKey.currentState.scrollTo(100.0); - expect(log, equals(['scrollstart', 'scroll', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll', 'scroll'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); tester.pump(const Duration(milliseconds: 1500)); - expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); }); testWidgets('Scroll during animation', (WidgetTester tester) { @@ -93,19 +93,19 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); scrollKey.currentState.scrollTo(100.0, duration: const Duration(seconds: 1)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); scrollKey.currentState.scrollTo(100.0, duration: const Duration(seconds: 1)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); tester.pump(const Duration(milliseconds: 100)); - expect(log, equals(['scrollstart', 'scroll'])); + expect(log, equals(['scrollstart', 'scroll'])); tester.pump(const Duration(milliseconds: 1500)); - expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); + expect(log, equals(['scrollstart', 'scroll', 'scroll', 'scrollend'])); }); testWidgets('fling, fling generates two start/end pairs', (WidgetTester tester) { @@ -113,18 +113,18 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); tester.flingFrom(new Point(100.0, 100.0), new Offset(-50.0, -50.0), 500.0); tester.pump(new Duration(seconds: 1)); log.removeWhere((String value) => value == 'scroll'); - expect(log, equals(['scrollstart'])); + expect(log, equals(['scrollstart'])); tester.flingFrom(new Point(100.0, 100.0), new Offset(-50.0, -50.0), 500.0); log.removeWhere((String value) => value == 'scroll'); - expect(log, equals(['scrollstart', 'scrollend', 'scrollstart'])); + expect(log, equals(['scrollstart', 'scrollend', 'scrollstart'])); tester.pump(new Duration(seconds: 1)); tester.pump(new Duration(seconds: 1)); log.removeWhere((String value) => value == 'scroll'); - expect(log, equals(['scrollstart', 'scrollend', 'scrollstart', 'scrollend'])); + expect(log, equals(['scrollstart', 'scrollend', 'scrollstart', 'scrollend'])); }); testWidgets('fling up ends', (WidgetTester tester) { @@ -132,7 +132,7 @@ void main() { List log = []; tester.pumpWidget(_buildScroller(key: scrollKey, log: log)); - expect(log, equals([])); + expect(log, equals([])); tester.flingFrom(new Point(100.0, 100.0), new Offset(50.0, 50.0), 500.0); tester.pump(new Duration(seconds: 1)); tester.pump(new Duration(seconds: 1)); diff --git a/packages/flutter/test/widget/scrollable_lazy_list_test.dart b/packages/flutter/test/widget/scrollable_lazy_list_test.dart index 4962bdbadd..c22b1ae999 100644 --- a/packages/flutter/test/widget/scrollable_lazy_list_test.dart +++ b/packages/flutter/test/widget/scrollable_lazy_list_test.dart @@ -40,19 +40,19 @@ void main() { FlipWidgetState testWidget = tester.state(find.byType(FlipWidget)); - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); callbackTracker.clear(); testWidget.flip(); tester.pump(); - expect(callbackTracker, equals([])); + expect(callbackTracker, equals([])); callbackTracker.clear(); testWidget.flip(); tester.pump(); - expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); + expect(callbackTracker, equals([0, 1, 2, 3, 4, 5])); }); testWidgets('HomogeneousViewport vertical', (WidgetTester tester) { @@ -89,7 +89,7 @@ void main() { tester.pumpWidget(testWidget); - expect(callbackTracker, equals([1, 2, 3, 4])); + expect(callbackTracker, equals([1, 2, 3, 4])); callbackTracker.clear(); @@ -98,7 +98,7 @@ void main() { tester.pumpWidget(testWidget); - expect(callbackTracker, equals([2, 3, 4])); + expect(callbackTracker, equals([2, 3, 4])); callbackTracker.clear(); }); @@ -138,7 +138,7 @@ void main() { tester.pumpWidget(testWidget); - expect(callbackTracker, equals([1, 2, 3, 4, 5])); + expect(callbackTracker, equals([1, 2, 3, 4, 5])); callbackTracker.clear(); @@ -147,7 +147,7 @@ void main() { tester.pumpWidget(testWidget); - expect(callbackTracker, equals([2, 3, 4, 5])); + expect(callbackTracker, equals([2, 3, 4, 5])); callbackTracker.clear(); }); @@ -177,22 +177,22 @@ void main() { ); tester.pumpWidget(testWidget); - expect(callbackTracker, equals([0, 1])); + expect(callbackTracker, equals([0, 1])); callbackTracker.clear(); scrollableKey.currentState.scrollTo(150.0); tester.pumpWidget(testWidget); - expect(callbackTracker, equals([0, 1, 2])); + expect(callbackTracker, equals([0, 1, 2])); callbackTracker.clear(); scrollableKey.currentState.scrollTo(600.0); tester.pumpWidget(testWidget); - expect(callbackTracker, equals([2, 3])); + expect(callbackTracker, equals([2, 3])); callbackTracker.clear(); scrollableKey.currentState.scrollTo(750.0); tester.pumpWidget(testWidget); - expect(callbackTracker, equals([2, 3, 4])); + expect(callbackTracker, equals([2, 3, 4])); callbackTracker.clear(); }); diff --git a/packages/flutter/test/widget/scrollable_list_hit_testing_test.dart b/packages/flutter/test/widget/scrollable_list_hit_testing_test.dart index dbca5b7329..b2b31497e1 100644 --- a/packages/flutter/test/widget/scrollable_list_hit_testing_test.dart +++ b/packages/flutter/test/widget/scrollable_list_hit_testing_test.dart @@ -43,9 +43,9 @@ void main() { expect(find.text('3'), findsOneWidget); expect(find.text('4'), findsNothing); expect(find.text('5'), findsNothing); - expect(tapped, equals([])); + expect(tapped, equals([])); tester.tap(find.text('2')); - expect(tapped, equals([2])); + expect(tapped, equals([2])); }); testWidgets('Tap item after scroll - vertical', (WidgetTester tester) { @@ -81,11 +81,11 @@ void main() { expect(find.text('3'), findsOneWidget); expect(find.text('4'), findsNothing); expect(find.text('5'), findsNothing); - expect(tapped, equals([])); + expect(tapped, equals([])); tester.tap(find.text('1')); - expect(tapped, equals([1])); + expect(tapped, equals([1])); tester.tap(find.text('3')); - expect(tapped, equals([1])); // the center of the third item is off-screen so it shouldn't get hit + expect(tapped, equals([1])); // the center of the third item is off-screen so it shouldn't get hit }); testWidgets('Padding scroll anchor start', (WidgetTester tester) { @@ -107,17 +107,17 @@ void main() { ) ); tester.tapAt(new Point(200.0, 19.0)); - expect(tapped, equals([])); + expect(tapped, equals([])); tester.tapAt(new Point(200.0, 21.0)); - expect(tapped, equals([0])); + expect(tapped, equals([0])); tester.tapAt(new Point(4.0, 400.0)); - expect(tapped, equals([0])); + expect(tapped, equals([0])); tester.tapAt(new Point(6.0, 400.0)); - expect(tapped, equals([0, 1])); + expect(tapped, equals([0, 1])); tester.tapAt(new Point(800.0 - 14.0, 400.0)); - expect(tapped, equals([0, 1])); + expect(tapped, equals([0, 1])); tester.tapAt(new Point(800.0 - 16.0, 400.0)); - expect(tapped, equals([0, 1, 1])); + expect(tapped, equals([0, 1, 1])); }); testWidgets('Padding scroll anchor end', (WidgetTester tester) { @@ -140,16 +140,16 @@ void main() { ) ); tester.tapAt(new Point(200.0, 600.0 - 9.0)); - expect(tapped, equals([])); + expect(tapped, equals([])); tester.tapAt(new Point(200.0, 600.0 - 11.0)); - expect(tapped, equals([5])); + expect(tapped, equals([5])); tester.tapAt(new Point(4.0, 200.0)); - expect(tapped, equals([5])); + expect(tapped, equals([5])); tester.tapAt(new Point(6.0, 200.0)); - expect(tapped, equals([5, 4])); + expect(tapped, equals([5, 4])); tester.tapAt(new Point(800.0 - 14.0, 200.0)); - expect(tapped, equals([5, 4])); + expect(tapped, equals([5, 4])); tester.tapAt(new Point(800.0 - 16.0, 200.0)); - expect(tapped, equals([5, 4, 4])); + expect(tapped, equals([5, 4, 4])); }); } diff --git a/packages/flutter/test/widget/semantics_1_test.dart b/packages/flutter/test/widget/semantics_1_test.dart index 83a0f20cb2..f7bf310f1d 100644 --- a/packages/flutter/test/widget/semantics_1_test.dart +++ b/packages/flutter/test/widget/semantics_1_test.dart @@ -134,7 +134,7 @@ void main() { expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].strings.label, equals('child2')); - expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); + expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); expect(client.updates[0].children[1].geometry.left, equals(0.0)); expect(client.updates[0].children[1].geometry.top, equals(0.0)); expect(client.updates[0].children[1].geometry.width, equals(800.0)); @@ -236,7 +236,7 @@ void main() { expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].strings.label, equals('child2')); - expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); + expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); expect(client.updates[0].children[1].geometry.left, equals(0.0)); expect(client.updates[0].children[1].geometry.top, equals(0.0)); expect(client.updates[0].children[1].geometry.width, equals(800.0)); diff --git a/packages/flutter/test/widget/semantics_2_test.dart b/packages/flutter/test/widget/semantics_2_test.dart index 6761f34147..dcc089d134 100644 --- a/packages/flutter/test/widget/semantics_2_test.dart +++ b/packages/flutter/test/widget/semantics_2_test.dart @@ -74,7 +74,7 @@ void main() { expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].strings.label, equals('child2')); - expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); + expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); expect(client.updates[0].children[1].geometry.left, equals(0.0)); expect(client.updates[0].children[1].geometry.top, equals(0.0)); expect(client.updates[0].children[1].geometry.width, equals(800.0)); @@ -176,7 +176,7 @@ void main() { expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].strings.label, equals('child2')); - expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); + expect(client.updates[0].children[1].geometry.transform, equals([1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,10.0,0.0,1.0])); expect(client.updates[0].children[1].geometry.left, equals(0.0)); expect(client.updates[0].children[1].geometry.top, equals(0.0)); expect(client.updates[0].children[1].geometry.width, equals(800.0)); diff --git a/packages/flutter/test/widget/stack_test.dart b/packages/flutter/test/widget/stack_test.dart index e898144fb4..0a09739c53 100644 --- a/packages/flutter/test/widget/stack_test.dart +++ b/packages/flutter/test/widget/stack_test.dart @@ -155,13 +155,13 @@ void main() { expect(find.text('0'), findsOneWidget); expect(find.text('1'), findsOneWidget); expect(find.text('2'), findsOneWidget); - expect(itemsPainted, equals([0])); + expect(itemsPainted, equals([0])); tester.pumpWidget(buildFrame(1)); - expect(itemsPainted, equals([1])); + expect(itemsPainted, equals([1])); tester.pumpWidget(buildFrame(2)); - expect(itemsPainted, equals([2])); + expect(itemsPainted, equals([2])); }); testWidgets('Can hit test an IndexedStack', (WidgetTester tester) { @@ -180,12 +180,12 @@ void main() { tester.pumpWidget(buildFrame(0)); expect(itemsTapped, isEmpty); tester.tap(find.byKey(key)); - expect(itemsTapped, [0]); + expect(itemsTapped, [0]); tester.pumpWidget(buildFrame(2)); expect(itemsTapped, isEmpty); tester.tap(find.byKey(key)); - expect(itemsTapped, [2]); + expect(itemsTapped, [2]); }); testWidgets('Can set width and height', (WidgetTester tester) {