From c52db09f77ef7fa5df54ec94dc9b5b44a8b6e925 Mon Sep 17 00:00:00 2001 From: Alejandro Santiago Date: Fri, 15 Apr 2022 09:40:19 +0100 Subject: [PATCH] refactor: renamed test games (#178) --- test/game/components/alien_zone_test.dart | 4 ++-- test/game/components/board_test.dart | 2 +- test/game/components/controlled_ball_test.dart | 2 +- .../components/controlled_flipper_test.dart | 10 +++++----- .../components/controlled_plunger_test.dart | 8 ++++---- .../controlled_sparky_computer_test.dart | 2 +- test/game/components/flutter_forest_test.dart | 4 ++-- test/game/components/google_word_test.dart | 4 ++-- .../game/components/sparky_fire_zone_test.dart | 4 ++-- test/game/components/wall_test.dart | 4 ++-- test/game/pinball_game_test.dart | 8 ++++---- test/game/view/pinball_game_page_test.dart | 2 +- test/helpers/helpers.dart | 3 +-- test/helpers/test_game.dart | 8 -------- .../{extensions.dart => test_games.dart} | 18 +++++++++++++----- 15 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 test/helpers/test_game.dart rename test/helpers/{extensions.dart => test_games.dart} (56%) diff --git a/test/game/components/alien_zone_test.dart b/test/game/components/alien_zone_test.dart index 68a2c2f1..863bef31 100644 --- a/test/game/components/alien_zone_test.dart +++ b/test/game/components/alien_zone_test.dart @@ -13,7 +13,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); group('AlienZone', () { flameTester.test( @@ -52,7 +52,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/board_test.dart b/test/game/components/board_test.dart index 9f2a5260..0a1928ab 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(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); group('Board', () { flameTester.test( diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart index 41a1cdca..96c67dd4 100644 --- a/test/game/components/controlled_ball_test.dart +++ b/test/game/components/controlled_ball_test.dart @@ -41,7 +41,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/controlled_flipper_test.dart b/test/game/components/controlled_flipper_test.dart index c347736e..3c0fc1b0 100644 --- a/test/game/components/controlled_flipper_test.dart +++ b/test/game/components/controlled_flipper_test.dart @@ -11,10 +11,10 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); - final gameOverBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + final flameBlocTester = FlameBlocTester( + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () { final bloc = MockGameBloc(); const state = GameState( @@ -65,7 +65,7 @@ void main() { }); testRawKeyDownEvents(leftKeys, (event) { - gameOverBlocTester.testGameWidget( + flameBlocTester.testGameWidget( 'does nothing when is game over', setUp: (game, tester) async { await game.ensureAdd(flipper); @@ -150,7 +150,7 @@ void main() { }); testRawKeyDownEvents(rightKeys, (event) { - gameOverBlocTester.testGameWidget( + flameBlocTester.testGameWidget( 'does nothing when is game over', setUp: (game, tester) async { await game.ensureAdd(flipper); diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart index dddf407b..a377487e 100644 --- a/test/game/components/controlled_plunger_test.dart +++ b/test/game/components/controlled_plunger_test.dart @@ -12,10 +12,10 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); - final gameOverBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + final flameBlocTester = FlameBlocTester( + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () { final bloc = MockGameBloc(); const state = GameState( @@ -91,7 +91,7 @@ void main() { }); testRawKeyDownEvents(downKeys, (event) { - gameOverBlocTester.testGameWidget( + flameBlocTester.testGameWidget( 'does nothing when is game over', setUp: (game, tester) async { await game.ensureAdd(plunger); diff --git a/test/game/components/controlled_sparky_computer_test.dart b/test/game/components/controlled_sparky_computer_test.dart index a3e13486..944afca3 100644 --- a/test/game/components/controlled_sparky_computer_test.dart +++ b/test/game/components/controlled_sparky_computer_test.dart @@ -10,7 +10,7 @@ import '../../helpers/helpers.dart'; void main() { group('SparkyComputerController', () { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); late ControlledSparkyComputer controlledSparkyComputer; diff --git a/test/game/components/flutter_forest_test.dart b/test/game/components/flutter_forest_test.dart index ac35e363..7ad5a3de 100644 --- a/test/game/components/flutter_forest_test.dart +++ b/test/game/components/flutter_forest_test.dart @@ -12,7 +12,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); group('FlutterForest', () { flameTester.test( @@ -157,7 +157,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/google_word_test.dart b/test/game/components/google_word_test.dart index a7f467db..fee7bdd0 100644 --- a/test/game/components/google_word_test.dart +++ b/test/game/components/google_word_test.dart @@ -26,9 +26,9 @@ void main() { ); }); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/sparky_fire_zone_test.dart b/test/game/components/sparky_fire_zone_test.dart index da8d8404..692af291 100644 --- a/test/game/components/sparky_fire_zone_test.dart +++ b/test/game/components/sparky_fire_zone_test.dart @@ -13,7 +13,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); group('SparkyFireZone', () { flameTester.test( @@ -59,7 +59,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/components/wall_test.dart b/test/game/components/wall_test.dart index f8e7483c..63a39991 100644 --- a/test/game/components/wall_test.dart +++ b/test/game/components/wall_test.dart @@ -9,7 +9,7 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(EmptyPinballGameTest.new); + final flameTester = FlameTester(EmptyPinballTestGame.new); group('Wall', () { flameTester.test( @@ -110,7 +110,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index ef55b399..c29ee315 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() { TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(PinballGameTest.new); - final debugModeFlameTester = FlameTester(DebugPinballGameTest.new); + final flameTester = FlameTester(PinballTestGame.new); + final debugModeFlameTester = FlameTester(DebugPinballTestGame.new); group('PinballGame', () { // TODO(alestiago): test if [PinballGame] registers @@ -88,7 +88,7 @@ void main() { }); final flameBlocTester = FlameBlocTester( - gameBuilder: EmptyPinballGameTest.new, + gameBuilder: EmptyPinballTestGame.new, blocBuilder: () => gameBloc, ); @@ -206,7 +206,7 @@ void main() { final debugModeFlameBlocTester = FlameBlocTester( - gameBuilder: DebugPinballGameTest.new, + gameBuilder: DebugPinballTestGame.new, blocBuilder: () => gameBloc, ); diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index 7a1419fb..85f9cfc3 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -11,7 +11,7 @@ import '../../helpers/helpers.dart'; void main() { const theme = PinballTheme(characterTheme: DashTheme()); - final game = PinballGameTest(); + final game = PinballTestGame(); group('PinballGamePage', () { testWidgets('renders PinballGameView', (tester) async { diff --git a/test/helpers/helpers.dart b/test/helpers/helpers.dart index 4b6c29f1..8732035a 100644 --- a/test/helpers/helpers.dart +++ b/test/helpers/helpers.dart @@ -5,11 +5,10 @@ // https://verygood.ventures // license that can be found in the LICENSE file or at export 'builders.dart'; -export 'extensions.dart'; export 'fakes.dart'; export 'forge2d.dart'; export 'key_testers.dart'; export 'mocks.dart'; export 'navigator.dart'; export 'pump_app.dart'; -export 'test_game.dart'; +export 'test_games.dart'; diff --git a/test/helpers/test_game.dart b/test/helpers/test_game.dart deleted file mode 100644 index 3c6ff42f..00000000 --- a/test/helpers/test_game.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:flame_bloc/flame_bloc.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; - -class TestGame extends Forge2DGame with FlameBloc { - TestGame() { - images.prefix = ''; - } -} diff --git a/test/helpers/extensions.dart b/test/helpers/test_games.dart similarity index 56% rename from test/helpers/extensions.dart rename to test/helpers/test_games.dart index 8e054fe0..3747a231 100644 --- a/test/helpers/extensions.dart +++ b/test/helpers/test_games.dart @@ -1,12 +1,20 @@ // ignore_for_file: must_call_super +import 'package:flame_bloc/flame_bloc.dart'; +import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_theme/pinball_theme.dart'; import 'helpers.dart'; -class PinballGameTest extends PinballGame { - PinballGameTest() +class TestGame extends Forge2DGame with FlameBloc { + TestGame() { + images.prefix = ''; + } +} + +class PinballTestGame extends PinballGame { + PinballTestGame() : super( audio: MockPinballAudio(), theme: const PinballTheme( @@ -15,8 +23,8 @@ class PinballGameTest extends PinballGame { ); } -class DebugPinballGameTest extends DebugPinballGame { - DebugPinballGameTest() +class DebugPinballTestGame extends DebugPinballGame { + DebugPinballTestGame() : super( audio: MockPinballAudio(), theme: const PinballTheme( @@ -25,7 +33,7 @@ class DebugPinballGameTest extends DebugPinballGame { ); } -class EmptyPinballGameTest extends PinballGameTest { +class EmptyPinballTestGame extends PinballTestGame { @override Future onLoad() async {} }