From 135b4ed5c2d8c69ec6792a90c2a99227e08b81d0 Mon Sep 17 00:00:00 2001 From: Erick Date: Thu, 5 May 2022 18:34:20 -0300 Subject: [PATCH] refactor: renaming noisy to noise (#353) --- lib/game/behaviors/behaviors.dart | 2 +- ..._noisy_behavior.dart => bumper_noise_behavior.dart} | 2 +- lib/game/components/android_acres/android_acres.dart | 6 +++--- lib/game/components/controlled_plunger.dart | 4 ++-- lib/game/components/flutter_forest/flutter_forest.dart | 8 ++++---- lib/game/components/sparky_scorch.dart | 6 +++--- test/game/behaviors/bumper_noisy_behavior_test.dart | 4 ++-- .../components/android_acres/android_acres_test.dart | 6 +++--- test/game/components/controlled_plunger_test.dart | 10 +++++----- .../components/flutter_forest/flutter_forest_test.dart | 4 ++-- test/game/components/sparky_scorch_test.dart | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) rename lib/game/behaviors/{bumper_noisy_behavior.dart => bumper_noise_behavior.dart} (87%) diff --git a/lib/game/behaviors/behaviors.dart b/lib/game/behaviors/behaviors.dart index 243fff82..44cce1df 100644 --- a/lib/game/behaviors/behaviors.dart +++ b/lib/game/behaviors/behaviors.dart @@ -1,4 +1,4 @@ export 'ball_spawning_behavior.dart'; -export 'bumper_noisy_behavior.dart'; +export 'bumper_noise_behavior.dart'; export 'camera_focusing_behavior.dart'; export 'scoring_behavior.dart'; diff --git a/lib/game/behaviors/bumper_noisy_behavior.dart b/lib/game/behaviors/bumper_noise_behavior.dart similarity index 87% rename from lib/game/behaviors/bumper_noisy_behavior.dart rename to lib/game/behaviors/bumper_noise_behavior.dart index 86c9f7b0..e89ec23a 100644 --- a/lib/game/behaviors/bumper_noisy_behavior.dart +++ b/lib/game/behaviors/bumper_noise_behavior.dart @@ -6,7 +6,7 @@ import 'package:pinball/game/pinball_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_flame/pinball_flame.dart'; -class BumperNoisyBehavior extends ContactBehavior with HasGameRef { +class BumperNoiseBehavior extends ContactBehavior with HasGameRef { @override void beginContact(Object other, Contact contact) { super.beginContact(other, contact); diff --git a/lib/game/components/android_acres/android_acres.dart b/lib/game/components/android_acres/android_acres.dart index 649ef196..af4ec451 100644 --- a/lib/game/components/android_acres/android_acres.dart +++ b/lib/game/components/android_acres/android_acres.dart @@ -35,19 +35,19 @@ class AndroidAcres extends Component { AndroidBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-25, 1.3), AndroidBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-32.8, -9.2), AndroidBumper.cow( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-20.5, -13.8), AndroidSpaceshipBonusBehavior(), diff --git a/lib/game/components/controlled_plunger.dart b/lib/game/components/controlled_plunger.dart index ac9cc19d..bcebbacc 100644 --- a/lib/game/components/controlled_plunger.dart +++ b/lib/game/components/controlled_plunger.dart @@ -20,13 +20,13 @@ class ControlledPlunger extends Plunger with Controls { void release() { super.release(); - add(PlungerNoisyBehavior()); + add(PlungerNoiseBehavior()); } } /// A behavior attached to the plunger when it launches the ball /// which plays the related sound effects. -class PlungerNoisyBehavior extends Component with HasGameRef { +class PlungerNoiseBehavior extends Component with HasGameRef { @override Future onLoad() async { await super.onLoad(); diff --git a/lib/game/components/flutter_forest/flutter_forest.dart b/lib/game/components/flutter_forest/flutter_forest.dart index 259b6bb2..a9219ba0 100644 --- a/lib/game/components/flutter_forest/flutter_forest.dart +++ b/lib/game/components/flutter_forest/flutter_forest.dart @@ -19,25 +19,25 @@ class FlutterForest extends Component with ZIndex { Signpost( children: [ ScoringContactBehavior(points: Points.fiveThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(8.35, -58.3), DashNestBumper.main( children: [ ScoringContactBehavior(points: Points.twoHundredThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(18.55, -59.35), DashNestBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(8.95, -51.95), DashNestBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(22.3, -46.75), DashAnimatronic()..position = Vector2(20, -66), diff --git a/lib/game/components/sparky_scorch.dart b/lib/game/components/sparky_scorch.dart index 5a266b4e..e7e5004a 100644 --- a/lib/game/components/sparky_scorch.dart +++ b/lib/game/components/sparky_scorch.dart @@ -18,19 +18,19 @@ class SparkyScorch extends Component { SparkyBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-22.9, -41.65), SparkyBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-21.25, -57.9), SparkyBumper.c( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-3.3, -52.55), SparkyComputerSensor()..initialPosition = Vector2(-13, -49.9), diff --git a/test/game/behaviors/bumper_noisy_behavior_test.dart b/test/game/behaviors/bumper_noisy_behavior_test.dart index 18d90fbd..e860a094 100644 --- a/test/game/behaviors/bumper_noisy_behavior_test.dart +++ b/test/game/behaviors/bumper_noisy_behavior_test.dart @@ -23,7 +23,7 @@ class _MockContact extends Mock implements Contact {} void main() { TestWidgetsFlutterBinding.ensureInitialized(); - group('BumperNoisyBehavior', () {}); + group('BumperNoiseBehavior', () {}); late PinballPlayer player; final flameTester = FlameTester( @@ -37,7 +37,7 @@ void main() { flameTester.testGameWidget( 'plays bumper sound', setUp: (game, _) async { - final behavior = BumperNoisyBehavior(); + final behavior = BumperNoiseBehavior(); final parent = _TestBodyComponent(); await game.ensureAdd(parent); await parent.ensureAdd(behavior); diff --git a/test/game/components/android_acres/android_acres_test.dart b/test/game/components/android_acres/android_acres_test.dart index 8434d5f8..5de7576b 100644 --- a/test/game/components/android_acres/android_acres_test.dart +++ b/test/game/components/android_acres/android_acres_test.dart @@ -2,7 +2,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball/game/behaviors/bumper_noisy_behavior.dart'; +import 'package:pinball/game/behaviors/bumper_noise_behavior.dart'; import 'package:pinball/game/components/android_acres/behaviors/behaviors.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; @@ -103,13 +103,13 @@ void main() { ); flameTester.test( - 'three AndroidBumpers with BumperNoisyBehavior', + 'three AndroidBumpers with BumperNoiseBehavior', (game) async { await game.ensureAdd(AndroidAcres()); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); } diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart index 211cf82f..f772b39a 100644 --- a/test/game/components/controlled_plunger_test.dart +++ b/test/game/components/controlled_plunger_test.dart @@ -135,7 +135,7 @@ void main() { }); flameTester.test( - 'adds the PlungerNoisyBehavior plunger is released', + 'adds the PlungerNoiseBehavior plunger is released', (game) async { await game.ensureAdd(plunger); plunger.body.setTransform(Vector2(0, 1), 0); @@ -143,23 +143,23 @@ void main() { await game.ready(); final count = - game.descendants().whereType().length; + game.descendants().whereType().length; expect(count, equals(1)); }, ); }); - group('PlungerNoisyBehavior', () { + group('PlungerNoiseBehavior', () { late PinballGame game; late PinballPlayer player; - late PlungerNoisyBehavior behavior; + late PlungerNoiseBehavior behavior; setUp(() { game = _MockPinballGame(); player = _MockPinballPlayer(); when(() => game.player).thenReturn(player); - behavior = PlungerNoisyBehavior(); + behavior = PlungerNoiseBehavior(); behavior.mockGameRef(game); }); diff --git a/test/game/components/flutter_forest/flutter_forest_test.dart b/test/game/components/flutter_forest/flutter_forest_test.dart index 6dddcd7b..bc0e5ff4 100644 --- a/test/game/components/flutter_forest/flutter_forest_test.dart +++ b/test/game/components/flutter_forest/flutter_forest_test.dart @@ -76,14 +76,14 @@ void main() { ); flameTester.test( - 'three DashNestBumpers with BumperNoisyBehavior', + 'three DashNestBumpers with BumperNoiseBehavior', (game) async { final flutterForest = FlutterForest(); await game.ensureAdd(ZCanvasComponent(children: [flutterForest])); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); } diff --git a/test/game/components/sparky_scorch_test.dart b/test/game/components/sparky_scorch_test.dart index 5df250dd..0eeb9b45 100644 --- a/test/game/components/sparky_scorch_test.dart +++ b/test/game/components/sparky_scorch_test.dart @@ -77,13 +77,13 @@ void main() { ); flameTester.test( - 'three SparkyBumpers with BumperNoisyBehavior', + 'three SparkyBumpers with BumperNoiseBehavior', (game) async { await game.ensureAdd(SparkyScorch()); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); }