From 370baa5ce372fe918a6a1d71e7d7232e73479141 Mon Sep 17 00:00:00 2001 From: alestiago Date: Tue, 15 Mar 2022 08:28:33 +0000 Subject: [PATCH] chore: removed FlipperGroup --- lib/game/components/flipper.dart | 36 ---------- test/game/components/flipper_test.dart | 96 -------------------------- test/game/pinball_game_test.dart | 4 +- 3 files changed, 2 insertions(+), 134 deletions(-) diff --git a/lib/game/components/flipper.dart b/lib/game/components/flipper.dart index 55617f86..6ec0cb49 100644 --- a/lib/game/components/flipper.dart +++ b/lib/game/components/flipper.dart @@ -8,42 +8,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:pinball/game/game.dart'; -/// {@template flipper_group} -/// Loads a [Flipper.right] and a [Flipper.left]. -/// {@endtemplate} -class FlipperGroup extends Component { - /// {@macro flipper_group} - FlipperGroup({ - required this.position, - required this.spacing, - }); - - /// The amount of space between the [Flipper.right] and [Flipper.left]. - final double spacing; - - /// The position of this [FlipperGroup] - final Vector2 position; - - @override - Future onLoad() async { - final leftFlipper = Flipper.left( - position: Vector2( - position.x - (Flipper.width / 2) - (spacing / 2), - position.y, - ), - ); - await add(leftFlipper); - - final rightFlipper = Flipper.right( - position: Vector2( - position.x + (Flipper.width / 2) + (spacing / 2), - position.y, - ), - ); - await add(rightFlipper); - } -} - /// {@template flipper} /// A bat, typically found in pairs at the bottom of the board. /// diff --git a/test/game/components/flipper_test.dart b/test/game/components/flipper_test.dart index 0e281d07..1ba8be3c 100644 --- a/test/game/components/flipper_test.dart +++ b/test/game/components/flipper_test.dart @@ -15,102 +15,6 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); final flameTester = FlameTester(PinballGameTest.create); - group('FlipperGroup', () { - flameTester.test( - 'loads correctly', - (game) async { - final flipperGroup = FlipperGroup( - position: Vector2.zero(), - spacing: 0, - ); - await game.ensureAdd(flipperGroup); - - expect(game.contains(flipperGroup), isTrue); - }, - ); - - group('constructor', () { - flameTester.test( - 'positions correctly', - (game) async { - final position = Vector2.all(10); - final flipperGroup = FlipperGroup( - position: position, - spacing: 0, - ); - await game.ensureAdd(flipperGroup); - - expect(flipperGroup.position, equals(position)); - }, - ); - }); - - group('children', () { - bool Function(Component) flipperSelector(BoardSide side) => - (component) => component is Flipper && component.side == side; - - flameTester.test( - 'has only one left Flipper', - (game) async { - final flipperGroup = FlipperGroup( - position: Vector2.zero(), - spacing: 0, - ); - await game.ensureAdd(flipperGroup); - - expect( - () => flipperGroup.children.singleWhere( - flipperSelector(BoardSide.left), - ), - returnsNormally, - ); - }, - ); - - flameTester.test( - 'has only one right Flipper', - (game) async { - final flipperGroup = FlipperGroup( - position: Vector2.zero(), - spacing: 0, - ); - await game.ensureAdd(flipperGroup); - - expect( - () => flipperGroup.children.singleWhere( - flipperSelector(BoardSide.right), - ), - returnsNormally, - ); - }, - ); - - flameTester.test( - 'spaced correctly', - (game) async { - final flipperGroup = FlipperGroup( - position: Vector2.zero(), - spacing: 2, - ); - await game.ready(); - await game.ensureAdd(flipperGroup); - - final leftFlipper = flipperGroup.children.singleWhere( - flipperSelector(BoardSide.left), - ) as Flipper; - final rightFlipper = flipperGroup.children.singleWhere( - flipperSelector(BoardSide.right), - ) as Flipper; - - expect( - leftFlipper.body.position.x + Flipper.width + flipperGroup.spacing, - equals(rightFlipper.body.position.x), - ); - }, - ); - }); - }); - group( 'Flipper', () { diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index f79d19d5..96e92554 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -54,10 +54,10 @@ void main() { }, ); - flameTester.test('has only one FlipperGroup', (game) async { + flameTester.test('has only one BottomGroup', (game) async { await game.ready(); expect( - game.children.whereType().length, + game.children.whereType().length, equals(1), ); });