From 8efe77372b615f5a90026899f00b635d66e67f2c Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Wed, 9 Mar 2022 14:12:18 -0300 Subject: [PATCH] feat: PR suggestions --- lib/game/bloc/game_bloc.dart | 10 ++++---- lib/game/bloc/game_state.dart | 13 +++++----- test/game/bloc/game_bloc_test.dart | 28 +++++++++++----------- test/game/bloc/game_state_test.dart | 28 +++++++++++----------- test/game/components/ball_test.dart | 2 +- test/game/view/pinball_game_page_test.dart | 2 +- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/lib/game/bloc/game_bloc.dart b/lib/game/bloc/game_bloc.dart index a27f0199..554c6eb1 100644 --- a/lib/game/bloc/game_bloc.dart +++ b/lib/game/bloc/game_bloc.dart @@ -7,7 +7,7 @@ part 'game_state.dart'; class GameBloc extends Bloc { GameBloc({ - int bonusLettersCount = 5, + int bonusLettersCount = 6, }) : _bonusLettersCount = bonusLettersCount, super(const GameState.initial()) { on(_onBallLost); @@ -30,12 +30,12 @@ class GameBloc extends Bloc { } void _onBonusLetterActivated(BonusLetterActivated event, Emitter emit) { - final updatedList = [...state.bonusLetters, event.letter]; + final newBonusLetters = [...state.activatedBonusLetters, event.letter]; - if (updatedList.length == _bonusLettersCount) { + if (newBonusLetters.length == _bonusLettersCount) { emit( state.copyWith( - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [ ...state.bonusHistory, GameBonuses.letterSequence, @@ -45,7 +45,7 @@ class GameBloc extends Bloc { } else { emit( state.copyWith( - bonusLetters: updatedList, + activatedBonusLetters: newBonusLetters, ), ); } diff --git a/lib/game/bloc/game_state.dart b/lib/game/bloc/game_state.dart index 786472db..267200cf 100644 --- a/lib/game/bloc/game_state.dart +++ b/lib/game/bloc/game_state.dart @@ -14,7 +14,7 @@ class GameState extends Equatable { const GameState({ required this.score, required this.balls, - required this.bonusLetters, + required this.activatedBonusLetters, required this.bonusHistory, }) : assert(score >= 0, "Score can't be negative"), assert(balls >= 0, "Number of balls can't be negative"); @@ -22,7 +22,7 @@ class GameState extends Equatable { const GameState.initial() : score = 0, balls = 3, - bonusLetters = const [], + activatedBonusLetters = const [], bonusHistory = const []; /// The current score of the game. @@ -34,7 +34,7 @@ class GameState extends Equatable { final int balls; /// Active bonus letters. - final List bonusLetters; + final List activatedBonusLetters; /// Holds the history of all the bonuses /// that the palyer earned during the play @@ -49,7 +49,7 @@ class GameState extends Equatable { GameState copyWith({ int? score, int? balls, - List? bonusLetters, + List? activatedBonusLetters, List? bonusHistory, }) { assert( @@ -60,7 +60,8 @@ class GameState extends Equatable { return GameState( score: score ?? this.score, balls: balls ?? this.balls, - bonusLetters: bonusLetters ?? this.bonusLetters, + activatedBonusLetters: + activatedBonusLetters ?? this.activatedBonusLetters, bonusHistory: bonusHistory ?? this.bonusHistory, ); } @@ -69,7 +70,7 @@ class GameState extends Equatable { List get props => [ score, balls, - bonusLetters, + activatedBonusLetters, bonusHistory, ]; } diff --git a/test/game/bloc/game_bloc_test.dart b/test/game/bloc/game_bloc_test.dart index 4ae8bd3d..d15392eb 100644 --- a/test/game/bloc/game_bloc_test.dart +++ b/test/game/bloc/game_bloc_test.dart @@ -24,19 +24,19 @@ void main() { const GameState( score: 0, balls: 2, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), const GameState( score: 0, balls: 1, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), const GameState( score: 0, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), ], @@ -55,13 +55,13 @@ void main() { const GameState( score: 2, balls: 3, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), const GameState( score: 5, balls: 3, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), ], @@ -81,19 +81,19 @@ void main() { const GameState( score: 0, balls: 2, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), const GameState( score: 0, balls: 1, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), const GameState( score: 0, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), ], @@ -112,19 +112,19 @@ void main() { GameState( score: 0, balls: 3, - bonusLetters: [0], + activatedBonusLetters: [0], bonusHistory: [], ), GameState( score: 0, balls: 3, - bonusLetters: [0, 1], + activatedBonusLetters: [0, 1], bonusHistory: [], ), GameState( score: 0, balls: 3, - bonusLetters: [0, 1, 2], + activatedBonusLetters: [0, 1, 2], bonusHistory: [], ), ], @@ -141,19 +141,19 @@ void main() { GameState( score: 0, balls: 3, - bonusLetters: [0], + activatedBonusLetters: [0], bonusHistory: [], ), GameState( score: 0, balls: 3, - bonusLetters: [0, 1], + activatedBonusLetters: [0, 1], bonusHistory: [], ), GameState( score: 0, balls: 3, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [GameBonuses.letterSequence], ), ], diff --git a/test/game/bloc/game_state_test.dart b/test/game/bloc/game_state_test.dart index a23ae35f..26f34aee 100644 --- a/test/game/bloc/game_state_test.dart +++ b/test/game/bloc/game_state_test.dart @@ -10,14 +10,14 @@ void main() { GameState( score: 0, balls: 0, - bonusLetters: const [], + activatedBonusLetters: const [], bonusHistory: const [], ), equals( const GameState( score: 0, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), ), @@ -30,7 +30,7 @@ void main() { const GameState( score: 0, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), isNotNull, @@ -46,7 +46,7 @@ void main() { () => GameState( balls: -1, score: 0, - bonusLetters: const [], + activatedBonusLetters: const [], bonusHistory: const [], ), throwsAssertionError, @@ -62,7 +62,7 @@ void main() { () => GameState( balls: 0, score: -1, - bonusLetters: const [], + activatedBonusLetters: const [], bonusHistory: const [], ), throwsAssertionError, @@ -77,7 +77,7 @@ void main() { const gameState = GameState( balls: 0, score: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect(gameState.isGameOver, isTrue); @@ -89,7 +89,7 @@ void main() { const gameState = GameState( balls: 1, score: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect(gameState.isGameOver, isFalse); @@ -104,7 +104,7 @@ void main() { const gameState = GameState( balls: 1, score: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect(gameState.isLastBall, isTrue); @@ -118,7 +118,7 @@ void main() { const gameState = GameState( balls: 2, score: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect(gameState.isLastBall, isFalse); @@ -134,7 +134,7 @@ void main() { const gameState = GameState( balls: 0, score: 2, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect( @@ -151,7 +151,7 @@ void main() { const gameState = GameState( balls: 0, score: 2, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); expect( @@ -168,13 +168,13 @@ void main() { const gameState = GameState( score: 2, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ); final otherGameState = GameState( score: gameState.score + 1, balls: gameState.balls + 1, - bonusLetters: const [0], + activatedBonusLetters: const [0], bonusHistory: const [GameBonuses.letterSequence], ); expect(gameState, isNot(equals(otherGameState))); @@ -183,7 +183,7 @@ void main() { gameState.copyWith( score: otherGameState.score, balls: otherGameState.balls, - bonusLetters: otherGameState.bonusLetters, + activatedBonusLetters: otherGameState.activatedBonusLetters, bonusHistory: otherGameState.bonusHistory, ), equals(otherGameState), diff --git a/test/game/components/ball_test.dart b/test/game/components/ball_test.dart index d04e52a9..b0c5d6c7 100644 --- a/test/game/components/ball_test.dart +++ b/test/game/components/ball_test.dart @@ -138,7 +138,7 @@ void main() { initialState: const GameState( score: 10, balls: 1, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], ), ); diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index b47518ac..a3acafcb 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -74,7 +74,7 @@ void main() { const state = GameState( score: 0, balls: 0, - bonusLetters: [], + activatedBonusLetters: [], bonusHistory: [], );