From 4d7e18b753536c8d535fb406ceceeb954f552da2 Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Mon, 9 May 2022 15:25:16 +0200
Subject: [PATCH] test: refactor test

---
 ..._ball_ascending_contact_behavior_test.dart | 50 +++++++------------
 .../spaceship_ramp/spaceship_ramp_test.dart   | 12 -----
 2 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/packages/pinball_components/test/src/components/spaceship_ramp/behavior/ramp_ball_ascending_contact_behavior_test.dart b/packages/pinball_components/test/src/components/spaceship_ramp/behavior/ramp_ball_ascending_contact_behavior_test.dart
index 3ea10085..6d14fcfd 100644
--- a/packages/pinball_components/test/src/components/spaceship_ramp/behavior/ramp_ball_ascending_contact_behavior_test.dart
+++ b/packages/pinball_components/test/src/components/spaceship_ramp/behavior/ramp_ball_ascending_contact_behavior_test.dart
@@ -1,14 +1,12 @@
 // ignore_for_file: cascade_invocations
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:flame_bloc/flame_bloc.dart';
 import 'package:flame_forge2d/flame_forge2d.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/spaceship_ramp/behavior/behavior.dart';
-import 'package:pinball_flame/pinball_flame.dart';
 
 class _TestGame extends Forge2DGame {
   @override
@@ -27,20 +25,6 @@ class _TestGame extends Forge2DGame {
       Assets.images.android.ramp.arrow.active5.keyName,
     ]);
   }
-
-  Future<void> pump(
-    SpaceshipRamp child, {
-    required SpaceshipRampCubit spaceshipRampCubit,
-  }) async {
-    await ensureAdd(
-      FlameBlocProvider<SpaceshipRampCubit, SpaceshipRampState>.value(
-        value: spaceshipRampCubit,
-        children: [
-          ZCanvasComponent(children: [child]),
-        ],
-      ),
-    );
-  }
 }
 
 class _MockSpaceshipRampCubit extends Mock implements SpaceshipRampCubit {}
@@ -88,20 +72,21 @@ void main() {
               initialState: const SpaceshipRampState.initial(),
             );
 
-            final parent = SpaceshipRampBoardOpening.test();
-            final spaceshipRamp = SpaceshipRamp.test();
+            final opening = SpaceshipRampBoardOpening.test();
+            final spaceshipRamp = SpaceshipRamp.test(
+              bloc: bloc,
+              children: [opening],
+            );
 
             when(() => body.linearVelocity).thenReturn(Vector2(0, -1));
 
-            await spaceshipRamp.add(parent);
-            await game.pump(
-              spaceshipRamp,
-              spaceshipRampCubit: bloc,
-            );
-            await parent.add(behavior);
+            await game.ensureAdd(spaceshipRamp);
+            await opening.add(behavior);
 
             behavior.beginContact(ball, _MockContact());
 
+            await game.ready();
+
             verify(bloc.onAscendingBallEntered).called(1);
           },
         );
@@ -117,20 +102,21 @@ void main() {
               initialState: const SpaceshipRampState.initial(),
             );
 
-            final parent = SpaceshipRampBoardOpening.test();
-            final spaceshipRamp = SpaceshipRamp.test();
+            final opening = SpaceshipRampBoardOpening.test();
+            final spaceshipRamp = SpaceshipRamp.test(
+              bloc: bloc,
+              children: [opening],
+            );
 
             when(() => body.linearVelocity).thenReturn(Vector2(0, 1));
 
-            await spaceshipRamp.add(parent);
-            await game.pump(
-              spaceshipRamp,
-              spaceshipRampCubit: bloc,
-            );
-            await parent.add(behavior);
+            await game.ensureAdd(spaceshipRamp);
+            await opening.add(behavior);
 
             behavior.beginContact(ball, _MockContact());
 
+            await game.ready();
+
             verifyNever(bloc.onAscendingBallEntered);
           },
         );
diff --git a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart
index ca2cad18..8ca5217a 100644
--- a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart
+++ b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart
@@ -42,18 +42,6 @@ class _MockManifold extends Mock implements Manifold {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final assets = [
-    Assets.images.android.ramp.boardOpening.keyName,
-    Assets.images.android.ramp.railingForeground.keyName,
-    Assets.images.android.ramp.railingBackground.keyName,
-    Assets.images.android.ramp.main.keyName,
-    Assets.images.android.ramp.arrow.inactive.keyName,
-    Assets.images.android.ramp.arrow.active1.keyName,
-    Assets.images.android.ramp.arrow.active2.keyName,
-    Assets.images.android.ramp.arrow.active3.keyName,
-    Assets.images.android.ramp.arrow.active4.keyName,
-    Assets.images.android.ramp.arrow.active5.keyName,
-  ];
 
   final flameTester = FlameTester(_TestGame.new);