From 815ac161329cb15c7c7af5da00304528f7a6e21b Mon Sep 17 00:00:00 2001 From: alestiago Date: Tue, 26 Apr 2022 11:21:14 +0100 Subject: [PATCH] refactor: moved tests --- .../cubit/alien_bumper_cubit.dart | 1 - .../cubit/sparky_bumper_cubit.dart | 1 - .../sparky_computer.dart | 0 .../{ => alien_bumper}/alien_bumper_test.dart | 2 +- .../google_letter_test.dart | 43 +------------------ .../sparky_bumper_test.dart | 30 +------------ test/game/components/flutter_forest_test.dart | 5 --- 7 files changed, 3 insertions(+), 79 deletions(-) rename packages/pinball_components/lib/src/components/{sparky_computer => }/sparky_computer.dart (100%) rename packages/pinball_components/test/src/components/{ => alien_bumper}/alien_bumper_test.dart (97%) rename packages/pinball_components/test/src/components/{ => google_letter}/google_letter_test.dart (62%) rename packages/pinball_components/test/src/components/{ => sparky_bumper}/sparky_bumper_test.dart (63%) diff --git a/packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart b/packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart index 3395117f..291626eb 100644 --- a/packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart +++ b/packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart @@ -1,5 +1,4 @@ import 'package:bloc/bloc.dart'; -import 'package:equatable/equatable.dart'; part 'alien_bumper_state.dart'; diff --git a/packages/pinball_components/lib/src/components/sparky_bumper/cubit/sparky_bumper_cubit.dart b/packages/pinball_components/lib/src/components/sparky_bumper/cubit/sparky_bumper_cubit.dart index d8e8601d..53862a94 100644 --- a/packages/pinball_components/lib/src/components/sparky_bumper/cubit/sparky_bumper_cubit.dart +++ b/packages/pinball_components/lib/src/components/sparky_bumper/cubit/sparky_bumper_cubit.dart @@ -1,5 +1,4 @@ import 'package:bloc/bloc.dart'; -import 'package:equatable/equatable.dart'; part 'sparky_bumper_state.dart'; diff --git a/packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart b/packages/pinball_components/lib/src/components/sparky_computer.dart similarity index 100% rename from packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart rename to packages/pinball_components/lib/src/components/sparky_computer.dart diff --git a/packages/pinball_components/test/src/components/alien_bumper_test.dart b/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart similarity index 97% rename from packages/pinball_components/test/src/components/alien_bumper_test.dart rename to packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart index 50701da0..b92aec09 100644 --- a/packages/pinball_components/test/src/components/alien_bumper_test.dart +++ b/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart @@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; -import '../../helpers/helpers.dart'; +import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/pinball_components/test/src/components/google_letter_test.dart b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart similarity index 62% rename from packages/pinball_components/test/src/components/google_letter_test.dart rename to packages/pinball_components/test/src/components/google_letter/google_letter_test.dart index cdfd3c4a..f6012a35 100644 --- a/packages/pinball_components/test/src/components/google_letter_test.dart +++ b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart @@ -1,11 +1,10 @@ // ignore_for_file: cascade_invocations -import 'package:flame/effects.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; -import '../../helpers/helpers.dart'; +import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -82,45 +81,5 @@ void main() { expect(() => GoogleLetter(-1), throwsA(isA())); expect(() => GoogleLetter(6), throwsA(isA())); }); - - group('activate', () { - flameTester.test('returns normally', (game) async { - final googleLetter = GoogleLetter(0); - await game.ensureAdd(googleLetter); - await expectLater(googleLetter.activate, returnsNormally); - }); - - flameTester.test('adds an Effect', (game) async { - final googleLetter = GoogleLetter(0); - await game.ensureAdd(googleLetter); - await googleLetter.activate(); - await game.ready(); - - expect( - googleLetter.descendants().whereType().length, - equals(1), - ); - }); - }); - - group('deactivate', () { - flameTester.test('returns normally', (game) async { - final googleLetter = GoogleLetter(0); - await game.ensureAdd(googleLetter); - await expectLater(googleLetter.deactivate, returnsNormally); - }); - - flameTester.test('adds an Effect', (game) async { - final googleLetter = GoogleLetter(0); - await game.ensureAdd(googleLetter); - await googleLetter.deactivate(); - await game.ready(); - - expect( - googleLetter.descendants().whereType().length, - equals(1), - ); - }); - }); }); } diff --git a/packages/pinball_components/test/src/components/sparky_bumper_test.dart b/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart similarity index 63% rename from packages/pinball_components/test/src/components/sparky_bumper_test.dart rename to packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart index a2fcc5ed..d657fc0e 100644 --- a/packages/pinball_components/test/src/components/sparky_bumper_test.dart +++ b/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart @@ -1,11 +1,10 @@ // ignore_for_file: cascade_invocations -import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; -import '../../helpers/helpers.dart'; +import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -38,32 +37,5 @@ void main() { await game.ensureAdd(bumper); expect(game.contains(bumper), isTrue); }); - - flameTester.test('animate switches between on and off sprites', - (game) async { - final bumper = SparkyBumper.a(); - await game.ensureAdd(bumper); - - final spriteGroupComponent = bumper.firstChild()!; - - expect( - spriteGroupComponent.current, - equals(SparkyBumperSpriteState.active), - ); - - final future = bumper.animate(); - - expect( - spriteGroupComponent.current, - equals(SparkyBumperSpriteState.inactive), - ); - - await future; - - expect( - spriteGroupComponent.current, - equals(SparkyBumperSpriteState.active), - ); - }); }); } diff --git a/test/game/components/flutter_forest_test.dart b/test/game/components/flutter_forest_test.dart index 34f49a65..b5f0fae4 100644 --- a/test/game/components/flutter_forest_test.dart +++ b/test/game/components/flutter_forest_test.dart @@ -82,13 +82,8 @@ void main() { }); group('bumpers', () { - late Ball ball; late GameBloc gameBloc; - setUp(() { - ball = Ball(baseColor: const Color(0xFF00FFFF)); - }); - final flameBlocTester = FlameBlocTester( gameBuilder: () => EmptyPinballTestGame(assets: assets), blocBuilder: () {