From 3c83867d4883842809a901af8864d72a5651f444 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Tue, 21 Mar 2023 21:11:58 +0100 Subject: [PATCH] fix code smells --- .../lib/model/StubManager/StubData.dart | 122 ++++++------------ Sources/bowlin_project/test/round_test.dart | 22 ++-- 2 files changed, 56 insertions(+), 88 deletions(-) diff --git a/Sources/bowlin_project/lib/model/StubManager/StubData.dart b/Sources/bowlin_project/lib/model/StubManager/StubData.dart index 5bb66b8..a329600 100644 --- a/Sources/bowlin_project/lib/model/StubManager/StubData.dart +++ b/Sources/bowlin_project/lib/model/StubManager/StubData.dart @@ -9,7 +9,6 @@ import '../Round.dart'; import '../User.dart'; import '../Achievement.dart'; import '../GameDetail.dart'; -import '../Stat.dart'; import 'UserManager.dart'; import 'GameManager.dart'; @@ -39,84 +38,49 @@ class StubData extends IManager { Guest("Louison"), Guest("Arthur"), Guest("David"), - User( - 8, - "Emre", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - User( - 9, - "Dave", - "./assets/images/image_user_cyan.png", - "david.d_almeida@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("0 point"), - Achievement("Win a game") - ], - [ - User( - 21, - "Arthur", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - User( - 22, - "Louison", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - User( - 23, - "Owen", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - User( - 24, - "LULU", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - User( - 25, - "Raphael", - "./assets/images/image_user_cyan.png", - "emre.kartal@etu.uca.fr", - [ - Achievement("5 games"), - Achievement("2 strikes in a row"), - Achievement("Win a game") - ], - []), - ]) + User(8, "Emre", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + User(9, "Dave", "./assets/images/image_user_cyan.png", + "david.d_almeida@etu.uca.fr", [ + Achievement("5 games"), + Achievement("0 point"), + Achievement("Win a game") + ], [ + User(21, "Arthur", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + User(22, "Louison", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + User(23, "Owen", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + User(24, "LULU", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + User(25, "Raphael", "./assets/images/image_user_cyan.png", + "emre.kartal@etu.uca.fr", [ + Achievement("5 games"), + Achievement("2 strikes in a row"), + Achievement("Win a game") + ], []), + ]) ]; List _gameDetails = []; diff --git a/Sources/bowlin_project/test/round_test.dart b/Sources/bowlin_project/test/round_test.dart index ca46b52..134a599 100644 --- a/Sources/bowlin_project/test/round_test.dart +++ b/Sources/bowlin_project/test/round_test.dart @@ -1,13 +1,15 @@ import 'package:bowl_in/model/LastRound.dart'; import 'package:bowl_in/model/Round.dart'; -import 'package:bowl_in/model/Stat.dart'; import 'package:bowl_in/model/User.dart'; import 'package:flutter_test/flutter_test.dart'; - void main() { - test("Test Round", (){ - User u = User(1, "Louison" , "Sources/bowlin_project/assets/images/image_user_pink.png", "loparant@gmail.com", [], []); + test("Test Round", () { + User u = User( + 1, + "Louison", + "Sources/bowlin_project/assets/images/image_user_pink.png", + "loparant@gmail.com", [], []); Round r = Round(null, null, null, u, 1); expect(r.getMaxPinsThisShot(), 10); @@ -18,7 +20,6 @@ void main() { expect(r.getMaxPinsThisShot(), 6); r.computeNext(6); - expect(r.isSpare(), true); expect(r.isSpareOrStrike(), true); expect(r.isStrike(), false); @@ -39,8 +40,12 @@ void main() { expect(r3.getPinsKnockedDown(), 7); }); - test("Test LastRound", (){ - User u = User(1, "Louison" , "Sources/bowlin_project/assets/images/image_user_pink.png", "loparant@gmail.com", [], []); + test("Test LastRound", () { + User u = User( + 1, + "Louison", + "Sources/bowlin_project/assets/images/image_user_pink.png", + "loparant@gmail.com", [], []); LastRound r = LastRound(null, null, null, u, 1, null); expect(r.getMaxPinsThisShot(), 10); @@ -75,6 +80,5 @@ void main() { expect(r3.getPinsKnockedDown(), 20); expect(r3.getNbSpares(), 1); expect(r3.getNbStrike(), 1); - }); -} \ No newline at end of file +}