From 6ac4b1255a983bdd992ed03068b88512a5b45a20 Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Wed, 4 May 2022 11:09:13 +0100
Subject: [PATCH] fix: test failures

---
 .../lib/src/components/ball/ball.dart         |  8 ++----
 .../android_acres/android_acres_test.dart     |  7 +++--
 test/game/pinball_game_test.dart              | 28 +++++++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/packages/pinball_components/lib/src/components/ball/ball.dart b/packages/pinball_components/lib/src/components/ball/ball.dart
index 456dd4f1..9234e69c 100644
--- a/packages/pinball_components/lib/src/components/ball/ball.dart
+++ b/packages/pinball_components/lib/src/components/ball/ball.dart
@@ -49,17 +49,13 @@ class Ball extends BodyComponent with Layered, InitialPosition, ZIndex {
   @override
   Body createBody() {
     final shape = CircleShape()..radius = size.x / 2;
-    final fixtureDef = FixtureDef(
-      shape,
-      density: 1,
-    );
     final bodyDef = BodyDef(
       position: initialPosition,
-      userData: this,
       type: BodyType.dynamic,
+      userData: this,
     );
 
-    return world.createBody(bodyDef)..createFixture(fixtureDef);
+    return world.createBody(bodyDef)..createFixtureFromShape(shape, 1);
   }
 
   /// Immediatly and completly [stop]s the ball.
diff --git a/test/game/components/android_acres/android_acres_test.dart b/test/game/components/android_acres/android_acres_test.dart
index cc0d92ea..8434d5f8 100644
--- a/test/game/components/android_acres/android_acres_test.dart
+++ b/test/game/components/android_acres/android_acres_test.dart
@@ -34,11 +34,12 @@ void main() {
     Assets.images.android.bumper.cow.lit.keyName,
     Assets.images.android.bumper.cow.dimmed.keyName,
   ];
-  final flameTester = FlameTester(
-    () => EmptyPinballTestGame(assets: assets),
-  );
 
   group('AndroidAcres', () {
+    final flameTester = FlameTester(
+      () => EmptyPinballTestGame(assets: assets),
+    );
+
     flameTester.test('loads correctly', (game) async {
       final component = AndroidAcres();
       await game.ensureAdd(component);
diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart
index dd87fec0..98aac670 100644
--- a/test/game/pinball_game_test.dart
+++ b/test/game/pinball_game_test.dart
@@ -140,19 +140,16 @@ void main() {
     );
   });
 
-  final flameTester = FlameTester(
-    () => PinballTestGame(assets: assets),
-  );
-  final debugModeFlameTester = FlameTester(
-    () => DebugPinballTestGame(assets: assets),
-  );
-
-  final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
-    gameBuilder: () => PinballTestGame(assets: assets),
-    blocBuilder: () => gameBloc,
-  );
-
   group('PinballGame', () {
+    final flameTester = FlameTester(
+      () => PinballTestGame(assets: assets),
+    );
+
+    final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
+      gameBuilder: () => PinballTestGame(assets: assets),
+      blocBuilder: () => gameBloc,
+    );
+
     group('components', () {
       // TODO(alestiago): tests that Blueprints get added once the Blueprint
       // class is removed.
@@ -247,6 +244,8 @@ void main() {
               final newState = _MockGameState();
               when(() => newState.isGameOver).thenReturn(false);
 
+              await game.ready();
+
               expect(
                 game.descendants().whereType<ControlledBall>().length,
                 greaterThan(0),
@@ -439,6 +438,10 @@ void main() {
   });
 
   group('DebugPinballGame', () {
+    final debugModeFlameTester = FlameTester(
+      () => DebugPinballTestGame(assets: assets),
+    );
+
     debugModeFlameTester.test(
       'adds a ball on tap up',
       (game) async {
@@ -452,6 +455,7 @@ void main() {
         when(() => tapUpEvent.eventPosition).thenReturn(eventPosition);
         when(() => tapUpEvent.raw).thenReturn(raw);
 
+        await game.ready();
         final previousBalls =
             game.descendants().whereType<ControlledBall>().toList();