From 0abd1827d548bbd328c88aef2be335aef4f57af5 Mon Sep 17 00:00:00 2001 From: alestiago Date: Wed, 16 Mar 2022 14:57:05 +0000 Subject: [PATCH] feat: removed unecessary positioning --- test/game/components/ball_test.dart | 10 +++--- test/game/components/baseboard_test.dart | 12 +++---- test/game/components/bonus_word_test.dart | 10 +++--- test/game/components/flipper_test.dart | 38 ++++++++++----------- test/game/components/joint_anchor_test.dart | 6 ++-- test/game/components/pathway_test.dart | 20 +++++------ test/game/components/plunger_test.dart | 18 +++++----- test/game/components/round_bumper_test.dart | 12 +++---- test/game/components/sling_shot_test.dart | 22 ++++++------ 9 files changed, 74 insertions(+), 74 deletions(-) diff --git a/test/game/components/ball_test.dart b/test/game/components/ball_test.dart index 692a83cb..849db996 100644 --- a/test/game/components/ball_test.dart +++ b/test/game/components/ball_test.dart @@ -17,7 +17,7 @@ void main() { flameTester.test( 'loads correctly', (game) async { - final ball = Ball()..initialPosition = Vector2.all(0); + final ball = Ball(); await game.ready(); await game.ensureAdd(ball); @@ -41,7 +41,7 @@ void main() { flameTester.test( 'is dynamic', (game) async { - final ball = Ball()..initialPosition = Vector2.all(0); + final ball = Ball(); await game.ensureAdd(ball); expect(ball.body.bodyType, equals(BodyType.dynamic)); @@ -53,7 +53,7 @@ void main() { flameTester.test( 'exists', (game) async { - final ball = Ball()..initialPosition = Vector2.all(0); + final ball = Ball(); await game.ensureAdd(ball); expect(ball.body.fixtures[0], isA()); @@ -63,7 +63,7 @@ void main() { flameTester.test( 'is dense', (game) async { - final ball = Ball()..initialPosition = Vector2.all(0); + final ball = Ball(); await game.ensureAdd(ball); final fixture = ball.body.fixtures[0]; @@ -74,7 +74,7 @@ void main() { flameTester.test( 'shape is circular', (game) async { - final ball = Ball()..initialPosition = Vector2.all(0); + final ball = Ball(); await game.ensureAdd(ball); final fixture = ball.body.fixtures[0]; diff --git a/test/game/components/baseboard_test.dart b/test/game/components/baseboard_test.dart index 8b76b4c2..86087d92 100644 --- a/test/game/components/baseboard_test.dart +++ b/test/game/components/baseboard_test.dart @@ -16,10 +16,10 @@ void main() { await game.ready(); final leftBaseboard = Baseboard( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); final rightBaseboard = Baseboard( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ensureAddAll([leftBaseboard, rightBaseboard]); @@ -49,7 +49,7 @@ void main() { (game) async { final baseboard = Baseboard( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(baseboard); @@ -62,10 +62,10 @@ void main() { (game) async { final leftBaseboard = Baseboard( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); final rightBaseboard = Baseboard( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ensureAddAll([leftBaseboard, rightBaseboard]); expect(leftBaseboard.body.angle, isNegative); @@ -80,7 +80,7 @@ void main() { (game) async { final baseboard = Baseboard( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(baseboard); expect(baseboard.body.fixtures.length, equals(3)); diff --git a/test/game/components/bonus_word_test.dart b/test/game/components/bonus_word_test.dart index 6f8cd015..ca9465b0 100644 --- a/test/game/components/bonus_word_test.dart +++ b/test/game/components/bonus_word_test.dart @@ -125,7 +125,7 @@ void main() { final bonusLetter = BonusLetter( letter: 'G', index: 0, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(bonusLetter); await game.ready(); @@ -155,7 +155,7 @@ void main() { final bonusLetter = BonusLetter( letter: 'G', index: 0, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(bonusLetter); expect(bonusLetter.body.bodyType, equals(BodyType.static)); @@ -170,7 +170,7 @@ void main() { final bonusLetter = BonusLetter( letter: 'G', index: 0, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(bonusLetter); expect(bonusLetter.body.fixtures[0], isA()); @@ -183,7 +183,7 @@ void main() { final bonusLetter = BonusLetter( letter: 'G', index: 0, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(bonusLetter); final fixture = bonusLetter.body.fixtures[0]; @@ -197,7 +197,7 @@ void main() { final bonusLetter = BonusLetter( letter: 'G', index: 0, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(bonusLetter); final fixture = bonusLetter.body.fixtures[0]; diff --git a/test/game/components/flipper_test.dart b/test/game/components/flipper_test.dart index bec5b2b2..83242b5e 100644 --- a/test/game/components/flipper_test.dart +++ b/test/game/components/flipper_test.dart @@ -22,10 +22,10 @@ void main() { (game) async { final leftFlipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); final rightFlipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ready(); await game.ensureAddAll([leftFlipper, rightFlipper]); @@ -38,13 +38,13 @@ void main() { test('sets BoardSide', () { final leftFlipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); expect(leftFlipper.side, equals(leftFlipper.side)); final rightFlipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); expect(rightFlipper.side, equals(rightFlipper.side)); }); }); @@ -69,7 +69,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); expect(flipper.body.bodyType, equals(BodyType.dynamic)); @@ -81,7 +81,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); expect(flipper.body.gravityScale, isZero); @@ -93,8 +93,8 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); - final ball = Ball()..initialPosition = Vector2.zero(); + ); + final ball = Ball(); await game.ready(); await game.ensureAddAll([flipper, ball]); @@ -113,7 +113,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); expect(flipper.body.fixtures.length, equals(3)); @@ -125,7 +125,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final fixtures = flipper.body.fixtures; @@ -155,7 +155,7 @@ void main() { setUp(() { flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); }); testRawKeyDownEvents(leftKeys, (event) { @@ -221,7 +221,7 @@ void main() { setUp(() { flipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); }); testRawKeyDownEvents(rightKeys, (event) { @@ -290,7 +290,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -305,7 +305,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -323,7 +323,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -344,7 +344,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -364,7 +364,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -389,7 +389,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.left, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); @@ -415,7 +415,7 @@ void main() { (game) async { final flipper = Flipper.fromSide( side: BoardSide.right, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(flipper); final flipperAnchor = FlipperAnchor(flipper: flipper); diff --git a/test/game/components/joint_anchor_test.dart b/test/game/components/joint_anchor_test.dart index 7062a180..66a3bc60 100644 --- a/test/game/components/joint_anchor_test.dart +++ b/test/game/components/joint_anchor_test.dart @@ -13,7 +13,7 @@ void main() { flameTester.test( 'loads correctly', (game) async { - final anchor = JointAnchor()..initialPosition = Vector2.zero(); + final anchor = JointAnchor(); await game.ready(); await game.ensureAdd(anchor); @@ -39,7 +39,7 @@ void main() { 'is static', (game) async { await game.ready(); - final anchor = JointAnchor()..initialPosition = Vector2.zero(); + final anchor = JointAnchor(); await game.ensureAdd(anchor); expect(anchor.body.bodyType, equals(BodyType.static)); @@ -51,7 +51,7 @@ void main() { flameTester.test( 'has none', (game) async { - final anchor = JointAnchor()..initialPosition = Vector2.zero(); + final anchor = JointAnchor(); await game.ensureAdd(anchor); expect(anchor.body.fixtures, isEmpty); diff --git a/test/game/components/pathway_test.dart b/test/game/components/pathway_test.dart index dff87ba2..07d26636 100644 --- a/test/game/components/pathway_test.dart +++ b/test/game/components/pathway_test.dart @@ -23,7 +23,7 @@ void main() { start: Vector2(10, 10), end: Vector2(20, 20), width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(game.contains(pathway), isTrue); @@ -46,7 +46,7 @@ void main() { start: Vector2(10, 10), end: Vector2(20, 20), width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(game.contains(pathway), isTrue); @@ -64,7 +64,7 @@ void main() { start: Vector2(10, 10), end: Vector2(20, 20), width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(game.contains(pathway), isTrue); @@ -97,7 +97,7 @@ void main() { start: Vector2(10, 10), end: Vector2(20, 20), width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(pathway.body.bodyType, equals(BodyType.static)); @@ -115,7 +115,7 @@ void main() { end: Vector2(20, 20), width: width, singleWall: true, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(pathway.body.fixtures.length, 1); @@ -133,7 +133,7 @@ void main() { start: Vector2(10, 10), end: Vector2(20, 20), width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(pathway.body.fixtures.length, 2); @@ -156,7 +156,7 @@ void main() { width: width, radius: 100, angle: math.pi / 2, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(game.contains(pathway), isTrue); @@ -191,7 +191,7 @@ void main() { width: width, radius: 100, angle: math.pi / 2, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(pathway.body.bodyType, equals(BodyType.static)); @@ -215,7 +215,7 @@ void main() { final pathway = Pathway.bezierCurve( controlPoints: controlPoints, width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(game.contains(pathway), isTrue); @@ -246,7 +246,7 @@ void main() { final pathway = Pathway.bezierCurve( controlPoints: controlPoints, width: width, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(pathway); expect(pathway.body.bodyType, equals(BodyType.static)); diff --git a/test/game/components/plunger_test.dart b/test/game/components/plunger_test.dart index f0b4abfe..af002845 100644 --- a/test/game/components/plunger_test.dart +++ b/test/game/components/plunger_test.dart @@ -24,7 +24,7 @@ void main() { await game.ready(); final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); expect(game.contains(plunger), isTrue); @@ -51,7 +51,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); expect(plunger.body.bodyType, equals(BodyType.dynamic)); @@ -63,7 +63,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); expect(plunger.body.gravityScale, isZero); @@ -77,7 +77,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); expect(plunger.body.fixtures[0], isA()); @@ -89,7 +89,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); final fixture = plunger.body.fixtures[0]; @@ -102,7 +102,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); final fixture = plunger.body.fixtures[0]; @@ -123,7 +123,7 @@ void main() { setUp(() { plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); }); testRawKeyUpEvents(keys, (event) { @@ -187,7 +187,7 @@ void main() { (game) async { final plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(plunger); final plungerAnchor = PlungerAnchor(plunger: plunger); @@ -214,7 +214,7 @@ void main() { ); plunger = Plunger( compressionDistance: compressionDistance, - )..initialPosition = Vector2.zero(); + ); }); final flameTester = flameBlocTester(gameBloc: () => gameBloc); diff --git a/test/game/components/round_bumper_test.dart b/test/game/components/round_bumper_test.dart index ac2d56b7..529b70ca 100644 --- a/test/game/components/round_bumper_test.dart +++ b/test/game/components/round_bumper_test.dart @@ -20,7 +20,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); expect(game.contains(roundBumper), isTrue); @@ -33,7 +33,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); expect(roundBumper.points, equals(points)); @@ -62,7 +62,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); expect(roundBumper.body.bodyType, equals(BodyType.static)); @@ -77,7 +77,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); expect(roundBumper.body.fixtures[0], isA()); @@ -90,7 +90,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); final fixture = roundBumper.body.fixtures[0]; @@ -104,7 +104,7 @@ void main() { final roundBumper = RoundBumper( radius: radius, points: points, - )..initialPosition = Vector2.zero(); + ); await game.ensureAdd(roundBumper); final fixture = roundBumper.body.fixtures[0]; diff --git a/test/game/components/sling_shot_test.dart b/test/game/components/sling_shot_test.dart index 73a4fc61..179c2bb3 100644 --- a/test/game/components/sling_shot_test.dart +++ b/test/game/components/sling_shot_test.dart @@ -14,7 +14,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); expect(game.contains(slingShot), isTrue); @@ -40,7 +40,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); expect(slingShot.body.bodyType, equals(BodyType.static)); @@ -54,7 +54,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); expect(slingShot.body.fixtures[0], isA()); @@ -66,7 +66,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); final fixture = slingShot.body.fixtures[0]; @@ -81,10 +81,10 @@ void main() { (game) async { final leftSlingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); final rightSlingShot = SlingShot( side: BoardSide.right, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(leftSlingShot); await game.ensureAdd(rightSlingShot); @@ -103,7 +103,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); final fixture = slingShot.body.fixtures[0]; @@ -118,7 +118,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); expect(slingShot.body.fixtures[1], isA()); @@ -130,7 +130,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); final fixture = slingShot.body.fixtures[1]; @@ -143,7 +143,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); final fixture = slingShot.body.fixtures[1]; @@ -156,7 +156,7 @@ void main() { (game) async { final slingShot = SlingShot( side: BoardSide.left, - )..initialPosition = Vector2(0, 0); + ); await game.ensureAdd(slingShot); final fixture = slingShot.body.fixtures[1];