diff --git a/packages/pinball_components/lib/src/components/signpost/signpost.dart b/packages/pinball_components/lib/src/components/signpost/signpost.dart index 3f9b2aaa..e2aca547 100644 --- a/packages/pinball_components/lib/src/components/signpost/signpost.dart +++ b/packages/pinball_components/lib/src/components/signpost/signpost.dart @@ -1,5 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flutter/foundation.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; @@ -32,6 +33,16 @@ class Signpost extends BodyComponent with InitialPosition { ], ); + /// Creates an [Signpost] without any children. + /// + /// This can be used for testing [Signpost]'s behaviors in isolation. + // TODO(alestiago): Refactor injecting bloc once the following is merged: + // https://github.com/flame-engine/flame/pull/1538 + @visibleForTesting + Signpost.test({ + required this.bloc, + }); + // TODO(alestiago): Consider refactoring once the following is merged: // https://github.com/flame-engine/flame/pull/1538 // ignore: public_member_api_docs diff --git a/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart b/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart index 349dd811..020311d3 100644 --- a/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/flutter_forest/signpost_game.dart @@ -34,6 +34,6 @@ class SignpostGame extends BallGame { @override void onTap() { super.onTap(); - firstChild()!.progress(); + firstChild()!.bloc.onProgressed(); } } diff --git a/packages/pinball_components/test/src/components/golden/signpost/active1.png b/packages/pinball_components/test/src/components/golden/signpost/active1.png index f11af5a8..0e0f9e79 100644 Binary files a/packages/pinball_components/test/src/components/golden/signpost/active1.png and b/packages/pinball_components/test/src/components/golden/signpost/active1.png differ diff --git a/packages/pinball_components/test/src/components/golden/signpost/active2.png b/packages/pinball_components/test/src/components/golden/signpost/active2.png index 6ddf8786..9dfae564 100644 Binary files a/packages/pinball_components/test/src/components/golden/signpost/active2.png and b/packages/pinball_components/test/src/components/golden/signpost/active2.png differ diff --git a/packages/pinball_components/test/src/components/golden/signpost/active3.png b/packages/pinball_components/test/src/components/golden/signpost/active3.png index 5e9b0005..a99c9e48 100644 Binary files a/packages/pinball_components/test/src/components/golden/signpost/active3.png and b/packages/pinball_components/test/src/components/golden/signpost/active3.png differ diff --git a/packages/pinball_components/test/src/components/golden/signpost/inactive.png b/packages/pinball_components/test/src/components/golden/signpost/inactive.png index 7ed00fba..d2f50725 100644 Binary files a/packages/pinball_components/test/src/components/golden/signpost/inactive.png and b/packages/pinball_components/test/src/components/golden/signpost/inactive.png differ diff --git a/packages/pinball_components/test/src/components/signpost_test.dart b/packages/pinball_components/test/src/components/signpost_test.dart index 23aa6bd0..63ec9a66 100644 --- a/packages/pinball_components/test/src/components/signpost_test.dart +++ b/packages/pinball_components/test/src/components/signpost_test.dart @@ -18,13 +18,13 @@ void main() { final flameTester = FlameTester(() => TestGame(assets)); group('Signpost', () { + const goldenPath = 'golden/signpost/'; + flameTester.test( 'loads correctly', (game) async { final signpost = Signpost(); - await game.ready(); await game.ensureAdd(signpost); - expect(game.contains(signpost), isTrue); }, ); @@ -39,8 +39,8 @@ void main() { await tester.pump(); expect( - signpost.firstChild()!.current, - SignpostSpriteState.inactive, + signpost.bloc.state, + equals(SignpostState.active1), ); game.camera.followVector2(Vector2.zero()); @@ -48,7 +48,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/signpost/inactive.png'), + matchesGoldenFile('${goldenPath}inactive.png'), ); }, ); @@ -59,12 +59,12 @@ void main() { await game.images.loadAll(assets); final signpost = Signpost(); await game.ensureAdd(signpost); - signpost.progress(); + signpost.bloc.onProgressed(); await tester.pump(); expect( - signpost.firstChild()!.current, - SignpostSpriteState.active1, + signpost.bloc.state, + equals(SignpostState.active1), ); game.camera.followVector2(Vector2.zero()); @@ -72,7 +72,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/signpost/active1.png'), + matchesGoldenFile('${goldenPath}active1.png'), ); }, ); @@ -83,14 +83,14 @@ void main() { await game.images.loadAll(assets); final signpost = Signpost(); await game.ensureAdd(signpost); - signpost - ..progress() - ..progress(); + signpost.bloc + ..onProgressed() + ..onProgressed(); await tester.pump(); expect( - signpost.firstChild()!.current, - SignpostSpriteState.active2, + signpost.bloc.state, + equals(SignpostState.active2), ); game.camera.followVector2(Vector2.zero()); @@ -98,7 +98,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/signpost/active2.png'), + matchesGoldenFile('${goldenPath}active2.png'), ); }, ); @@ -109,15 +109,16 @@ void main() { await game.images.loadAll(assets); final signpost = Signpost(); await game.ensureAdd(signpost); - signpost - ..progress() - ..progress() - ..progress(); + + signpost.bloc + ..onProgressed() + ..onProgressed() + ..onProgressed(); await tester.pump(); expect( - signpost.firstChild()!.current, - SignpostSpriteState.active3, + signpost.bloc.state, + equals(SignpostState.active3), ); game.camera.followVector2(Vector2.zero()); @@ -125,33 +126,12 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/signpost/active3.png'), + matchesGoldenFile('${goldenPath}active3.png'), ); }, ); }); - flameTester.test( - 'progress correctly cycles through all sprites', - (game) async { - final signpost = Signpost(); - await game.ready(); - await game.ensureAdd(signpost); - - final spriteComponent = signpost.firstChild()!; - - expect(spriteComponent.current, SignpostSpriteState.inactive); - signpost.progress(); - expect(spriteComponent.current, SignpostSpriteState.active1); - signpost.progress(); - expect(spriteComponent.current, SignpostSpriteState.active2); - signpost.progress(); - expect(spriteComponent.current, SignpostSpriteState.active3); - signpost.progress(); - expect(spriteComponent.current, SignpostSpriteState.inactive); - }, - ); - flameTester.test('adds new children', (game) async { final component = Component(); final signpost = Signpost(