From b8286be18ddcc292024a023700fe04f2543e0fbf Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 11 Nov 2015 09:47:06 -0800 Subject: [PATCH] Named parameters for the mock_events.dart TestPointer class --- packages/unit/test/engine/mock_events.dart | 8 ++++---- packages/unit/test/gestures/pointer_router_test.dart | 4 ++-- packages/unit/test/widget/widget_tester.dart | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/unit/test/engine/mock_events.dart b/packages/unit/test/engine/mock_events.dart index 7aa0e87c613..cbe55d015b2 100644 --- a/packages/unit/test/engine/mock_events.dart +++ b/packages/unit/test/engine/mock_events.dart @@ -11,7 +11,7 @@ class TestPointer { bool isDown = false; ui.Point location; - PointerInputEvent down([ui.Point newLocation = ui.Point.origin, double timeStamp = 0.0 ]) { + PointerInputEvent down(ui.Point newLocation, { double timeStamp: 0.0 }) { assert(!isDown); isDown = true; location = newLocation; @@ -24,7 +24,7 @@ class TestPointer { ); } - PointerInputEvent move([ui.Point newLocation = ui.Point.origin, double timeStamp = 0.0]) { + PointerInputEvent move(ui.Point newLocation, { double timeStamp: 0.0 }) { assert(isDown); ui.Offset delta = newLocation - location; location = newLocation; @@ -39,7 +39,7 @@ class TestPointer { ); } - PointerInputEvent up([ double timeStamp = 0.0 ]) { + PointerInputEvent up({ double timeStamp: 0.0 }) { assert(isDown); isDown = false; return new PointerInputEvent( @@ -51,7 +51,7 @@ class TestPointer { ); } - PointerInputEvent cancel([ double timeStamp = 0.0 ]) { + PointerInputEvent cancel({ double timeStamp: 0.0 }) { assert(isDown); isDown = false; return new PointerInputEvent( diff --git a/packages/unit/test/gestures/pointer_router_test.dart b/packages/unit/test/gestures/pointer_router_test.dart index ba3efb9932d..a89f4694307 100644 --- a/packages/unit/test/gestures/pointer_router_test.dart +++ b/packages/unit/test/gestures/pointer_router_test.dart @@ -15,9 +15,9 @@ void main() { PointerRouter router = new PointerRouter(); router.addRoute(3, callback); - router.route(pointer2.down()); + router.route(pointer2.down(Point.origin)); expect(callbackRan, isFalse); - router.route(pointer3.down()); + router.route(pointer3.down(Point.origin)); expect(callbackRan, isTrue); callbackRan = false; router.removeRoute(3, callback); diff --git a/packages/unit/test/widget/widget_tester.dart b/packages/unit/test/widget/widget_tester.dart index 6fff24d70a9..02f714deae4 100644 --- a/packages/unit/test/widget/widget_tester.dart +++ b/packages/unit/test/widget/widget_tester.dart @@ -156,13 +156,13 @@ class WidgetTester { final kMoveCount = 50; // Needs to be >= kHistorySize, see _LeastSquaresVelocityTrackerStrategy final double timeStampDelta = 1000.0 * offset.distance / (kMoveCount * velocity); double timeStamp = 0.0; - _dispatchEvent(p.down(startLocation, timeStamp), result); + _dispatchEvent(p.down(startLocation, timeStamp: timeStamp), result); for(int i = 0; i < kMoveCount; i++) { final Point location = startLocation + Offset.lerp(Offset.zero, offset, i / kMoveCount); - _dispatchEvent(p.move(location, timeStamp), result); + _dispatchEvent(p.move(location, timeStamp: timeStamp), result); timeStamp += timeStampDelta; } - _dispatchEvent(p.up(timeStamp), result); + _dispatchEvent(p.up(timeStamp: timeStamp), result); } void scroll(Element element, Offset offset, { int pointer: 1 }) {