From fb0eed84ef4daabe6352395d70e693d83d055a0c Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Sat, 7 May 2022 17:20:58 -0300 Subject: [PATCH] refactor: renaming to --- lib/app/view/app.dart | 4 ++-- lib/game/behaviors/bonus_noise_behavior.dart | 2 +- lib/game/behaviors/bumper_noise_behavior.dart | 2 +- lib/game/components/controlled_plunger.dart | 2 +- lib/game/components/game_bloc_status_listener.dart | 4 ++-- lib/game/pinball_game.dart | 12 ++++++------ lib/game/view/pinball_game_page.dart | 8 ++++---- lib/how_to_play/widgets/how_to_play_dialog.dart | 4 +++- lib/main_development.dart | 2 +- lib/main_production.dart | 2 +- lib/main_staging.dart | 2 +- packages/pinball_audio/lib/src/pinball_audio.dart | 8 ++++---- .../pinball_audio/test/src/pinball_audio_test.dart | 8 ++++---- test/app/view/app_test.dart | 6 +++--- test/game/behaviors/bonus_noise_behavior_test.dart | 10 +++++----- .../game/behaviors/bumper_noise_behavior_test.dart | 11 ++++++----- test/game/components/controlled_plunger_test.dart | 12 ++++++------ .../flutter_forest/flutter_forest_test.dart | 4 ++-- .../components/game_bloc_status_listener_test.dart | 12 ++++++------ .../behaviors/google_word_bonus_behavior_test.dart | 6 +++--- test/game/pinball_game_test.dart | 6 +++--- test/game/view/pinball_game_page_test.dart | 4 ++-- test/helpers/pump_app.dart | 14 +++++++------- .../widgets/start_game_listener_test.dart | 10 +++++----- 24 files changed, 79 insertions(+), 76 deletions(-) diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index eccff7a6..d015701c 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -15,7 +15,7 @@ class App extends StatelessWidget { Key? key, required AuthenticationRepository authenticationRepository, required LeaderboardRepository leaderboardRepository, - required PinballPlayer pinballPlayer, + required PinballAudioPlayer pinballPlayer, }) : _authenticationRepository = authenticationRepository, _leaderboardRepository = leaderboardRepository, _pinballPlayer = pinballPlayer, @@ -23,7 +23,7 @@ class App extends StatelessWidget { final AuthenticationRepository _authenticationRepository; final LeaderboardRepository _leaderboardRepository; - final PinballPlayer _pinballPlayer; + final PinballAudioPlayer _pinballPlayer; @override Widget build(BuildContext context) { diff --git a/lib/game/behaviors/bonus_noise_behavior.dart b/lib/game/behaviors/bonus_noise_behavior.dart index c071f064..b330dc9f 100644 --- a/lib/game/behaviors/bonus_noise_behavior.dart +++ b/lib/game/behaviors/bonus_noise_behavior.dart @@ -15,7 +15,7 @@ class BonusNoiseBehavior extends Component { }, onNewState: (state) { final bonus = state.bonusHistory.last; - final audioPlayer = readProvider(); + final audioPlayer = readProvider(); switch (bonus) { case GameBonus.googleWord: diff --git a/lib/game/behaviors/bumper_noise_behavior.dart b/lib/game/behaviors/bumper_noise_behavior.dart index 926fff96..4144241a 100644 --- a/lib/game/behaviors/bumper_noise_behavior.dart +++ b/lib/game/behaviors/bumper_noise_behavior.dart @@ -6,6 +6,6 @@ class BumperNoiseBehavior extends ContactBehavior { @override void beginContact(Object other, Contact contact) { super.beginContact(other, contact); - readProvider().play(PinballAudio.bumper); + readProvider().play(PinballAudio.bumper); } } diff --git a/lib/game/components/controlled_plunger.dart b/lib/game/components/controlled_plunger.dart index c8cb90fb..f709de66 100644 --- a/lib/game/components/controlled_plunger.dart +++ b/lib/game/components/controlled_plunger.dart @@ -30,7 +30,7 @@ class PlungerNoiseBehavior extends Component { @override Future onLoad() async { await super.onLoad(); - readProvider().play(PinballAudio.launcher); + readProvider().play(PinballAudio.launcher); } @override diff --git a/lib/game/components/game_bloc_status_listener.dart b/lib/game/components/game_bloc_status_listener.dart index cf2f75b3..1a5a06df 100644 --- a/lib/game/components/game_bloc_status_listener.dart +++ b/lib/game/components/game_bloc_status_listener.dart @@ -20,7 +20,7 @@ class GameBlocStatusListener extends Component case GameStatus.waiting: break; case GameStatus.playing: - readProvider().play(PinballAudio.backgroundMusic); + readProvider().play(PinballAudio.backgroundMusic); gameRef .descendants() .whereType() @@ -29,7 +29,7 @@ class GameBlocStatusListener extends Component gameRef.overlays.remove(PinballGame.playButtonOverlay); break; case GameStatus.gameOver: - readProvider().play(PinballAudio.gameOverVoiceOver); + readProvider().play(PinballAudio.gameOverVoiceOver); gameRef.descendants().whereType().first.requestInitials( score: state.displayScore, character: readBloc() diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index 5e89b0cb..026471c7 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -22,10 +22,10 @@ class PinballGame extends PinballForge2DGame required this.leaderboardRepository, required GameBloc gameBloc, required AppLocalizations l10n, - required PinballPlayer player, + required PinballAudioPlayer audioPlayer, }) : focusNode = FocusNode(), _gameBloc = gameBloc, - _player = player, + _audioPlayer = audioPlayer, _characterThemeBloc = characterThemeBloc, _l10n = l10n, super( @@ -47,7 +47,7 @@ class PinballGame extends PinballForge2DGame final CharacterThemeCubit _characterThemeBloc; - final PinballPlayer _player; + final PinballAudioPlayer _audioPlayer; final LeaderboardRepository leaderboardRepository; @@ -82,7 +82,7 @@ class PinballGame extends PinballForge2DGame children: [ MultiFlameProvider( providers: [ - FlameProvider.value(_player), + FlameProvider.value(_audioPlayer), FlameProvider.value(leaderboardRepository), FlameProvider.value(_l10n), ], @@ -188,11 +188,11 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector { required CharacterThemeCubit characterThemeBloc, required LeaderboardRepository leaderboardRepository, required AppLocalizations l10n, - required PinballPlayer player, + required PinballAudioPlayer audioPlayer, required GameBloc gameBloc, }) : super( characterThemeBloc: characterThemeBloc, - player: player, + audioPlayer: audioPlayer, leaderboardRepository: leaderboardRepository, l10n: l10n, gameBloc: gameBloc, diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart index bb190668..2ccf48c0 100644 --- a/lib/game/view/pinball_game_page.dart +++ b/lib/game/view/pinball_game_page.dart @@ -30,20 +30,20 @@ class PinballGamePage extends StatelessWidget { @override Widget build(BuildContext context) { final characterThemeBloc = context.read(); - final player = context.read(); + final audioPlayer = context.read(); final leaderboardRepository = context.read(); final gameBloc = context.read(); final game = isDebugMode ? DebugPinballGame( characterThemeBloc: characterThemeBloc, - player: player, + audioPlayer: audioPlayer, leaderboardRepository: leaderboardRepository, l10n: context.l10n, gameBloc: gameBloc, ) : PinballGame( characterThemeBloc: characterThemeBloc, - player: player, + audioPlayer: audioPlayer, leaderboardRepository: leaderboardRepository, l10n: context.l10n, gameBloc: gameBloc, @@ -52,7 +52,7 @@ class PinballGamePage extends StatelessWidget { final loadables = [ game.preFetchLeaderboard(), ...game.preLoadAssets(), - ...player.load(), + ...audioPlayer.load(), ...BonusAnimation.loadAssets(), ...SelectedCharacter.loadAssets(), ]; diff --git a/lib/how_to_play/widgets/how_to_play_dialog.dart b/lib/how_to_play/widgets/how_to_play_dialog.dart index 55aff1db..8a709605 100644 --- a/lib/how_to_play/widgets/how_to_play_dialog.dart +++ b/lib/how_to_play/widgets/how_to_play_dialog.dart @@ -91,7 +91,9 @@ class _HowToPlayDialogState extends State { return WillPopScope( onWillPop: () { widget.onDismissCallback.call(); - context.read().play(PinballAudio.ioPinballVoiceOver); + context + .read() + .play(PinballAudio.ioPinballVoiceOver); return Future.value(true); }, child: PinballDialog( diff --git a/lib/main_development.dart b/lib/main_development.dart index 67d83b81..3b5b92e4 100644 --- a/lib/main_development.dart +++ b/lib/main_development.dart @@ -11,7 +11,7 @@ void main() { bootstrap((firestore, firebaseAuth) async { final leaderboardRepository = LeaderboardRepository(firestore); final authenticationRepository = AuthenticationRepository(firebaseAuth); - final pinballPlayer = PinballPlayer(); + final pinballPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), diff --git a/lib/main_production.dart b/lib/main_production.dart index 67d83b81..3b5b92e4 100644 --- a/lib/main_production.dart +++ b/lib/main_production.dart @@ -11,7 +11,7 @@ void main() { bootstrap((firestore, firebaseAuth) async { final leaderboardRepository = LeaderboardRepository(firestore); final authenticationRepository = AuthenticationRepository(firebaseAuth); - final pinballPlayer = PinballPlayer(); + final pinballPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), diff --git a/lib/main_staging.dart b/lib/main_staging.dart index 67d83b81..3b5b92e4 100644 --- a/lib/main_staging.dart +++ b/lib/main_staging.dart @@ -11,7 +11,7 @@ void main() { bootstrap((firestore, firebaseAuth) async { final leaderboardRepository = LeaderboardRepository(firestore); final authenticationRepository = AuthenticationRepository(firebaseAuth); - final pinballPlayer = PinballPlayer(); + final pinballPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), diff --git a/packages/pinball_audio/lib/src/pinball_audio.dart b/packages/pinball_audio/lib/src/pinball_audio.dart index 767fc3a6..0364c923 100644 --- a/packages/pinball_audio/lib/src/pinball_audio.dart +++ b/packages/pinball_audio/lib/src/pinball_audio.dart @@ -145,12 +145,12 @@ class _BumperAudio extends _Audio { } } -/// {@template pinball_player} +/// {@template pinball_audio_player} /// Sound manager for the pinball game /// {@endtemplate} -class PinballPlayer { - /// {@macro pinball_player} - PinballPlayer({ +class PinballAudioPlayer { + /// {@macro pinball_audio_player} + PinballAudioPlayer({ CreateAudioPool? createAudioPool, PlaySingleAudio? playSingleAudio, LoopSingleAudio? loopSingleAudio, diff --git a/packages/pinball_audio/test/src/pinball_audio_test.dart b/packages/pinball_audio/test/src/pinball_audio_test.dart index e95eb8f7..647e8130 100644 --- a/packages/pinball_audio/test/src/pinball_audio_test.dart +++ b/packages/pinball_audio/test/src/pinball_audio_test.dart @@ -51,7 +51,7 @@ void main() { late _MockLoopSingleAudio loopSingleAudio; late _PreCacheSingleAudio preCacheSingleAudio; late Random seed; - late PinballPlayer player; + late PinballAudioPlayer player; setUpAll(() { registerFallbackValue(_MockAudioCache()); @@ -81,7 +81,7 @@ void main() { seed = _MockRandom(); - player = PinballPlayer( + player = PinballAudioPlayer( configureAudioCache: configureAudioCache.onCall, createAudioPool: createAudioPool.onCall, playSingleAudio: playSingleAudio.onCall, @@ -92,7 +92,7 @@ void main() { }); test('can be instantiated', () { - expect(PinballPlayer(), isNotNull); + expect(PinballAudioPlayer(), isNotNull); }); group('load', () { @@ -124,7 +124,7 @@ void main() { }); test('sets the correct prefix', () async { - player = PinballPlayer( + player = PinballAudioPlayer( createAudioPool: createAudioPool.onCall, playSingleAudio: playSingleAudio.onCall, preCacheSingleAudio: preCacheSingleAudio.onCall, diff --git a/test/app/view/app_test.dart b/test/app/view/app_test.dart index 4f04a89d..d2852429 100644 --- a/test/app/view/app_test.dart +++ b/test/app/view/app_test.dart @@ -9,7 +9,7 @@ import 'package:pinball_audio/pinball_audio.dart'; class _MockAuthenticationRepository extends Mock implements AuthenticationRepository {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { } @@ -18,12 +18,12 @@ void main() { group('App', () { late AuthenticationRepository authenticationRepository; late LeaderboardRepository leaderboardRepository; - late PinballPlayer pinballPlayer; + late PinballAudioPlayer pinballPlayer; setUp(() { authenticationRepository = _MockAuthenticationRepository(); leaderboardRepository = _MockLeaderboardRepository(); - pinballPlayer = _MockPinballPlayer(); + pinballPlayer = _MockPinballAudioPlayer(); when(pinballPlayer.load).thenAnswer((_) => [Future.value()]); }); diff --git a/test/game/behaviors/bonus_noise_behavior_test.dart b/test/game/behaviors/bonus_noise_behavior_test.dart index fada7d1e..42bf0542 100644 --- a/test/game/behaviors/bonus_noise_behavior_test.dart +++ b/test/game/behaviors/bonus_noise_behavior_test.dart @@ -14,14 +14,14 @@ import 'package:pinball_flame/pinball_flame.dart'; class _TestGame extends Forge2DGame { Future pump( BonusNoiseBehavior child, { - required PinballPlayer player, + required PinballAudioPlayer player, required GameBloc bloc, }) { return ensureAdd( FlameBlocProvider.value( value: bloc, children: [ - FlameProvider.value( + FlameProvider.value( player, children: [ child, @@ -33,7 +33,7 @@ class _TestGame extends Forge2DGame { } } -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockGameBloc extends Mock implements GameBloc {} @@ -41,7 +41,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); group('BonusNoiseBehavior', () { - late PinballPlayer player; + late PinballAudioPlayer player; late GameBloc bloc; final flameTester = FlameTester(_TestGame.new); @@ -50,7 +50,7 @@ void main() { }); setUp(() { - player = _MockPinballPlayer(); + player = _MockPinballAudioPlayer(); when(() => player.play(any())).thenAnswer((_) {}); bloc = _MockGameBloc(); }); diff --git a/test/game/behaviors/bumper_noise_behavior_test.dart b/test/game/behaviors/bumper_noise_behavior_test.dart index d8075726..b00e7afe 100644 --- a/test/game/behaviors/bumper_noise_behavior_test.dart +++ b/test/game/behaviors/bumper_noise_behavior_test.dart @@ -9,9 +9,10 @@ import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_flame/pinball_flame.dart'; class _TestGame extends Forge2DGame { - Future pump(_TestBodyComponent child, {required PinballPlayer player}) { + Future pump(_TestBodyComponent child, + {required PinballAudioPlayer player}) { return ensureAdd( - FlameProvider.value( + FlameProvider.value( player, children: [ child, @@ -26,7 +27,7 @@ class _TestBodyComponent extends BodyComponent { Body createBody() => world.createBody(BodyDef()); } -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockContact extends Mock implements Contact {} @@ -35,11 +36,11 @@ void main() { group('BumperNoiseBehavior', () {}); - late PinballPlayer player; + late PinballAudioPlayer player; final flameTester = FlameTester(_TestGame.new); setUp(() { - player = _MockPinballPlayer(); + player = _MockPinballAudioPlayer(); }); flameTester.testGameWidget( diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart index 25b1f739..87c54943 100644 --- a/test/game/components/controlled_plunger_test.dart +++ b/test/game/components/controlled_plunger_test.dart @@ -28,15 +28,15 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents { Future pump( Plunger child, { GameBloc? gameBloc, - PinballPlayer? pinballPlayer, + PinballAudioPlayer? pinballPlayer, }) { return ensureAdd( FlameBlocProvider.value( value: gameBloc ?? GameBloc() ..add(const GameStarted()), children: [ - FlameProvider.value( - pinballPlayer ?? _MockPinballPlayer(), + FlameProvider.value( + pinballPlayer ?? _MockPinballAudioPlayer(), children: [child], ) ], @@ -47,7 +47,7 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents { class _MockGameBloc extends Mock implements GameBloc {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -158,10 +158,10 @@ void main() { }); group('PlungerNoiseBehavior', () { - late PinballPlayer player; + late PinballAudioPlayer player; setUp(() { - player = _MockPinballPlayer(); + player = _MockPinballAudioPlayer(); }); flameTester.test('plays the correct sound on load', (game) async { diff --git a/test/game/components/flutter_forest/flutter_forest_test.dart b/test/game/components/flutter_forest/flutter_forest_test.dart index bce4b6ac..ae5d86ee 100644 --- a/test/game/components/flutter_forest/flutter_forest_test.dart +++ b/test/game/components/flutter_forest/flutter_forest_test.dart @@ -36,7 +36,7 @@ class _TestGame extends Forge2DGame { value: _MockGameBloc(), children: [ FlameProvider.value( - _MockPinballPlayer(), + _MockPinballAudioPlayer(), children: [ ZCanvasComponent(children: [child]), ], @@ -47,7 +47,7 @@ class _TestGame extends Forge2DGame { } } -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockGameBloc extends Mock implements GameBloc {} diff --git a/test/game/components/game_bloc_status_listener_test.dart b/test/game/components/game_bloc_status_listener_test.dart index e8685c3e..c0278ac1 100644 --- a/test/game/components/game_bloc_status_listener_test.dart +++ b/test/game/components/game_bloc_status_listener_test.dart @@ -30,7 +30,7 @@ class _TestGame extends Forge2DGame { Future pump( Iterable children, { - PinballPlayer? pinballPlayer, + PinballAudioPlayer? pinballPlayer, }) async { return ensureAdd( FlameMultiBlocProvider( @@ -45,8 +45,8 @@ class _TestGame extends Forge2DGame { children: [ MultiFlameProvider( providers: [ - FlameProvider.value( - pinballPlayer ?? _MockPinballPlayer(), + FlameProvider.value( + pinballPlayer ?? _MockPinballAudioPlayer(), ), FlameProvider.value( _MockAppLocalizations(), @@ -60,7 +60,7 @@ class _TestGame extends Forge2DGame { } } -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { } @@ -191,7 +191,7 @@ void main() { flameTester.test( 'plays the game over voice over', (game) async { - final player = _MockPinballPlayer(); + final player = _MockPinballAudioPlayer(); final component = GameBlocStatusListener(); final repository = _MockLeaderboardRepository(); final backbox = Backbox( @@ -219,7 +219,7 @@ void main() { flameTester.test( 'plays the background music on start', (game) async { - final player = _MockPinballPlayer(); + final player = _MockPinballAudioPlayer(); final component = GameBlocStatusListener(); await game.pump([component], pinballPlayer: player); diff --git a/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart b/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart index 40afeb09..e23c1fd2 100644 --- a/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart +++ b/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart @@ -36,8 +36,8 @@ class _TestGame extends Forge2DGame { FlameBlocProvider.value( value: gameBloc, children: [ - FlameProvider.value( - _MockPinballPlayer(), + FlameProvider.value( + _MockPinballAudioPlayer(), children: [child], ) ], @@ -48,7 +48,7 @@ class _TestGame extends Forge2DGame { class _MockGameBloc extends Mock implements GameBloc {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 3b034c8f..b05e349f 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -24,7 +24,7 @@ class _TestPinballGame extends PinballGame { leaderboardRepository: _MockLeaderboardRepository(), gameBloc: GameBloc(), l10n: _MockAppLocalizations(), - player: _MockPinballPlayer(), + audioPlayer: _MockPinballAudioPlayer(), ); @override @@ -43,7 +43,7 @@ class _TestDebugPinballGame extends DebugPinballGame { leaderboardRepository: _MockLeaderboardRepository(), gameBloc: GameBloc(), l10n: _MockAppLocalizations(), - player: _MockPinballPlayer(), + audioPlayer: _MockPinballAudioPlayer(), ); @override @@ -78,7 +78,7 @@ class _MockDragEndInfo extends Mock implements DragEndInfo {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { } -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index fbcf8c76..1e8c5633 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -26,7 +26,7 @@ class _TestPinballGame extends PinballGame { leaderboardRepository: _MockLeaderboardRepository(), gameBloc: GameBloc(), l10n: _MockAppLocalizations(), - player: _MockPinballPlayer(), + audioPlayer: _MockPinballAudioPlayer(), ); @override @@ -52,7 +52,7 @@ class _MockStartGameBloc extends Mock implements StartGameBloc {} class _MockAppLocalizations extends Mock implements AppLocalizations {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { } diff --git a/test/helpers/pump_app.dart b/test/helpers/pump_app.dart index 45929978..6f7a5d18 100644 --- a/test/helpers/pump_app.dart +++ b/test/helpers/pump_app.dart @@ -24,12 +24,12 @@ class _MockGameBloc extends Mock implements GameBloc {} class _MockStartGameBloc extends Mock implements StartGameBloc {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} -PinballPlayer _buildDefaultPinballPlayer() { - final player = _MockPinballPlayer(); - when(player.load).thenAnswer((_) => [Future.value()]); - return player; +PinballAudioPlayer _buildDefaultPinballAudioPlayer() { + final audioPlayer = _MockPinballAudioPlayer(); + when(audioPlayer.load).thenAnswer((_) => [Future.value()]); + return audioPlayer; } AssetsManagerCubit _buildDefaultAssetsManagerCubit() { @@ -55,7 +55,7 @@ extension PumpApp on WidgetTester { AssetsManagerCubit? assetsManagerCubit, CharacterThemeCubit? characterThemeCubit, LeaderboardRepository? leaderboardRepository, - PinballPlayer? pinballPlayer, + PinballAudioPlayer? pinballPlayer, }) { return runAsync(() { return pumpWidget( @@ -65,7 +65,7 @@ extension PumpApp on WidgetTester { value: leaderboardRepository ?? _MockLeaderboardRepository(), ), RepositoryProvider.value( - value: pinballPlayer ?? _buildDefaultPinballPlayer(), + value: pinballPlayer ?? _buildDefaultPinballAudioPlayer(), ), ], child: MultiBlocProvider( diff --git a/test/start_game/widgets/start_game_listener_test.dart b/test/start_game/widgets/start_game_listener_test.dart index 4e25796b..a794b6cd 100644 --- a/test/start_game/widgets/start_game_listener_test.dart +++ b/test/start_game/widgets/start_game_listener_test.dart @@ -16,11 +16,11 @@ class _MockGameBloc extends Mock implements GameBloc {} class _MockCharacterThemeCubit extends Mock implements CharacterThemeCubit {} -class _MockPinballPlayer extends Mock implements PinballPlayer {} +class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} void main() { late StartGameBloc startGameBloc; - late PinballPlayer pinballPlayer; + late PinballAudioPlayer pinballAudioPlayer; late CharacterThemeCubit characterThemeCubit; group('StartGameListener', () { @@ -28,7 +28,7 @@ void main() { await mockFlameImages(); startGameBloc = _MockStartGameBloc(); - pinballPlayer = _MockPinballPlayer(); + pinballAudioPlayer = _MockPinballAudioPlayer(); characterThemeCubit = _MockCharacterThemeCubit(); }); @@ -241,7 +241,7 @@ void main() { child: SizedBox.shrink(), ), startGameBloc: startGameBloc, - pinballPlayer: pinballPlayer, + pinballPlayer: pinballAudioPlayer, ); await tester.pumpAndSettle(); @@ -258,7 +258,7 @@ void main() { ); await tester.pumpAndSettle(); - verify(() => pinballPlayer.play(PinballAudio.ioPinballVoiceOver)) + verify(() => pinballAudioPlayer.play(PinballAudio.ioPinballVoiceOver)) .called(1); }, );