From 6bcb9b87107eb0b26fe7111dd32a412207fc296b Mon Sep 17 00:00:00 2001 From: alestiago Date: Wed, 27 Apr 2022 07:44:09 +0100 Subject: [PATCH] refactor: removed "Behaviour" typo --- .../google_word/behaviors/behaviors.dart | 2 +- ...r.dart => google_word_bonus_behavior.dart} | 2 +- .../components/google_word/google_word.dart | 2 +- lib/game/components/scoring_behavior.dart | 4 ++-- .../sparky_bumper/sparky_bumper.dart | 11 ++++++---- .../alien_bumper/alien_bumper_test.dart | 2 +- .../alien_bumper_blinking_behavior_test.dart | 2 +- .../google_letter/google_letter_test.dart | 2 +- ...sparky_bumper_blinking_behaviour_test.dart | 2 +- .../sparky_bumper/sparky_bumper_test.dart | 2 +- .../components/scoring_behaviour_test.dart | 20 +++++++++---------- 11 files changed, 27 insertions(+), 24 deletions(-) rename lib/game/components/google_word/behaviors/{google_word_bonus_behaviour.dart => google_word_bonus_behavior.dart} (94%) diff --git a/lib/game/components/google_word/behaviors/behaviors.dart b/lib/game/components/google_word/behaviors/behaviors.dart index 54b9d64f..4ebf817c 100644 --- a/lib/game/components/google_word/behaviors/behaviors.dart +++ b/lib/game/components/google_word/behaviors/behaviors.dart @@ -1 +1 @@ -export 'google_word_bonus_behaviour.dart'; +export 'google_word_bonus_behavior.dart'; diff --git a/lib/game/components/google_word/behaviors/google_word_bonus_behaviour.dart b/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart similarity index 94% rename from lib/game/components/google_word/behaviors/google_word_bonus_behaviour.dart rename to lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart index b62de944..a97f9e05 100644 --- a/lib/game/components/google_word/behaviors/google_word_bonus_behaviour.dart +++ b/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart @@ -3,7 +3,7 @@ import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -class GoogleWordBonusBehaviour extends Component +class GoogleWordBonusBehavior extends Component with HasGameRef, ParentIsA { @override void onMount() { diff --git a/lib/game/components/google_word/google_word.dart b/lib/game/components/google_word/google_word.dart index 54d32591..2a424af0 100644 --- a/lib/game/components/google_word/google_word.dart +++ b/lib/game/components/google_word/google_word.dart @@ -17,7 +17,7 @@ class GoogleWord extends Component { GoogleLetter(3)..initialPosition = position + Vector2(2.88, -1.75), GoogleLetter(4)..initialPosition = position + Vector2(8.33, -0.65), GoogleLetter(5)..initialPosition = position + Vector2(12.92, 1.82), - GoogleWordBonusBehaviour(), + GoogleWordBonusBehavior(), ], ); } diff --git a/lib/game/components/scoring_behavior.dart b/lib/game/components/scoring_behavior.dart index 0aadd39e..e3385252 100644 --- a/lib/game/components/scoring_behavior.dart +++ b/lib/game/components/scoring_behavior.dart @@ -6,11 +6,11 @@ import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -/// {@template scoring_behaviour} +/// {@template scoring_behavior} /// /// {@endtemplate} class ScoringBehavior extends ContactBehavior with HasGameRef { - /// {@macro scoring_behaviour} + /// {@macro scoring_behavior} ScoringBehavior({ required int points, }) : _points = points; diff --git a/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart b/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart index 167f2f2c..ffe5ff58 100644 --- a/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart +++ b/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart @@ -28,7 +28,7 @@ class SparkyBumper extends BodyComponent with InitialPosition { priority: RenderPriority.sparkyBumper, children: [ SparkyBumperBallContactBehavior(), - SparkyBumperBlinkingBehaviour(), + SparkyBumperBlinkingBehavior(), _SparkyBumperSpriteGroupComponent( onAssetPath: onAssetPath, offAssetPath: offAssetPath, @@ -141,9 +141,12 @@ class _SparkyBumperSpriteGroupComponent parent.bloc.stream.listen((state) => current = state); final sprites = { - SparkyBumperState.active: Sprite(gameRef.images.fromCache(_onAssetPath)), - SparkyBumperState.inactive: - Sprite(gameRef.images.fromCache(_offAssetPath)), + SparkyBumperState.active: Sprite( + gameRef.images.fromCache(_onAssetPath), + ), + SparkyBumperState.inactive: Sprite( + gameRef.images.fromCache(_offAssetPath), + ), }; this.sprites = sprites; size = sprites[current]!.originalSize / 10; diff --git a/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart b/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart index 8b9809fc..12bc3da9 100644 --- a/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart +++ b/packages/pinball_components/test/src/components/alien_bumper/alien_bumper_test.dart @@ -60,7 +60,7 @@ void main() { expect(alienBumper.children, contains(component)); }); - flameTester.test('an AlienBumperBallContactBehaviour', (game) async { + flameTester.test('an AlienBumperBallContactBehavior', (game) async { final alienBumper = AlienBumper.a(); await game.ensureAdd(alienBumper); expect( diff --git a/packages/pinball_components/test/src/components/alien_bumper/behaviors/alien_bumper_blinking_behavior_test.dart b/packages/pinball_components/test/src/components/alien_bumper/behaviors/alien_bumper_blinking_behavior_test.dart index ea7c53b3..a4acad05 100644 --- a/packages/pinball_components/test/src/components/alien_bumper/behaviors/alien_bumper_blinking_behavior_test.dart +++ b/packages/pinball_components/test/src/components/alien_bumper/behaviors/alien_bumper_blinking_behavior_test.dart @@ -14,7 +14,7 @@ void main() { final flameTester = FlameTester(TestGame.new); group( - 'AlienBumperBlinkingBehaviour', + 'AlienBumperBlinkingBehavior', () { flameTester.test( 'calls onBlinked after 0.5 seconds when inactive', diff --git a/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart index 06e18929..c9e6956c 100644 --- a/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart +++ b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart @@ -102,7 +102,7 @@ void main() { verify(bloc.close).called(1); }); - flameTester.test('adds a GoogleLetterBallContactBehaviour', (game) async { + flameTester.test('adds a GoogleLetterBallContactBehavior', (game) async { final googleLetter = GoogleLetter(0); await game.ensureAdd(googleLetter); expect( diff --git a/packages/pinball_components/test/src/components/sparky_bumper/behaviors/sparky_bumper_blinking_behaviour_test.dart b/packages/pinball_components/test/src/components/sparky_bumper/behaviors/sparky_bumper_blinking_behaviour_test.dart index 8995914d..0e194fa8 100644 --- a/packages/pinball_components/test/src/components/sparky_bumper/behaviors/sparky_bumper_blinking_behaviour_test.dart +++ b/packages/pinball_components/test/src/components/sparky_bumper/behaviors/sparky_bumper_blinking_behaviour_test.dart @@ -14,7 +14,7 @@ void main() { final flameTester = FlameTester(TestGame.new); group( - 'SparkyBumperBlinkingBehaviour', + 'SparkyBumperBlinkingBehavior', () { flameTester.test( 'calls onBlinked after 0.5 seconds when inactive', diff --git a/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart b/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart index da729c0a..6858f04a 100644 --- a/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart +++ b/packages/pinball_components/test/src/components/sparky_bumper/sparky_bumper_test.dart @@ -68,7 +68,7 @@ void main() { expect(sparkyBumper.children, contains(component)); }); - flameTester.test('an SparkyBumperBallContactBehaviour', (game) async { + flameTester.test('an SparkyBumperBallContactBehavior', (game) async { final sparkyBumper = SparkyBumper.a(); await game.ensureAdd(sparkyBumper); expect( diff --git a/test/game/components/scoring_behaviour_test.dart b/test/game/components/scoring_behaviour_test.dart index a6f94a13..065b50ee 100644 --- a/test/game/components/scoring_behaviour_test.dart +++ b/test/game/components/scoring_behaviour_test.dart @@ -12,7 +12,7 @@ import 'package:pinball_components/pinball_components.dart'; import '../../helpers/helpers.dart'; void main() { - group('ScoringBehaviour', () { + group('ScoringBehavior', () { group('beginContact', () { late GameBloc bloc; late PinballAudio audio; @@ -47,10 +47,10 @@ void main() { 'emits Scored event with points', setUp: (game, tester) async { const points = 20; - final scoringBehaviour = ScoringBehavior(points: points); - await game.ensureAdd(scoringBehaviour); + final scoringBehavior = ScoringBehavior(points: points); + await game.ensureAdd(scoringBehavior); - scoringBehaviour.beginContact(ball, MockContact()); + scoringBehavior.beginContact(ball, MockContact()); verify( () => bloc.add( @@ -64,10 +64,10 @@ void main() { 'plays score sound', setUp: (game, tester) async { const points = 20; - final scoringBehaviour = ScoringBehavior(points: points); - await game.ensureAdd(scoringBehaviour); + final scoringBehavior = ScoringBehavior(points: points); + await game.ensureAdd(scoringBehavior); - scoringBehaviour.beginContact(ball, MockContact()); + scoringBehavior.beginContact(ball, MockContact()); verify(audio.score).called(1); }, @@ -77,10 +77,10 @@ void main() { "adds a ScoreText component at Ball's position with points", setUp: (game, tester) async { const points = 20; - final scoringBehaviour = ScoringBehavior(points: points); - await game.ensureAdd(scoringBehaviour); + final scoringBehavior = ScoringBehavior(points: points); + await game.ensureAdd(scoringBehavior); - scoringBehaviour.beginContact(ball, MockContact()); + scoringBehavior.beginContact(ball, MockContact()); await game.ready(); final scoreText = game.descendants().whereType();