diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java index ab816f5..c8a95a6 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java @@ -64,6 +64,7 @@ public class Game implements Serializable { @Transient private Deck deck; + /** * Constructeur par défaut */ @@ -83,6 +84,7 @@ public class Game implements Serializable { if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){ throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor); } + this.difficulty = difficulty; this.nbRounds = nbRounds; this.nbColors = nbColors; @@ -106,6 +108,7 @@ public class Game implements Serializable { if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){ throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor); } + this.id = id; this.createdAt = createdAt; this.difficulty = difficulty; diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java index b13580c..0ec9274 100644 --- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java +++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java @@ -19,16 +19,16 @@ class GameTest { void beforeEach() { fixture = new Game[]{ new Game(new BigDecimal(1), new Date(2024 - 1900, 5, 6), Game.Difficulty.EASY, 17, 3, 6, new ArrayList<>() {{ - add(new Player(new BigDecimal(1), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(1), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}), new Game(new BigDecimal(2), new Date(2023 - 1900, 7, 9), Game.Difficulty.HARD, 28, 4, 13, new ArrayList<>() {{ - add(new Player(new BigDecimal(2), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(3), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(2), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}), new Game(new BigDecimal(3), new Date(2022 - 1900, 11, 12), Game.Difficulty.EASY, 16, 2, 9, new ArrayList<>() {{ - add(new Player(new BigDecimal(4), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(5), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(6), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(4), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(5), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(6), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}), }; } @@ -186,16 +186,16 @@ class GameTest { void test_getPlayers() { final HashMap> TESTS = new HashMap<>() {{ put(fixture[0], new ArrayList<>() {{ - add(new Player(new BigDecimal(1), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(1), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); put(fixture[1], new ArrayList<>() {{ - add(new Player(new BigDecimal(2), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(3), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(2), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); put(fixture[2], new ArrayList<>() {{ - add(new Player(new BigDecimal(4), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(5), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(6), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(4), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(5), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(6), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); }}; @@ -208,17 +208,17 @@ class GameTest { void test_setPlayers() { Game game = fixture[0]; assertEquals(new ArrayList<>() {{ - add(new Player(new BigDecimal(1), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(1), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}, game.getPlayers()); // Add players ArrayList players = new ArrayList<>() {{ - add(new Player(new BigDecimal(1), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(2), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(3), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(4), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(5), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(6), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(1), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(2), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(4), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(5), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(6), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}; game.setPlayers(players); assertEquals(players, game.getPlayers()); @@ -242,7 +242,7 @@ class GameTest { Game game = fixture[0]; assertEquals(1, game.getPlayers().size()); - Player player = new Player(new BigDecimal(2), new Game(), new User(), 10, true, 5, 5, 5); + Player player = new Player(new BigDecimal(2), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5); // Add a player game.addPlayer(player); @@ -269,16 +269,16 @@ class GameTest { void test_sortPlayersByScore() { final HashMap> TESTS = new HashMap<>() {{ put(fixture[0], new ArrayList<>() {{ - add(new Player(new BigDecimal(1), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(1), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); put(fixture[1], new ArrayList<>() {{ - add(new Player(new BigDecimal(2), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(3), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(2), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); put(fixture[2], new ArrayList<>() {{ - add(new Player(new BigDecimal(4), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(5), new Game(), new User(), 10, true, 5, 5, 5)); - add(new Player(new BigDecimal(6), new Game(), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(4), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(5), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); + add(new Player(new BigDecimal(6), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5)); }}); }};