diff --git a/test/game/components/board_test.dart b/test/game/components/board_test.dart index 2f51b2b1..3db3edca 100644 --- a/test/game/components/board_test.dart +++ b/test/game/components/board_test.dart @@ -9,7 +9,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); group('Board', () { flameTester.test( diff --git a/test/game/components/bonus_word_test.dart b/test/game/components/bonus_word_test.dart index 7d73b6bc..5677466e 100644 --- a/test/game/components/bonus_word_test.dart +++ b/test/game/components/bonus_word_test.dart @@ -12,7 +12,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); group('BonusWord', () { flameTester.test( @@ -118,7 +118,7 @@ void main() { }); group('BonusLetter', () { - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); flameTester.test( 'loads correctly', @@ -198,7 +198,7 @@ void main() { final flameBlocTester = FlameBlocTester( // TODO(alestiago): Use TestGame once BonusLetter has controller. - gameBuilder: PinballGameTest.create, + gameBuilder: PinballGameTest.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart index f9494543..2574d75a 100644 --- a/test/game/components/controlled_ball_test.dart +++ b/test/game/components/controlled_ball_test.dart @@ -13,7 +13,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); group('BonusBallController', () { late Ball ball; @@ -67,7 +67,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: PinballGameTest.create, + gameBuilder: PinballGameTest.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/controlled_flipper_test.dart b/test/game/components/controlled_flipper_test.dart index eabeca5e..f24fd611 100644 --- a/test/game/components/controlled_flipper_test.dart +++ b/test/game/components/controlled_flipper_test.dart @@ -10,7 +10,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); group('FlipperController', () { group('onKeyEvent', () { diff --git a/test/game/components/flutter_forest_test.dart b/test/game/components/flutter_forest_test.dart index da3f4fee..60c55be9 100644 --- a/test/game/components/flutter_forest_test.dart +++ b/test/game/components/flutter_forest_test.dart @@ -25,7 +25,7 @@ void beginContact(Forge2DGame game, BodyComponent bodyA, BodyComponent bodyB) { void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGame.create); + final flameTester = FlameTester(EmptyPinballGameTest.new); group('FlutterForest', () { flameTester.test( @@ -146,7 +146,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGame.create, + gameBuilder: EmptyPinballGameTest.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 52008074..f418bad0 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -12,8 +12,8 @@ import '../helpers/helpers.dart'; void main() { group('PinballGame', () { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.create); - final debugModeFlameTester = FlameTester(DebugPinballGameTest.create); + final flameTester = FlameTester(PinballGameTest.new); + final debugModeFlameTester = FlameTester(DebugPinballGameTest.new); // TODO(alestiago): test if [PinballGame] registers // [BallScorePointsCallback] once the following issue is resolved: diff --git a/test/helpers/extensions.dart b/test/helpers/extensions.dart index 4842bc7f..15ae59e9 100644 --- a/test/helpers/extensions.dart +++ b/test/helpers/extensions.dart @@ -1,36 +1,25 @@ -import 'package:flutter/services.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_theme/pinball_theme.dart'; -/// [PinballGame] extension to reduce boilerplate in tests. -extension PinballGameTest on PinballGame { - /// Create [PinballGame] with default [PinballTheme]. - static PinballGame create() => PinballGame( - theme: const PinballTheme( - characterTheme: DashTheme(), - ), - )..images.prefix = ''; +class PinballGameTest extends PinballGame { + PinballGameTest() + : super( + theme: const PinballTheme( + characterTheme: DashTheme(), + ), + ); } -/// [DebugPinballGame] extension to reduce boilerplate in tests. -extension DebugPinballGameTest on DebugPinballGame { - /// Create [PinballGame] with default [PinballTheme]. - static DebugPinballGame create() => DebugPinballGame( - theme: const PinballTheme( - characterTheme: DashTheme(), - ), - ); +class DebugPinballGameTest extends DebugPinballGame { + DebugPinballGameTest() + : super( + theme: const PinballTheme( + characterTheme: DashTheme(), + ), + ); } -class EmptyPinballGame extends PinballGame { - EmptyPinballGame({required PinballTheme theme}) : super(theme: theme); - +class EmptyPinballGameTest extends PinballGameTest { @override Future onLoad() async {} - - static PinballGame create() => EmptyPinballGame( - theme: const PinballTheme( - characterTheme: DashTheme(), - ), - ); }