From fed6887aa00eeafb4252b969e740898a2609eeab Mon Sep 17 00:00:00 2001 From: Ferhat Date: Mon, 23 Mar 2020 11:54:32 -0700 Subject: [PATCH] Remove implements Function (#53113) --- .../test/material/icon_button_test.dart | 30 +++++++++---------- .../widgets/implicit_animations_test.dart | 26 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/flutter/test/material/icon_button_test.dart b/packages/flutter/test/material/icon_button_test.dart index 39b011ad5e..93fd1ef407 100644 --- a/packages/flutter/test/material/icon_button_test.dart +++ b/packages/flutter/test/material/icon_button_test.dart @@ -12,10 +12,10 @@ import '../rendering/mock_canvas.dart'; import '../widgets/semantics_tester.dart'; import 'feedback_tester.dart'; -class MockOnPressedFunction implements Function { +class MockOnPressedFunction { int called = 0; - void call() { + void handler() { called++; } } @@ -31,7 +31,7 @@ void main() { await tester.pumpWidget( wrap( child: IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), ), ), @@ -49,7 +49,7 @@ void main() { wrap( child: IconButton( iconSize: 10.0, - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), ), ), @@ -65,7 +65,7 @@ void main() { child: IconButton( iconSize: 10.0, padding: const EdgeInsets.all(30.0), - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), ), ), @@ -80,7 +80,7 @@ void main() { wrap( child: IconButton( iconSize: 10.0, - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), constraints: const BoxConstraints(), ), @@ -100,7 +100,7 @@ void main() { child: IconButton( iconSize: 10.0, padding: const EdgeInsets.all(3.0), - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), constraints: const BoxConstraints(), ), @@ -121,7 +121,7 @@ void main() { data: ThemeData(visualDensity: const VisualDensity(horizontal: 1, vertical: -1)), child: IconButton( iconSize: 10.0, - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link), constraints: const BoxConstraints(minWidth: 32.0, minHeight: 32.0), ), @@ -143,7 +143,7 @@ void main() { wrap( child: IconButton( padding: EdgeInsets.zero, - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), iconSize: 80.0, ), @@ -163,7 +163,7 @@ void main() { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), ), ], @@ -180,7 +180,7 @@ void main() { await tester.pumpWidget( wrap( child: IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), iconSize: 80.0, ), @@ -197,7 +197,7 @@ void main() { home: Material( child: Center( child: IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), ), ), @@ -215,7 +215,7 @@ void main() { home: Material( child: Center( child: IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), tooltip: 'Test tooltip', ), @@ -239,7 +239,7 @@ void main() { actions: [ IconButton( padding: EdgeInsets.zero, - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.ac_unit), ), ], @@ -343,7 +343,7 @@ void main() { await tester.pumpWidget( wrap( child: IconButton( - onPressed: mockOnPressedFunction, + onPressed: mockOnPressedFunction.handler, icon: const Icon(Icons.link, semanticLabel: 'link'), ), ), diff --git a/packages/flutter/test/widgets/implicit_animations_test.dart b/packages/flutter/test/widgets/implicit_animations_test.dart index 133dd3fc1d..7c680b4947 100644 --- a/packages/flutter/test/widgets/implicit_animations_test.dart +++ b/packages/flutter/test/widgets/implicit_animations_test.dart @@ -6,10 +6,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/widgets.dart'; -class MockOnEndFunction implements Function { +class MockOnEndFunction { int called = 0; - void call() { + void handler() { called++; } } @@ -70,7 +70,7 @@ void main() { testWidgets('AnimatedContainer onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedContainerWidgetState(), ) @@ -91,7 +91,7 @@ void main() { testWidgets('AnimatedPadding onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedPaddingWidgetState(), ) @@ -112,7 +112,7 @@ void main() { testWidgets('AnimatedAlign onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedAlignWidgetState(), ) @@ -133,7 +133,7 @@ void main() { testWidgets('AnimatedPositioned onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedPositionedWidgetState(), ) @@ -154,7 +154,7 @@ void main() { testWidgets('AnimatedPositionedDirectional onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedPositionedDirectionalWidgetState(), ) @@ -175,7 +175,7 @@ void main() { testWidgets('AnimatedOpacity onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedOpacityWidgetState(), ) @@ -223,7 +223,7 @@ void main() { testWidgets('SliverAnimatedOpacity onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestSliverAnimatedOpacityWidgetState(), )); @@ -271,7 +271,7 @@ void main() { testWidgets('AnimatedDefaultTextStyle onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedDefaultTextStyleWidgetState(), ) @@ -292,7 +292,7 @@ void main() { testWidgets('AnimatedPhysicalModel onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedPhysicalModelWidgetState(), ) @@ -313,7 +313,7 @@ void main() { testWidgets('TweenAnimationBuilder onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestTweenAnimationBuilderWidgetState(), ) @@ -334,7 +334,7 @@ void main() { testWidgets('AnimatedTheme onEnd callback test', (WidgetTester tester) async { await tester.pumpWidget(wrap( child: TestAnimatedWidget( - callback: mockOnEndFunction, + callback: mockOnEndFunction.handler, switchKey: switchKey, state: _TestAnimatedThemeWidgetState(), )