kmitresse/cards-rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-07-09 13:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(DevWeb): GameTest.java

Browse Source
This commit is contained in:
Lucàs
2024-03-28 16:35:49 +01:00
parent c19e18d817
commit a46a1a0f1a
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Game.java
+3
View File
@@ -64,6 +64,7 @@ public class Game implements Serializable {
@Transient @Transient
private Deck deck; private Deck deck;
/** /**
* Constructeur par défaut * Constructeur par défaut
*/ */
@@ -83,6 +84,7 @@ public class Game implements Serializable {
if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){ if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){
throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor); throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor);
} }
this.difficulty = difficulty; this.difficulty = difficulty;
this.nbRounds = nbRounds; this.nbRounds = nbRounds;
this.nbColors = nbColors; this.nbColors = nbColors;
@@ -106,6 +108,7 @@ public class Game implements Serializable {
if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){ if (isValidNumberRound(nbRounds, nbColors, nbValuesPerColor)){
throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor); throw new IllegalArgumentException("Le nombre de tours doit être compris entre 1 et " + nbColors * nbValuesPerColor);
} }
this.id = id; this.id = id;
this.createdAt = createdAt; this.createdAt = createdAt;
this.difficulty = difficulty; this.difficulty = difficulty;
S2/DevWeb/Projet/src/test/java/uppa/project/pojo/GameTest.java
+26 -26
View File
@@ -19,16 +19,16 @@ class GameTest {
void beforeEach() { void beforeEach() {
fixture = new Game[]{ fixture = new Game[]{
new Game(new BigDecimal(1), new Date(2024 - 1900, 5, 6), Game.Difficulty.EASY, 17, 3, 6, new ArrayList<>() {{ 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<>() {{ 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(2), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(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<>() {{ 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(4), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(5), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(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() { void test_getPlayers() {
final HashMap<Game, ArrayList<Player>> TESTS = new HashMap<>() {{ final HashMap<Game, ArrayList<Player>> TESTS = new HashMap<>() {{
put(fixture[0], new ArrayList<>() {{ 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<>() {{ 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(2), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5));
}}); }});
put(fixture[2], new ArrayList<>() {{ 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(4), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(5), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(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() { void test_setPlayers() {
Game game = fixture[0]; Game game = fixture[0];
assertEquals(new ArrayList<>() {{ 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()); }}, game.getPlayers());
// Add players // Add players
ArrayList<Player> players = new ArrayList<>() {{ ArrayList<Player> players = 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));
add(new Player(new BigDecimal(2), 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(), 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(), 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(), 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(), 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); game.setPlayers(players);
assertEquals(players, game.getPlayers()); assertEquals(players, game.getPlayers());
@@ -242,7 +242,7 @@ class GameTest {
Game game = fixture[0]; Game game = fixture[0];
assertEquals(1, game.getPlayers().size()); 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 // Add a player
game.addPlayer(player); game.addPlayer(player);
@@ -269,16 +269,16 @@ class GameTest {
void test_sortPlayersByScore() { void test_sortPlayersByScore() {
final HashMap<Game, ArrayList<Player>> TESTS = new HashMap<>() {{ final HashMap<Game, ArrayList<Player>> TESTS = new HashMap<>() {{
put(fixture[0], new ArrayList<>() {{ 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<>() {{ 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(2), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(3), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5));
}}); }});
put(fixture[2], new ArrayList<>() {{ 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(4), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(5), new Game(Game.Difficulty.EASY, 17, 3, 6), 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(6), new Game(Game.Difficulty.EASY, 17, 3, 6), new User(), 10, true, 5, 5, 5));
}}); }});
}}; }};