From 918a75710d826f3014953cfcbcdbbb270d660175 Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Sat, 7 May 2022 18:00:25 -0300 Subject: [PATCH] suggestions --- lib/app/view/app.dart | 8 ++++---- lib/main_development.dart | 4 ++-- lib/main_production.dart | 4 ++-- lib/main_staging.dart | 4 ++-- test/app/view/app_test.dart | 8 ++++---- test/game/components/controlled_plunger_test.dart | 6 +++--- test/game/components/game_bloc_status_listener_test.dart | 8 ++++---- test/helpers/pump_app.dart | 4 ++-- test/start_game/widgets/start_game_listener_test.dart | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index d015701c..89f03dfa 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -15,15 +15,15 @@ class App extends StatelessWidget { Key? key, required AuthenticationRepository authenticationRepository, required LeaderboardRepository leaderboardRepository, - required PinballAudioPlayer pinballPlayer, + required PinballAudioPlayer pinballAudioPlayer, }) : _authenticationRepository = authenticationRepository, _leaderboardRepository = leaderboardRepository, - _pinballPlayer = pinballPlayer, + _pinballAudioPlayer = pinballAudioPlayer, super(key: key); final AuthenticationRepository _authenticationRepository; final LeaderboardRepository _leaderboardRepository; - final PinballAudioPlayer _pinballPlayer; + final PinballAudioPlayer _pinballAudioPlayer; @override Widget build(BuildContext context) { @@ -31,7 +31,7 @@ class App extends StatelessWidget { providers: [ RepositoryProvider.value(value: _authenticationRepository), RepositoryProvider.value(value: _leaderboardRepository), - RepositoryProvider.value(value: _pinballPlayer), + RepositoryProvider.value(value: _pinballAudioPlayer), ], child: MultiBlocProvider( providers: [ diff --git a/lib/main_development.dart b/lib/main_development.dart index 3b5b92e4..158966c8 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 = PinballAudioPlayer(); + final pinballAudioPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), @@ -20,7 +20,7 @@ void main() { return App( authenticationRepository: authenticationRepository, leaderboardRepository: leaderboardRepository, - pinballPlayer: pinballPlayer, + pinballAudioPlayer: pinballAudioPlayer, ); }); } diff --git a/lib/main_production.dart b/lib/main_production.dart index 3b5b92e4..158966c8 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 = PinballAudioPlayer(); + final pinballAudioPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), @@ -20,7 +20,7 @@ void main() { return App( authenticationRepository: authenticationRepository, leaderboardRepository: leaderboardRepository, - pinballPlayer: pinballPlayer, + pinballAudioPlayer: pinballAudioPlayer, ); }); } diff --git a/lib/main_staging.dart b/lib/main_staging.dart index 3b5b92e4..158966c8 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 = PinballAudioPlayer(); + final pinballAudioPlayer = PinballAudioPlayer(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), @@ -20,7 +20,7 @@ void main() { return App( authenticationRepository: authenticationRepository, leaderboardRepository: leaderboardRepository, - pinballPlayer: pinballPlayer, + pinballAudioPlayer: pinballAudioPlayer, ); }); } diff --git a/test/app/view/app_test.dart b/test/app/view/app_test.dart index 8965d56b..4612641d 100644 --- a/test/app/view/app_test.dart +++ b/test/app/view/app_test.dart @@ -18,13 +18,13 @@ void main() { group('App', () { late AuthenticationRepository authenticationRepository; late LeaderboardRepository leaderboardRepository; - late PinballAudioPlayer pinballPlayer; + late PinballAudioPlayer pinballAudioPlayer; setUp(() { authenticationRepository = _MockAuthenticationRepository(); leaderboardRepository = _MockLeaderboardRepository(); - pinballPlayer = _MockPinballAudioPlayer(); - when(pinballPlayer.load).thenAnswer((_) => [Future.value()]); + pinballAudioPlayer = _MockPinballAudioPlayer(); + when(pinballAudioPlayer.load).thenAnswer((_) => [Future.value()]); }); testWidgets('renders PinballGamePage', (tester) async { @@ -32,7 +32,7 @@ void main() { App( authenticationRepository: authenticationRepository, leaderboardRepository: leaderboardRepository, - pinballPlayer: pinballPlayer, + pinballAudioPlayer: pinballAudioPlayer, ), ); await tester.pump(const Duration(milliseconds: 400)); diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart index 87c54943..70d6fec9 100644 --- a/test/game/components/controlled_plunger_test.dart +++ b/test/game/components/controlled_plunger_test.dart @@ -28,7 +28,7 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents { Future pump( Plunger child, { GameBloc? gameBloc, - PinballAudioPlayer? pinballPlayer, + PinballAudioPlayer? pinballAudioPlayer, }) { return ensureAdd( FlameBlocProvider.value( @@ -36,7 +36,7 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents { ..add(const GameStarted()), children: [ FlameProvider.value( - pinballPlayer ?? _MockPinballAudioPlayer(), + pinballAudioPlayer ?? _MockPinballAudioPlayer(), children: [child], ) ], @@ -166,7 +166,7 @@ void main() { flameTester.test('plays the correct sound on load', (game) async { final parent = ControlledPlunger(compressionDistance: 10); - await game.pump(parent, pinballPlayer: player); + await game.pump(parent, pinballAudioPlayer: player); await parent.ensureAdd(PlungerNoiseBehavior()); verify(() => player.play(PinballAudio.launcher)).called(1); }); diff --git a/test/game/components/game_bloc_status_listener_test.dart b/test/game/components/game_bloc_status_listener_test.dart index c0278ac1..f5278a70 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, { - PinballAudioPlayer? pinballPlayer, + PinballAudioPlayer? pinballAudioPlayer, }) async { return ensureAdd( FlameMultiBlocProvider( @@ -46,7 +46,7 @@ class _TestGame extends Forge2DGame { MultiFlameProvider( providers: [ FlameProvider.value( - pinballPlayer ?? _MockPinballAudioPlayer(), + pinballAudioPlayer ?? _MockPinballAudioPlayer(), ), FlameProvider.value( _MockAppLocalizations(), @@ -198,7 +198,7 @@ void main() { leaderboardRepository: repository, entries: const [], ); - await game.pump([component, backbox], pinballPlayer: player); + await game.pump([component, backbox], pinballAudioPlayer: player); component.onNewState(state); @@ -221,7 +221,7 @@ void main() { (game) async { final player = _MockPinballAudioPlayer(); final component = GameBlocStatusListener(); - await game.pump([component], pinballPlayer: player); + await game.pump([component], pinballAudioPlayer: player); expect(state.status, equals(GameStatus.playing)); component.onNewState(state); diff --git a/test/helpers/pump_app.dart b/test/helpers/pump_app.dart index 6f7a5d18..8be03f03 100644 --- a/test/helpers/pump_app.dart +++ b/test/helpers/pump_app.dart @@ -55,7 +55,7 @@ extension PumpApp on WidgetTester { AssetsManagerCubit? assetsManagerCubit, CharacterThemeCubit? characterThemeCubit, LeaderboardRepository? leaderboardRepository, - PinballAudioPlayer? pinballPlayer, + PinballAudioPlayer? pinballAudioPlayer, }) { return runAsync(() { return pumpWidget( @@ -65,7 +65,7 @@ extension PumpApp on WidgetTester { value: leaderboardRepository ?? _MockLeaderboardRepository(), ), RepositoryProvider.value( - value: pinballPlayer ?? _buildDefaultPinballAudioPlayer(), + value: pinballAudioPlayer ?? _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 a794b6cd..f4c1a5df 100644 --- a/test/start_game/widgets/start_game_listener_test.dart +++ b/test/start_game/widgets/start_game_listener_test.dart @@ -241,7 +241,7 @@ void main() { child: SizedBox.shrink(), ), startGameBloc: startGameBloc, - pinballPlayer: pinballAudioPlayer, + pinballAudioPlayer: pinballAudioPlayer, ); await tester.pumpAndSettle();