From 3eb44b66585fd0f683d986e269d1bb2ab9eaf7af Mon Sep 17 00:00:00 2001 From: alestiago Date: Sat, 7 May 2022 13:52:02 +0100 Subject: [PATCH] refactor: renamed DashNestBumper to DashBumper --- lib/game/bloc/game_state.dart | 2 +- .../flutter_forest_bonus_behavior.dart | 8 +- .../flutter_forest/flutter_forest.dart | 8 +- lib/game/view/widgets/bonus_animation.dart | 4 +- lib/gen/assets.gen.dart | 2 +- .../lib/src/components/components.dart | 2 +- .../lib/src/components/dash_animatronic.dart | 2 +- .../dash_bumper/behaviors/behaviors.dart | 1 + .../dash_bumper_ball_contact_behavior.dart} | 3 +- .../cubit/dash_bumper_cubit.dart} | 10 +- .../dash_bumper/cubit/dash_bumper_state.dart | 10 ++ .../dash_bumper.dart} | 56 +++---- .../dash_nest_bumper/behaviors/behaviors.dart | 1 - .../cubit/dash_nest_bumper_state.dart | 10 -- .../lib/src/components/signpost/signpost.dart | 2 +- .../big_dash_nest_bumper_game.dart | 8 +- .../small_dash_nest_bumper_a_game.dart | 8 +- .../small_dash_nest_bumper_b_game.dart | 8 +- .../lib/stories/flutter_forest/stories.dart | 18 +-- ...sh_bumper_ball_contact_behavior_test.dart} | 26 ++-- ..._test.dart => dash_bumper_cubit_test.dart} | 14 +- .../dash_nest_bumper/dash_bumper_test.dart | 139 ++++++++++++++++++ .../dash_nest_bumper_test.dart | 138 ----------------- .../flutter_forest_bonus_behavior_test.dart | 29 ++-- .../flutter_forest/flutter_forest_test.dart | 8 +- .../behaviors/multiballs_behavior_test.dart | 4 +- .../view/widgets/bonus_animation_test.dart | 2 +- 27 files changed, 261 insertions(+), 262 deletions(-) create mode 100644 packages/pinball_components/lib/src/components/dash_bumper/behaviors/behaviors.dart rename packages/pinball_components/lib/src/components/{dash_nest_bumper/behaviors/dash_nest_bumper_contact_behavior.dart => dash_bumper/behaviors/dash_bumper_ball_contact_behavior.dart} (81%) rename packages/pinball_components/lib/src/components/{dash_nest_bumper/cubit/dash_nest_bumper_cubit.dart => dash_bumper/cubit/dash_bumper_cubit.dart} (53%) create mode 100644 packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_state.dart rename packages/pinball_components/lib/src/components/{dash_nest_bumper/dash_nest_bumper.dart => dash_bumper/dash_bumper.dart} (75%) delete mode 100644 packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/behaviors.dart delete mode 100644 packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_state.dart rename packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/{dash_nest_bumper_ball_contact_behavior_test.dart => dash_bumper_ball_contact_behavior_test.dart} (55%) rename packages/pinball_components/test/src/components/dash_nest_bumper/cubit/{dash_nest_bumper_cubit_test.dart => dash_bumper_cubit_test.dart} (53%) create mode 100644 packages/pinball_components/test/src/components/dash_nest_bumper/dash_bumper_test.dart delete mode 100644 packages/pinball_components/test/src/components/dash_nest_bumper/dash_nest_bumper_test.dart diff --git a/lib/game/bloc/game_state.dart b/lib/game/bloc/game_state.dart index d0311442..2efe603c 100644 --- a/lib/game/bloc/game_state.dart +++ b/lib/game/bloc/game_state.dart @@ -7,7 +7,7 @@ enum GameBonus { /// Bonus achieved when the ball activates all Google letters. googleWord, - /// Bonus achieved when the user activates all dash nest bumpers. + /// Bonus achieved when the user activates all dash bumpers. dashNest, /// Bonus achieved when a ball enters Sparky's computer. diff --git a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart index f37299c7..c9cd083f 100644 --- a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart +++ b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart @@ -7,9 +7,9 @@ import 'package:pinball_flame/pinball_flame.dart'; /// Bonus obtained at the [FlutterForest]. /// -/// When all [DashNestBumper]s are hit at least once three times, the [Signpost] +/// When all [DashBumper]s are hit at least once three times, the [Signpost] /// progresses. When the [Signpost] fully progresses, the [GameBonus.dashNest] -/// is awarded, and the [DashNestBumper.main] releases a new [Ball]. +/// is awarded, and the [DashBumper.main] releases a new [Ball]. class FlutterForestBonusBehavior extends Component with ParentIsA, @@ -19,7 +19,7 @@ class FlutterForestBonusBehavior extends Component void onMount() { super.onMount(); - final bumpers = parent.children.whereType(); + final bumpers = parent.children.whereType(); final signpost = parent.firstChild()!; final animatronic = parent.firstChild()!; final canvas = gameRef.descendants().whereType().single; @@ -27,7 +27,7 @@ class FlutterForestBonusBehavior extends Component for (final bumper in bumpers) { bumper.bloc.stream.listen((state) { final activatedAllBumpers = bumpers.every( - (bumper) => bumper.bloc.state == DashNestBumperState.active, + (bumper) => bumper.bloc.state == DashBumperState.active, ); if (activatedAllBumpers) { diff --git a/lib/game/components/flutter_forest/flutter_forest.dart b/lib/game/components/flutter_forest/flutter_forest.dart index 1cc055ae..39783bb1 100644 --- a/lib/game/components/flutter_forest/flutter_forest.dart +++ b/lib/game/components/flutter_forest/flutter_forest.dart @@ -9,7 +9,7 @@ import 'package:pinball_flame/pinball_flame.dart'; /// {@template flutter_forest} /// Area positioned at the top right of the board where the [Ball] can bounce -/// off [DashNestBumper]s. +/// off [DashBumper]s. /// {@endtemplate} class FlutterForest extends Component with ZIndex { /// {@macro flutter_forest} @@ -22,19 +22,19 @@ class FlutterForest extends Component with ZIndex { BumperNoiseBehavior(), ], )..initialPosition = Vector2(7.95, -58.35), - DashNestBumper.main( + DashBumper.main( children: [ ScoringContactBehavior(points: Points.twoHundredThousand), BumperNoiseBehavior(), ], )..initialPosition = Vector2(18.55, -59.35), - DashNestBumper.a( + DashBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), BumperNoiseBehavior(), ], )..initialPosition = Vector2(8.95, -51.95), - DashNestBumper.b( + DashBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), BumperNoiseBehavior(), diff --git a/lib/game/view/widgets/bonus_animation.dart b/lib/game/view/widgets/bonus_animation.dart index 35e600f2..eb37b5dc 100644 --- a/lib/game/view/widgets/bonus_animation.dart +++ b/lib/game/view/widgets/bonus_animation.dart @@ -22,7 +22,7 @@ class BonusAnimation extends StatefulWidget { Key? key, VoidCallback? onCompleted, }) : this._( - Assets.images.bonusAnimation.dashNest.keyName, + Assets.images.bonusAnimation.DashBumper.keyName, onCompleted: onCompleted, key: key, ); @@ -75,7 +75,7 @@ class BonusAnimation extends StatefulWidget { static List loadAssets() { Flame.images.prefix = ''; return [ - Flame.images.load(Assets.images.bonusAnimation.dashNest.keyName), + Flame.images.load(Assets.images.bonusAnimation.DashBumper.keyName), Flame.images.load(Assets.images.bonusAnimation.sparkyTurboCharge.keyName), Flame.images.load(Assets.images.bonusAnimation.dinoChomp.keyName), Flame.images.load(Assets.images.bonusAnimation.androidSpaceship.keyName), diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 33d2bbd1..2a6137bd 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -26,7 +26,7 @@ class $AssetsImagesBonusAnimationGen { 'assets/images/bonus_animation/android_spaceship.png'); /// File path: assets/images/bonus_animation/dash_nest.png - AssetGenImage get dashNest => + AssetGenImage get DashBumper => const AssetGenImage('assets/images/bonus_animation/dash_nest.png'); /// File path: assets/images/bonus_animation/dino_chomp.png diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index 54345772..b482242d 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -10,7 +10,7 @@ export 'boundaries.dart'; export 'camera_zoom.dart'; export 'chrome_dino/chrome_dino.dart'; export 'dash_animatronic.dart'; -export 'dash_nest_bumper/dash_nest_bumper.dart'; +export 'dash_bumper/dash_bumper.dart'; export 'dino_walls.dart'; export 'error_component.dart'; export 'fire_effect.dart'; diff --git a/packages/pinball_components/lib/src/components/dash_animatronic.dart b/packages/pinball_components/lib/src/components/dash_animatronic.dart index faa604e9..bb7d983b 100644 --- a/packages/pinball_components/lib/src/components/dash_animatronic.dart +++ b/packages/pinball_components/lib/src/components/dash_animatronic.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:pinball_components/pinball_components.dart'; /// {@template dash_animatronic} -/// Animated Dash that sits on top of the [DashNestBumper.main]. +/// Animated Dash that sits on top of the [DashBumper.main]. /// {@endtemplate} class DashAnimatronic extends SpriteAnimationComponent with HasGameRef { /// {@macro dash_animatronic} diff --git a/packages/pinball_components/lib/src/components/dash_bumper/behaviors/behaviors.dart b/packages/pinball_components/lib/src/components/dash_bumper/behaviors/behaviors.dart new file mode 100644 index 00000000..0167887f --- /dev/null +++ b/packages/pinball_components/lib/src/components/dash_bumper/behaviors/behaviors.dart @@ -0,0 +1 @@ +export 'dash_bumper_ball_contact_behavior.dart'; diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_contact_behavior.dart b/packages/pinball_components/lib/src/components/dash_bumper/behaviors/dash_bumper_ball_contact_behavior.dart similarity index 81% rename from packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_contact_behavior.dart rename to packages/pinball_components/lib/src/components/dash_bumper/behaviors/dash_bumper_ball_contact_behavior.dart index 829229e4..fbb58c3d 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_contact_behavior.dart +++ b/packages/pinball_components/lib/src/components/dash_bumper/behaviors/dash_bumper_ball_contact_behavior.dart @@ -4,8 +4,7 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -class DashNestBumperBallContactBehavior - extends ContactBehavior { +class DashBumperBallContactBehavior extends ContactBehavior { @override void beginContact(Object other, Contact contact) { super.beginContact(other, contact); diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit.dart b/packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_cubit.dart similarity index 53% rename from packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit.dart rename to packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_cubit.dart index 8fc6b157..6ceff3d9 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit.dart +++ b/packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_cubit.dart @@ -2,18 +2,18 @@ import 'package:bloc/bloc.dart'; -part 'dash_nest_bumper_state.dart'; +part 'dash_bumper_state.dart'; -class DashNestBumperCubit extends Cubit { - DashNestBumperCubit() : super(DashNestBumperState.inactive); +class DashBumperCubit extends Cubit { + DashBumperCubit() : super(DashBumperState.inactive); /// Event added when the bumper contacts with a ball. void onBallContacted() { - emit(DashNestBumperState.active); + emit(DashBumperState.active); } /// Event added when the bumper should return to its initial configuration. void onReset() { - emit(DashNestBumperState.inactive); + emit(DashBumperState.inactive); } } diff --git a/packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_state.dart b/packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_state.dart new file mode 100644 index 00000000..f15d2e57 --- /dev/null +++ b/packages/pinball_components/lib/src/components/dash_bumper/cubit/dash_bumper_state.dart @@ -0,0 +1,10 @@ +part of 'dash_bumper_cubit.dart'; + +/// Indicates the [DashBumperCubit]'s current state. +enum DashBumperState { + /// A lit up bumper. + active, + + /// A dimmed bumper. + inactive, +} diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart b/packages/pinball_components/lib/src/components/dash_bumper/dash_bumper.dart similarity index 75% rename from packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart rename to packages/pinball_components/lib/src/components/dash_bumper/dash_bumper.dart index b203d1f3..6a0de244 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart +++ b/packages/pinball_components/lib/src/components/dash_bumper/dash_bumper.dart @@ -5,17 +5,17 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/src/components/bumping_behavior.dart'; -import 'package:pinball_components/src/components/dash_nest_bumper/behaviors/behaviors.dart'; +import 'package:pinball_components/src/components/dash_bumper/behaviors/behaviors.dart'; import 'package:pinball_flame/pinball_flame.dart'; -export 'cubit/dash_nest_bumper_cubit.dart'; +export 'cubit/dash_bumper_cubit.dart'; -/// {@template dash_nest_bumper} +/// {@template dash_bumper} /// Bumper with a nest appearance. /// {@endtemplate} -class DashNestBumper extends BodyComponent with InitialPosition { - /// {@macro dash_nest_bumper} - DashNestBumper._({ +class DashBumper extends BodyComponent with InitialPosition { + /// {@macro dash_bumper} + DashBumper._({ required double majorRadius, required double minorRadius, required String activeAssetPath, @@ -28,19 +28,19 @@ class DashNestBumper extends BodyComponent with InitialPosition { super( renderBody: false, children: [ - _DashNestBumperSpriteGroupComponent( + _DashBumperSpriteGroupComponent( activeAssetPath: activeAssetPath, inactiveAssetPath: inactiveAssetPath, position: spritePosition, current: bloc.state, ), - DashNestBumperBallContactBehavior(), + DashBumperBallContactBehavior(), ...?children, ], ); - /// {@macro dash_nest_bumper} - DashNestBumper.main({ + /// {@macro dash_bumper} + DashBumper.main({ Iterable? children, }) : this._( majorRadius: 5.1, @@ -48,15 +48,15 @@ class DashNestBumper extends BodyComponent with InitialPosition { activeAssetPath: Assets.images.dash.bumper.main.active.keyName, inactiveAssetPath: Assets.images.dash.bumper.main.inactive.keyName, spritePosition: Vector2(0, -0.3), - bloc: DashNestBumperCubit(), + bloc: DashBumperCubit(), children: [ ...?children, BumpingBehavior(strength: 20), ], ); - /// {@macro dash_nest_bumper} - DashNestBumper.a({ + /// {@macro dash_bumper} + DashBumper.a({ Iterable? children, }) : this._( majorRadius: 3, @@ -64,15 +64,15 @@ class DashNestBumper extends BodyComponent with InitialPosition { activeAssetPath: Assets.images.dash.bumper.a.active.keyName, inactiveAssetPath: Assets.images.dash.bumper.a.inactive.keyName, spritePosition: Vector2(0.3, -1.3), - bloc: DashNestBumperCubit(), + bloc: DashBumperCubit(), children: [ ...?children, BumpingBehavior(strength: 20), ], ); - /// {@macro dash_nest_bumper} - DashNestBumper.b({ + /// {@macro dash_bumper} + DashBumper.b({ Iterable? children, }) : this._( majorRadius: 3.1, @@ -80,18 +80,18 @@ class DashNestBumper extends BodyComponent with InitialPosition { activeAssetPath: Assets.images.dash.bumper.b.active.keyName, inactiveAssetPath: Assets.images.dash.bumper.b.inactive.keyName, spritePosition: Vector2(0.4, -1.2), - bloc: DashNestBumperCubit(), + bloc: DashBumperCubit(), children: [ ...?children, BumpingBehavior(strength: 20), ], ); - /// Creates an [DashNestBumper] without any children. + /// Creates an [DashBumper] without any children. /// - /// This can be used for testing [DashNestBumper]'s behaviors in isolation. + /// This can be used for testing [DashBumper]'s behaviors in isolation. @visibleForTesting - DashNestBumper.test({required this.bloc}) + DashBumper.test({required this.bloc}) : _majorRadius = 3, _minorRadius = 2.5; @@ -99,7 +99,7 @@ class DashNestBumper extends BodyComponent with InitialPosition { final double _minorRadius; // ignore: public_member_api_docs - final DashNestBumperCubit bloc; + final DashBumperCubit bloc; @override void onRemove() { @@ -122,14 +122,14 @@ class DashNestBumper extends BodyComponent with InitialPosition { } } -class _DashNestBumperSpriteGroupComponent - extends SpriteGroupComponent - with HasGameRef, ParentIsA { - _DashNestBumperSpriteGroupComponent({ +class _DashBumperSpriteGroupComponent + extends SpriteGroupComponent + with HasGameRef, ParentIsA { + _DashBumperSpriteGroupComponent({ required String activeAssetPath, required String inactiveAssetPath, required Vector2 position, - required DashNestBumperState current, + required DashBumperState current, }) : _activeAssetPath = activeAssetPath, _inactiveAssetPath = inactiveAssetPath, super( @@ -147,9 +147,9 @@ class _DashNestBumperSpriteGroupComponent parent.bloc.stream.listen((state) => current = state); final sprites = { - DashNestBumperState.active: + DashBumperState.active: Sprite(gameRef.images.fromCache(_activeAssetPath)), - DashNestBumperState.inactive: + DashBumperState.inactive: Sprite(gameRef.images.fromCache(_inactiveAssetPath)), }; this.sprites = sprites; diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/behaviors.dart b/packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/behaviors.dart deleted file mode 100644 index 839cbd67..00000000 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/behaviors/behaviors.dart +++ /dev/null @@ -1 +0,0 @@ -export 'dash_nest_bumper_contact_behavior.dart'; diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_state.dart b/packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_state.dart deleted file mode 100644 index c169069f..00000000 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/cubit/dash_nest_bumper_state.dart +++ /dev/null @@ -1,10 +0,0 @@ -part of 'dash_nest_bumper_cubit.dart'; - -/// Indicates the [DashNestBumperCubit]'s current state. -enum DashNestBumperState { - /// A lit up bumper. - active, - - /// A dimmed bumper. - inactive, -} diff --git a/packages/pinball_components/lib/src/components/signpost/signpost.dart b/packages/pinball_components/lib/src/components/signpost/signpost.dart index a8fffe79..fd16f9a8 100644 --- a/packages/pinball_components/lib/src/components/signpost/signpost.dart +++ b/packages/pinball_components/lib/src/components/signpost/signpost.dart @@ -9,7 +9,7 @@ export 'cubit/signpost_cubit.dart'; /// {@template signpost} /// A sign, found in the Flutter Forest. /// -/// Lights up a new sign whenever all three [DashNestBumper]s are hit. +/// Lights up a new sign whenever all three [DashBumper]s are hit. /// {@endtemplate} class Signpost extends BodyComponent with InitialPosition { /// {@macro signpost} diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart index 3580a175..193756c2 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/big_dash_nest_bumper_game.dart @@ -4,8 +4,8 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class BigDashNestBumperGame extends BallGame { - BigDashNestBumperGame() +class BigDashBumperGame extends BallGame { + BigDashBumperGame() : super( imagesFileNames: [ Assets.images.dash.bumper.main.active.keyName, @@ -14,7 +14,7 @@ class BigDashNestBumperGame extends BallGame { ); static const description = ''' - Shows how a BigDashNestBumper is rendered. + Shows how a BigDashBumper is rendered. - Activate the "trace" parameter to overlay the body. '''; @@ -25,7 +25,7 @@ class BigDashNestBumperGame extends BallGame { camera.followVector2(Vector2.zero()); await add( - DashNestBumper.main()..priority = 1, + DashBumper.main()..priority = 1, ); await traceAllBodies(); } diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart index 071f6aa1..6f1df92e 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_a_game.dart @@ -4,8 +4,8 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SmallDashNestBumperAGame extends BallGame { - SmallDashNestBumperAGame() +class SmallDashBumperAGame extends BallGame { + SmallDashBumperAGame() : super( imagesFileNames: [ Assets.images.dash.bumper.a.active.keyName, @@ -14,7 +14,7 @@ class SmallDashNestBumperAGame extends BallGame { ); static const description = ''' - Shows how a SmallDashNestBumper ("a") is rendered. + Shows how a SmallDashBumper ("a") is rendered. - Activate the "trace" parameter to overlay the body. '''; @@ -24,7 +24,7 @@ class SmallDashNestBumperAGame extends BallGame { await super.onLoad(); camera.followVector2(Vector2.zero()); - await add(DashNestBumper.a()..priority = 1); + await add(DashBumper.a()..priority = 1); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart index a47b9962..a14678f4 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/small_dash_nest_bumper_b_game.dart @@ -4,8 +4,8 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; -class SmallDashNestBumperBGame extends BallGame { - SmallDashNestBumperBGame() +class SmallDashBumperBGame extends BallGame { + SmallDashBumperBGame() : super( imagesFileNames: [ Assets.images.dash.bumper.b.active.keyName, @@ -14,7 +14,7 @@ class SmallDashNestBumperBGame extends BallGame { ); static const description = ''' - Shows how a SmallDashNestBumper ("b") is rendered. + Shows how a SmallDashBumper ("b") is rendered. - Activate the "trace" parameter to overlay the body. '''; @@ -24,7 +24,7 @@ class SmallDashNestBumperBGame extends BallGame { await super.onLoad(); camera.followVector2(Vector2.zero()); - await add(DashNestBumper.b()..priority = 1); + await add(DashBumper.b()..priority = 1); await traceAllBodies(); } } diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart index dd557a27..7c2d3518 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/stories.dart @@ -13,18 +13,18 @@ void addFlutterForestStories(Dashbook dashbook) { gameBuilder: (_) => SignpostGame(), ) ..addGame( - title: 'Big Dash Nest Bumper', - description: BigDashNestBumperGame.description, - gameBuilder: (_) => BigDashNestBumperGame(), + title: 'Big Dash Bumper', + description: BigDashBumperGame.description, + gameBuilder: (_) => BigDashBumperGame(), ) ..addGame( - title: 'Small Dash Nest Bumper A', - description: SmallDashNestBumperAGame.description, - gameBuilder: (_) => SmallDashNestBumperAGame(), + title: 'Small Dash Bumper A', + description: SmallDashBumperAGame.description, + gameBuilder: (_) => SmallDashBumperAGame(), ) ..addGame( - title: 'Small Dash Nest Bumper B', - description: SmallDashNestBumperBGame.description, - gameBuilder: (_) => SmallDashNestBumperBGame(), + title: 'Small Dash Bumper B', + description: SmallDashBumperBGame.description, + gameBuilder: (_) => SmallDashBumperBGame(), ); } diff --git a/packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_ball_contact_behavior_test.dart b/packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_bumper_ball_contact_behavior_test.dart similarity index 55% rename from packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_ball_contact_behavior_test.dart rename to packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_bumper_ball_contact_behavior_test.dart index 10627df6..3c8f51db 100644 --- a/packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_nest_bumper_ball_contact_behavior_test.dart +++ b/packages/pinball_components/test/src/components/dash_nest_bumper/behaviors/dash_bumper_ball_contact_behavior_test.dart @@ -6,11 +6,11 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:pinball_components/src/components/dash_nest_bumper/behaviors/behaviors.dart'; +import 'package:pinball_components/src/components/dash_bumper/behaviors/behaviors.dart'; import '../../../../helpers/helpers.dart'; -class _MockDashNestBumperCubit extends Mock implements DashNestBumperCubit {} +class _MockDashBumperCubit extends Mock implements DashBumperCubit {} class _MockBall extends Mock implements Ball {} @@ -21,33 +21,33 @@ void main() { final flameTester = FlameTester(TestGame.new); group( - 'DashNestBumperBallContactBehavior', + 'DashBumperBallContactBehavior', () { test('can be instantiated', () { expect( - DashNestBumperBallContactBehavior(), - isA(), + DashBumperBallContactBehavior(), + isA(), ); }); flameTester.test( 'beginContact emits onBallContacted when contacts with a ball', (game) async { - final behavior = DashNestBumperBallContactBehavior(); - final bloc = _MockDashNestBumperCubit(); + final behavior = DashBumperBallContactBehavior(); + final bloc = _MockDashBumperCubit(); whenListen( bloc, - const Stream.empty(), - initialState: DashNestBumperState.active, + const Stream.empty(), + initialState: DashBumperState.active, ); - final dashNestBumper = DashNestBumper.test(bloc: bloc); - await dashNestBumper.add(behavior); - await game.ensureAdd(dashNestBumper); + final bumper = DashBumper.test(bloc: bloc); + await bumper.add(behavior); + await game.ensureAdd(bumper); behavior.beginContact(_MockBall(), _MockContact()); - verify(dashNestBumper.bloc.onBallContacted).called(1); + verify(bumper.bloc.onBallContacted).called(1); }, ); }, diff --git a/packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit_test.dart b/packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_bumper_cubit_test.dart similarity index 53% rename from packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit_test.dart rename to packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_bumper_cubit_test.dart index 7e26bbf3..1b255cd5 100644 --- a/packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_nest_bumper_cubit_test.dart +++ b/packages/pinball_components/test/src/components/dash_nest_bumper/cubit/dash_bumper_cubit_test.dart @@ -4,20 +4,20 @@ import 'package:pinball_components/pinball_components.dart'; void main() { group( - 'DashNestBumperCubit', + 'DashBumperCubit', () { - blocTest( + blocTest( 'onBallContacted emits active', - build: DashNestBumperCubit.new, + build: DashBumperCubit.new, act: (bloc) => bloc.onBallContacted(), - expect: () => [DashNestBumperState.active], + expect: () => [DashBumperState.active], ); - blocTest( + blocTest( 'onReset emits inactive', - build: DashNestBumperCubit.new, + build: DashBumperCubit.new, act: (bloc) => bloc.onReset(), - expect: () => [DashNestBumperState.inactive], + expect: () => [DashBumperState.inactive], ); }, ); diff --git a/packages/pinball_components/test/src/components/dash_nest_bumper/dash_bumper_test.dart b/packages/pinball_components/test/src/components/dash_nest_bumper/dash_bumper_test.dart new file mode 100644 index 00000000..a8ad8410 --- /dev/null +++ b/packages/pinball_components/test/src/components/dash_nest_bumper/dash_bumper_test.dart @@ -0,0 +1,139 @@ +// ignore_for_file: cascade_invocations + +import 'package:bloc_test/bloc_test.dart'; +import 'package:flame/components.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_components/src/components/bumping_behavior.dart'; +import 'package:pinball_components/src/components/dash_bumper/behaviors/behaviors.dart'; + +import '../../../helpers/helpers.dart'; + +class _MockDashBumperCubit extends Mock implements DashBumperCubit {} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('DashBumper', () { + final flameTester = FlameTester( + () => TestGame( + [ + Assets.images.dash.bumper.main.active.keyName, + Assets.images.dash.bumper.main.inactive.keyName, + Assets.images.dash.bumper.a.active.keyName, + Assets.images.dash.bumper.a.inactive.keyName, + Assets.images.dash.bumper.b.active.keyName, + Assets.images.dash.bumper.b.inactive.keyName, + ], + ), + ); + + flameTester.test('"main" loads correctly', (game) async { + final bumper = DashBumper.main(); + await game.ensureAdd(bumper); + expect(game.contains(bumper), isTrue); + }); + + flameTester.test('"a" loads correctly', (game) async { + final bumper = DashBumper.a(); + await game.ensureAdd(bumper); + + expect(game.contains(bumper), isTrue); + }); + + flameTester.test('"b" loads correctly', (game) async { + final bumper = DashBumper.b(); + await game.ensureAdd(bumper); + expect(game.contains(bumper), isTrue); + }); + + // ignore: public_member_api_docs + flameTester.test('closes bloc when removed', (game) async { + final bloc = _MockDashBumperCubit(); + whenListen( + bloc, + const Stream.empty(), + initialState: DashBumperState.inactive, + ); + when(bloc.close).thenAnswer((_) async {}); + final bumper = DashBumper.test(bloc: bloc); + + await game.ensureAdd(bumper); + game.remove(bumper); + await game.ready(); + + verify(bloc.close).called(1); + }); + + flameTester.test('adds a bumperBallContactBehavior', (game) async { + final bumper = DashBumper.a(); + await game.ensureAdd(bumper); + expect( + bumper.children.whereType().single, + isNotNull, + ); + }); + + group("'main' adds", () { + flameTester.test('new children', (game) async { + final component = Component(); + final bumper = DashBumper.main( + children: [component], + ); + await game.ensureAdd(bumper); + expect(bumper.children, contains(component)); + }); + + flameTester.test('a BumpingBehavior', (game) async { + final bumper = DashBumper.main(); + await game.ensureAdd(bumper); + expect( + bumper.children.whereType().single, + isNotNull, + ); + }); + }); + + group("'a' adds", () { + flameTester.test('new children', (game) async { + final component = Component(); + final bumper = DashBumper.a( + children: [component], + ); + await game.ensureAdd(bumper); + expect(bumper.children, contains(component)); + }); + + flameTester.test('a BumpingBehavior', (game) async { + final bumper = DashBumper.a(); + await game.ensureAdd(bumper); + expect( + bumper.children.whereType().single, + isNotNull, + ); + }); + }); + + group("'b' adds", () { + flameTester.test('new children', (game) async { + final component = Component(); + final bumper = DashBumper.b( + children: [component], + ); + await game.ensureAdd(bumper); + expect(bumper.children, contains(component)); + }); + + flameTester.test('a BumpingBehavior', (game) async { + final bumper = DashBumper.b(); + await game.ensureAdd(bumper); + expect( + bumper.children.whereType().single, + isNotNull, + ); + }); + }); + }); +} diff --git a/packages/pinball_components/test/src/components/dash_nest_bumper/dash_nest_bumper_test.dart b/packages/pinball_components/test/src/components/dash_nest_bumper/dash_nest_bumper_test.dart deleted file mode 100644 index 0ee1d6b9..00000000 --- a/packages/pinball_components/test/src/components/dash_nest_bumper/dash_nest_bumper_test.dart +++ /dev/null @@ -1,138 +0,0 @@ -// ignore_for_file: cascade_invocations - -import 'package:bloc_test/bloc_test.dart'; -import 'package:flame/components.dart'; -import 'package:flame_test/flame_test.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:mocktail/mocktail.dart'; -import 'package:pinball_components/pinball_components.dart'; -import 'package:pinball_components/src/components/bumping_behavior.dart'; -import 'package:pinball_components/src/components/dash_nest_bumper/behaviors/behaviors.dart'; - -import '../../../helpers/helpers.dart'; - -class _MockDashNestBumperCubit extends Mock implements DashNestBumperCubit {} - -void main() { - TestWidgetsFlutterBinding.ensureInitialized(); - - group('DashNestBumper', () { - final assets = [ - Assets.images.dash.bumper.main.active.keyName, - Assets.images.dash.bumper.main.inactive.keyName, - Assets.images.dash.bumper.a.active.keyName, - Assets.images.dash.bumper.a.inactive.keyName, - Assets.images.dash.bumper.b.active.keyName, - Assets.images.dash.bumper.b.inactive.keyName, - ]; - final flameTester = FlameTester(() => TestGame(assets)); - - flameTester.test('"main" loads correctly', (game) async { - final bumper = DashNestBumper.main(); - await game.ensureAdd(bumper); - expect(game.contains(bumper), isTrue); - }); - - flameTester.test('"a" loads correctly', (game) async { - final bumper = DashNestBumper.a(); - await game.ensureAdd(bumper); - - expect(game.contains(bumper), isTrue); - }); - - flameTester.test('"b" loads correctly', (game) async { - final bumper = DashNestBumper.b(); - await game.ensureAdd(bumper); - expect(game.contains(bumper), isTrue); - }); - - // ignore: public_member_api_docs - flameTester.test('closes bloc when removed', (game) async { - final bloc = _MockDashNestBumperCubit(); - whenListen( - bloc, - const Stream.empty(), - initialState: DashNestBumperState.inactive, - ); - when(bloc.close).thenAnswer((_) async {}); - final dashNestBumper = DashNestBumper.test(bloc: bloc); - - await game.ensureAdd(dashNestBumper); - game.remove(dashNestBumper); - await game.ready(); - - verify(bloc.close).called(1); - }); - - flameTester.test('adds a DashNestBumperBallContactBehavior', (game) async { - final dashNestBumper = DashNestBumper.a(); - await game.ensureAdd(dashNestBumper); - expect( - dashNestBumper.children - .whereType() - .single, - isNotNull, - ); - }); - - group("'main' adds", () { - flameTester.test('new children', (game) async { - final component = Component(); - final dashNestBumper = DashNestBumper.main( - children: [component], - ); - await game.ensureAdd(dashNestBumper); - expect(dashNestBumper.children, contains(component)); - }); - - flameTester.test('a BumpingBehavior', (game) async { - final dashNestBumper = DashNestBumper.main(); - await game.ensureAdd(dashNestBumper); - expect( - dashNestBumper.children.whereType().single, - isNotNull, - ); - }); - }); - - group("'a' adds", () { - flameTester.test('new children', (game) async { - final component = Component(); - final dashNestBumper = DashNestBumper.a( - children: [component], - ); - await game.ensureAdd(dashNestBumper); - expect(dashNestBumper.children, contains(component)); - }); - - flameTester.test('a BumpingBehavior', (game) async { - final dashNestBumper = DashNestBumper.a(); - await game.ensureAdd(dashNestBumper); - expect( - dashNestBumper.children.whereType().single, - isNotNull, - ); - }); - }); - - group("'b' adds", () { - flameTester.test('new children', (game) async { - final component = Component(); - final dashNestBumper = DashNestBumper.b( - children: [component], - ); - await game.ensureAdd(dashNestBumper); - expect(dashNestBumper.children, contains(component)); - }); - - flameTester.test('a BumpingBehavior', (game) async { - final dashNestBumper = DashNestBumper.b(); - await game.ensureAdd(dashNestBumper); - expect( - dashNestBumper.children.whereType().single, - isNotNull, - ); - }); - }); - }); -} diff --git a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart index 0d058c70..07a0c034 100644 --- a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart +++ b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart @@ -58,20 +58,19 @@ void main() { final flameTester = FlameTester(_TestGame.new); - void _contactedBumper(DashNestBumper bumper) => - bumper.bloc.onBallContacted(); + void _contactedBumper(DashBumper bumper) => bumper.bloc.onBallContacted(); flameTester.testGameWidget( - 'adds GameBonus.dashNest to the game ' + 'adds GameBonus.DashBumper to the game ' 'when bumpers are activated three times', setUp: (game, tester) async { await game.onLoad(); final behavior = FlutterForestBonusBehavior(); final parent = FlutterForest.test(); final bumpers = [ - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), ]; final animatronic = DashAnimatronic(); final signpost = Signpost.test(bloc: SignpostCubit()); @@ -79,7 +78,7 @@ void main() { await parent.ensureAddAll([...bumpers, animatronic, signpost]); await parent.ensureAdd(behavior); - expect(game.descendants().whereType(), equals(bumpers)); + expect(game.descendants().whereType(), equals(bumpers)); bumpers.forEach(_contactedBumper); await tester.pump(); bumpers.forEach(_contactedBumper); @@ -101,9 +100,9 @@ void main() { final behavior = FlutterForestBonusBehavior(); final parent = FlutterForest.test(); final bumpers = [ - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), ]; final animatronic = DashAnimatronic(); final signpost = Signpost.test(bloc: SignpostCubit()); @@ -111,7 +110,7 @@ void main() { await parent.ensureAddAll([...bumpers, animatronic, signpost]); await parent.ensureAdd(behavior); - expect(game.descendants().whereType(), equals(bumpers)); + expect(game.descendants().whereType(), equals(bumpers)); bumpers.forEach(_contactedBumper); await tester.pump(); bumpers.forEach(_contactedBumper); @@ -135,9 +134,9 @@ void main() { final behavior = FlutterForestBonusBehavior(); final parent = FlutterForest.test(); final bumpers = [ - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), - DashNestBumper.test(bloc: DashNestBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), + DashBumper.test(bloc: DashBumperCubit()), ]; final animatronic = DashAnimatronic(); final signpost = Signpost.test(bloc: SignpostCubit()); @@ -145,7 +144,7 @@ void main() { await parent.ensureAddAll([...bumpers, animatronic, signpost]); await parent.ensureAdd(behavior); - expect(game.descendants().whereType(), equals(bumpers)); + expect(game.descendants().whereType(), equals(bumpers)); bumpers.forEach(_contactedBumper); await tester.pump(); diff --git a/test/game/components/flutter_forest/flutter_forest_test.dart b/test/game/components/flutter_forest/flutter_forest_test.dart index 470719d8..bce4b6ac 100644 --- a/test/game/components/flutter_forest/flutter_forest_test.dart +++ b/test/game/components/flutter_forest/flutter_forest_test.dart @@ -91,23 +91,23 @@ void main() { ); flameTester.test( - 'three DashNestBumper', + 'three DashBumper', (game) async { final component = FlutterForest(); await game.pump(component); expect( - game.descendants().whereType().length, + game.descendants().whereType().length, equals(3), ); }, ); flameTester.test( - 'three DashNestBumpers with BumperNoiseBehavior', + 'three DashBumpers with BumperNoiseBehavior', (game) async { final component = FlutterForest(); await game.pump(component); - final bumpers = game.descendants().whereType(); + final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( bumper.firstChild(), diff --git a/test/game/components/multiballs/behaviors/multiballs_behavior_test.dart b/test/game/components/multiballs/behaviors/multiballs_behavior_test.dart index 139c7e47..d144a53e 100644 --- a/test/game/components/multiballs/behaviors/multiballs_behavior_test.dart +++ b/test/game/components/multiballs/behaviors/multiballs_behavior_test.dart @@ -63,7 +63,7 @@ void main() { group('listenWhen', () { test( 'is true when the bonusHistory has changed ' - 'with a new GameBonus.dashNest', + 'with a new GameBonus.DashBumper', () { final previous = GameState.initial(); final state = previous.copyWith( @@ -79,7 +79,7 @@ void main() { test( 'is false when the bonusHistory has changed ' - 'with a bonus different than GameBonus.dashNest', () { + 'with a bonus different than GameBonus.DashBumper', () { final previous = GameState.initial().copyWith(bonusHistory: [GameBonus.dashNest]); final state = previous.copyWith( diff --git a/test/game/view/widgets/bonus_animation_test.dart b/test/game/view/widgets/bonus_animation_test.dart index 5f67e968..02ef7aeb 100644 --- a/test/game/view/widgets/bonus_animation_test.dart +++ b/test/game/view/widgets/bonus_animation_test.dart @@ -22,7 +22,7 @@ void main() { }); group('loads SpriteAnimationWidget correctly for', () { - testWidgets('dashNest', (tester) async { + testWidgets('DashBumper', (tester) async { await tester.pumpApp( BonusAnimation.dashNest(), );