From aa607df504c953c831caf92ec63c2280d944e592 Mon Sep 17 00:00:00 2001 From: kmitresse Date: Wed, 27 Mar 2024 09:08:44 +0100 Subject: [PATCH] feat: dev-web - implements tests --- .../src/main/java/uppa/project/Main.java | 14 +- .../src/main/java/uppa/project/pojo/Deck.java | 18 ++ .../src/main/java/uppa/project/pojo/Game.java | 21 +- .../main/java/uppa/project/pojo/Player.java | 12 +- .../src/main/java/uppa/project/pojo/User.java | 11 +- .../test/java/uppa/project/pojo/GameTest.java | 139 +++++++-- .../java/uppa/project/pojo/PlayerTest.java | 263 +++++++++++------- .../pojo/RecoveryPasswordTokenTest.java | 28 +- 8 files changed, 350 insertions(+), 156 deletions(-) diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java b/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java index d454d8a..19f6637 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/Main.java @@ -15,13 +15,13 @@ public class Main { // DAO daoJpaGame = jpaDaoFactory.getDAOGame(); // DAO daoJpaPlayer = jpaDaoFactory.getDAOPlayer(); - // Contenu de la BD au début - User[] users = daoJpaUser.findAll(); - for (User u : users) { - System.out.println(u.toString()); - } - System.out.println(); - +// // Contenu de la BD au début +// User[] users = daoJpaUser.findAll(); +// for (User u : users) { +// System.out.println(u.toString()); +// } +// System.out.println(); +// // Ajout d'User : Calendar cal1 = Calendar.getInstance(); cal1.set(1996, Calendar.FEBRUARY, 20); diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java index ceaf14f..693dc8f 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Deck.java @@ -93,4 +93,22 @@ public class Deck { Collections.shuffle(cards); } + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Deck deck = (Deck) o; + boolean sameSize = cards.size() == deck.cards.size(); + int counter = 0; + for (int i = 0; i < cards.size(); i++) { + for (int j = 0; j < deck.cards.size(); j++) { + if (cards.get(i).getColor() == deck.cards.get(j).getColor() + && cards.get(i).getValue() == deck.cards.get(j).getValue()) { + counter++; + continue; + } + } + } + return sameSize && counter == cards.size(); + } + } 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 bfb162b..47b2c4d 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 @@ -257,12 +257,28 @@ public class Game implements Serializable { * Tri des joueurs de la partie par score */ public void sortPlayersByScore() { - this.players.stream().sorted((p1, p2) -> p1.getScore() - p2.getScore()); + for (int i = 0; i < players.size(); i++) { + for (int j = i + 1; j < players.size(); j++) { + if (players.get(i).getScore() < players.get(j).getScore()) { + Player temp = players.get(i); + players.set(i, players.get(j)); + players.set(j, temp); + } + } + } } @Override public String toString() { - return String.format("Game{id=%s, createdAt=%s, players=%s}", id.toString(), createdAt, players); + return String.format("Game{id=%s, createdAt=%s}", id.toString(), createdAt.toString()); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Game)) return false; + Game game = (Game) o; + return getNbRounds() == game.getNbRounds() && getNbColors() == game.getNbColors() && getNbValuesPerColor() == game.getNbValuesPerColor() && Objects.equals(getId(), game.getId()) && Objects.equals(getCreatedAt(), game.getCreatedAt()) && getDifficulty() == game.getDifficulty() && Objects.equals(getPlayers(), game.getPlayers()) && Objects.equals(getDeck(), game.getDeck()); } /** @@ -270,3 +286,4 @@ public class Game implements Serializable { */ public enum Difficulty {EASY, HARD} } + diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java index 561b5ca..080ac53 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java @@ -92,7 +92,8 @@ public class Player implements Serializable { * @param rightClickCount le nombre de clics corrects * @param rapidClickCount le nombre de clics rapides */ - public Player(Game game, User user, int score, boolean winner, int clickCount, int rightClickCount, int rapidClickCount) { + public Player(BigDecimal id, Game game, User user, int score, boolean winner, int clickCount, int rightClickCount, int rapidClickCount) { + this.id = id; this.game = game; this.user = user; this.score = score; @@ -262,8 +263,17 @@ public class Player implements Serializable { public ArrayList getDeck() { return deck.getCards(); } + @Override public String toString() { return String.format("Player{id=%s, game=%s, user=%s, score=%d, winner=%b, clickCount=%d, rightClickCount=%d, rapidClickCount=%d}", id.toString(), game.toString(), user.toString(), score, winner, clickCount, rightClickCount, rapidClickCount); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Player)) return false; + Player player = (Player) o; + return getScore() == player.getScore() && isWinner() == player.isWinner() && getClickCount() == player.getClickCount() && getRightClickCount() == player.getRightClickCount() && getRapidClickCount() == player.getRapidClickCount() && Objects.equals(id, player.id) && Objects.equals(getGame(), player.getGame()) && Objects.equals(getUser(), player.getUser()); + } } diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java index d80ade4..67d5ab4 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/pojo/User.java @@ -345,7 +345,16 @@ public class User implements Serializable { @Override public String toString() { - return String.format("User{id=%s, username='%s', birth=%s, gender=%s}", id.toString(), username, birth.toString(), gender.toString()); + return String.format("User{username='%s', birth=%s, gender=%s}", username, birth.toString(), gender.toString()); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof User)) return false; + User user = (User) o; + return + Objects.equals(getId(), user.getId()) && Objects.equals(getUsername(), user.getUsername()) && Objects.equals(getEmail(), user.getEmail()) && Objects.equals(getPassword(), user.getPassword()) && Objects.equals(getBirth(), user.getBirth()) && getGender() == user.getGender(); } /** 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 331bf70..1bdfee1 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 @@ -3,6 +3,7 @@ package uppa.project.pojo; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +20,16 @@ class GameTest { new Game(new BigDecimal(2), new Date(2024,3,26), Game.Difficulty.HARD, 52, 4,13, new ArrayList()), new Game(new BigDecimal(3), new Date(2023,9,18), Game.Difficulty.EASY, 5, 2,10, new ArrayList()), }; + Player[] players = new Player[]{ + new Player(new BigDecimal(1), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + new Player(new BigDecimal(2), FIXTURE[1], new User("username2", "email2", "password2", new Date(1996, 4, 7), User.Gender.MALE),34, false, 7,7,7), + new Player(new BigDecimal(3), FIXTURE[2], new User("username3", "email3", "password3", new Date(1996, 4, 7), User.Gender.MALE),22, false, 7,7,7), + new Player(new BigDecimal(4), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + }; + FIXTURE[0].addPlayer(players[0]); + FIXTURE[0].addPlayer(players[3]); + FIXTURE[1].addPlayer(players[1]); + FIXTURE[2].addPlayer(players[2]); } @Test @@ -85,7 +96,7 @@ class GameTest { @Test void get_Id() { for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getId(), new BigDecimal(i + 1)); + assertEquals(new BigDecimal(i + 1), FIXTURE[i].getId()); } } @@ -95,7 +106,7 @@ class GameTest { new Date(2024,3,26), new Date(2023,9,18)}; for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getCreatedAt(), dates[i]); + assertEquals(dates[i], FIXTURE[i].getCreatedAt()); } } @@ -106,7 +117,7 @@ class GameTest { Game.Difficulty.HARD, Game.Difficulty.EASY }; for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getDifficulty(), difficulties[i]); + assertEquals(difficulties[i], FIXTURE[i].getDifficulty()); } } @@ -118,9 +129,9 @@ class GameTest { Game.Difficulty.EASY }; for (int i = 0; i < FIXTURE.length; i++) { FIXTURE[i].setDifficulty(Game.Difficulty.HARD); - assertEquals(FIXTURE[i].getDifficulty(), Game.Difficulty.HARD); + assertEquals(Game.Difficulty.HARD, FIXTURE[i].getDifficulty()); FIXTURE[i].setDifficulty(difficulties[i]); - assertEquals(FIXTURE[i].getDifficulty(), difficulties[i]); + assertEquals(difficulties[i], FIXTURE[i].getDifficulty()); } } @@ -128,7 +139,7 @@ class GameTest { void get_nb_Rounds() { int[] nbRounds = new int[]{17, 52, 5}; for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getNbRounds(), nbRounds[i]); + assertEquals(nbRounds[i], FIXTURE[i].getNbRounds()); } } @@ -137,9 +148,9 @@ class GameTest { int[] nbRounds = new int[]{17, 52, 5}; for (int i = 0; i < FIXTURE.length; i++) { FIXTURE[i].setNbRounds(10); - assertEquals(FIXTURE[i].getNbRounds(), 10); + assertEquals(10, FIXTURE[i].getNbRounds()); FIXTURE[i].setNbRounds(nbRounds[i]); - assertEquals(FIXTURE[i].getNbRounds(), nbRounds[i]); + assertEquals(nbRounds[i], FIXTURE[i].getNbRounds()); } } @@ -147,7 +158,7 @@ class GameTest { void get_nb_Colors() { int[] nbColors = new int[]{3, 4, 2}; for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getNbColors(), nbColors[i]); + assertEquals(nbColors[i], FIXTURE[i].getNbColors()); } } @@ -155,10 +166,10 @@ class GameTest { void set_nb_Colors() { int[] nbColors = new int[]{3, 4, 2}; for (int i = 0; i < FIXTURE.length; i++) { - FIXTURE[i].setNbColors(5); - assertEquals(FIXTURE[i].getNbColors(), 5); + FIXTURE[i].setNbColors(1); + assertEquals(1, FIXTURE[i].getNbColors()); FIXTURE[i].setNbColors(nbColors[i]); - assertEquals(FIXTURE[i].getNbColors(), nbColors[i]); + assertEquals(nbColors[i], FIXTURE[i].getNbColors()); } } @@ -166,7 +177,7 @@ class GameTest { void getnbValuesPerColor() { int[] nbValuesPerColor = new int[]{6, 13, 10}; for (int i = 0; i < FIXTURE.length; i++) { - assertEquals(FIXTURE[i].getNbValuesPerColor(), nbValuesPerColor[i]); + assertEquals(nbValuesPerColor[i], FIXTURE[i].getNbValuesPerColor()); } } @@ -175,46 +186,118 @@ class GameTest { int[] nbValuesPerColor = new int[]{6, 13, 10}; for (int i = 0; i < FIXTURE.length; i++) { FIXTURE[i].setNbValuesPerColor(8); - assertEquals(FIXTURE[i].getNbValuesPerColor(), 8); + assertEquals(8,FIXTURE[i].getNbValuesPerColor()); FIXTURE[i].setNbValuesPerColor(nbValuesPerColor[i]); - assertEquals(FIXTURE[i].getNbValuesPerColor(), nbValuesPerColor[i]); + assertEquals(nbValuesPerColor[i], FIXTURE[i].getNbValuesPerColor()); } } @Test - void getPlayers() { - // TODO Implement this method - fail(); + void get_Players_return_rigth_number_of_players() { + Player[] players = new Player[]{ + new Player(FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE)), + new Player(FIXTURE[1], new User("username2", "email2", "password2", new Date(1996, 4, 7), User.Gender.MALE)), + new Player(FIXTURE[2], new User("username3", "email3", "password3", new Date(1996, 4, 7), User.Gender.MALE)), + new Player(FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE)), + }; + assertEquals(2, FIXTURE[0].getPlayers().size()); + assertEquals(1, FIXTURE[1].getPlayers().size()); + assertEquals(1, FIXTURE[2].getPlayers().size()); } @Test + void get_players_return_the_right_players() { + Player[] players = new Player[]{ + new Player(new BigDecimal(1), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + new Player(new BigDecimal(2), FIXTURE[1], new User("username2", "email2", "password2", new Date(1996, 4, 7), User.Gender.MALE),34, false, 7,7,7), + new Player(new BigDecimal(3), FIXTURE[2], new User("username3", "email3", "password3", new Date(1996, 4, 7), User.Gender.MALE),22, false, 7,7,7), + new Player(new BigDecimal(4), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + }; + assertEquals(players[0], FIXTURE[0].getPlayers().get(0)); + assertEquals(players[3], FIXTURE[0].getPlayers().get(1)); + assertEquals(players[1], FIXTURE[1].getPlayers().get(0)); + assertEquals(players[2], FIXTURE[2].getPlayers().get(0)); + } + @Test void setPlayers() { - // TODO Implement this method - fail(); + Player[] players = new Player[]{ + new Player(new BigDecimal(5), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + new Player(new BigDecimal(6), FIXTURE[1], new User("username2", "email2", "password2", new Date(1996, 4, 7), User.Gender.MALE),34, false, 7,7,7), + new Player(new BigDecimal(7), FIXTURE[2], new User("username3", "email3", "password3", new Date(1996, 4, 7), User.Gender.MALE),22, false, 7,7,7), + new Player(new BigDecimal(8), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + }; + ArrayList newPlayers1 = new ArrayList(); + newPlayers1.add(players[0]); + newPlayers1.add(players[3]); + ArrayList newPlayers2 = new ArrayList(); + newPlayers2.add(players[1]); + ArrayList newPlayers3 = new ArrayList(); + newPlayers3.add(players[2]); + + FIXTURE[0].setPlayers(newPlayers1); + FIXTURE[1].setPlayers(newPlayers2); + FIXTURE[2].setPlayers(newPlayers3); + assertEquals(players[0], FIXTURE[0].getPlayers().get(0)); + assertEquals(players[3], FIXTURE[0].getPlayers().get(1)); + assertEquals(players[1], FIXTURE[1].getPlayers().get(0)); + assertEquals(players[2], FIXTURE[2].getPlayers().get(0)); } @Test void getNbPlayers() { - // TODO Implement this method - fail(); + int[] nbPlayers = new int[]{2, 1, 1}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(nbPlayers[i], FIXTURE[i].getNbPlayers()); + } } @Test void addPlayer() { - // TODO Implement this method - fail(); + Player player1 = new Player(new BigDecimal(5), FIXTURE[0], new User("username5", "email5", "password5", new Date(1996, 4, 7), User.Gender.MALE),41, true, 7,7,7); + Player player2 = new Player(new BigDecimal(6), FIXTURE[0], new User("username6", "email6", "password6", new Date(1996, 4, 7), User.Gender.MALE),41, true, 7,7,7); + FIXTURE[0].addPlayer(player1); + assertEquals(FIXTURE[0].getPlayers().size(), 3); + FIXTURE[0].addPlayer(player2); + assertEquals(FIXTURE[0].getPlayers().size(), 4); + Player[] expected = new Player[]{ + new Player(new BigDecimal(1), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + new Player(new BigDecimal(4), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + player1, + player2 + }; + assertEquals(expected[0], FIXTURE[0].getPlayers().get(0)); + assertEquals(expected[1], FIXTURE[0].getPlayers().get(1)); + assertEquals(expected[2], FIXTURE[0].getPlayers().get(2)); + assertEquals(expected[3], FIXTURE[0].getPlayers().get(3)); } @Test void getDeck() { - // TODO Implement this method - fail(); + } @Test void sortPlayersByScore() { - // TODO Implement this method - fail(); + + Player[] initial = new Player[]{ + new Player(new BigDecimal(1), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + new Player(new BigDecimal(4), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + }; + ArrayList players = FIXTURE[0].getPlayers(); + for (int i = 0; i < players.size(); i++) { + assertEquals(initial[i], players.get(i)); + } + System.out.println("expected"); + Player[] expected = new Player[]{ + new Player(new BigDecimal(4), FIXTURE[0], new User("username4", "email4", "password4", new Date(1996, 4, 7), User.Gender.MALE),68, true, 7,7,7), + new Player(new BigDecimal(1), FIXTURE[0], new User("username1", "email1", "password1", new Date(1996, 4, 7), User.Gender.MALE),5, true, 7,7,7), + }; + FIXTURE[0].sortPlayersByScore(); + players = FIXTURE[0].getPlayers(); + for (int i = 0; i < players.size(); i++) { + System.out.println(i); + assertEquals(expected[i], players.get(i)); + } } @Test diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java index d848542..2640ca3 100644 --- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java +++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/PlayerTest.java @@ -1,145 +1,202 @@ package uppa.project.pojo; +import java.math.BigDecimal; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; class PlayerTest { + static Player[] FIXTURE; + + @BeforeAll + static void setUp() { + FIXTURE = new Player[] { + new Player(new BigDecimal(0), new Game(), new User(), 15, false, 20, 15, 6 ), + new Player(new BigDecimal(0), new Game(), new User(), 13, false, 15, 13, 8), + new Player(new BigDecimal(0), new Game(), new User(), 8, false, 10, 8, 2) + }; + } + @Test - void testHashCode() { + void test_hash_code() { // TODO Implement this method fail(); } @Test - void getGame() { + void get_game() { // TODO Implement this method fail(); } @Test - void setGame() { + void set_game() { // TODO Implement this method fail(); } @Test - void getUser() { + void get_user() { // TODO Implement this method fail(); } @Test - void setUser() { + void set_user() { // TODO Implement this method fail(); } @Test - void getScore() { + void get_score() { + int[] expected = new int[]{15, 13, 8}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getScore()); + } + } + + @Test + void set_score() { + int[] expected = new int[]{20, 9, 1}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].setScore(expected[i]); + assertEquals(expected[i], FIXTURE[i].getScore()); + } + } + + @Test + void update_score() { + int[] expected1 = new int[]{16, 14, 9}; + int[] expected2 = new int[]{11, 9, 4}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].updateScore(1); + assertEquals(expected1[i], FIXTURE[i].getScore()); + FIXTURE[i].updateScore(-5); + assertEquals(expected2[i], FIXTURE[i].getScore()); + } + } + + @Test + void is_winner() { + boolean[] expected = new boolean[]{false, false, false}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].isWinner()); + } + } + + @Test + void set_winner() { + boolean[] expected = new boolean[]{true, true, true}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].setWinner(); + assertEquals(expected[i], FIXTURE[i].isWinner()); + } + } + + @Test + void get_click_count() { + int[] expected = new int[]{20, 15, 10}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getClickCount()); + } + } + + @Test + void set_click_count() { + int[] expected = new int[]{25, 20, 15}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].setClickCount(expected[i]); + assertEquals(expected[i], FIXTURE[i].getClickCount()); + } + } + + @Test + void increment_click_count() { + int[] expected = new int[]{21, 16, 11}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].incrementClickCount(); + assertEquals(expected[i], FIXTURE[i].getClickCount()); + } + } + + @Test + void get_right_click_count() { + int[] expected = new int[]{15, 13, 8}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getRightClickCount()); + } + } + + @Test + void set_right_click_count() { + int[] expected = new int[]{20, 15, 10}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].setRightClickCount(expected[i]); + assertEquals(expected[i], FIXTURE[i].getRightClickCount()); + } + } + + @Test + void increment_right_click_count() { + int[] expected = new int[]{16, 14, 9}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].incrementRightClickCount(); + assertEquals(expected[i], FIXTURE[i].getRightClickCount()); + } + } + + @Test + void get_ratio_right_click() { + double[] expected = new double[]{0.75*100, 0.8666666666666667*100, 0.8*100}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getRatioRightClick()); + } + } + + @Test + void get_rapid_click_count() { + int[] expected = new int[]{6, 8, 2}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getRapidClickCount()); + } + } + + @Test + void set_rapid_click_count() { + int[] expected = new int[]{10, 15, 20}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].setRapidClickCount(expected[i]); + assertEquals(expected[i], FIXTURE[i].getRapidClickCount()); + } + } + + @Test + void increment_rapid_click_count() { + int[] expected = new int[]{7, 9, 3}; + for (int i = 0; i < FIXTURE.length; i++) { + FIXTURE[i].incrementRapidClickCount(); + assertEquals(expected[i], FIXTURE[i].getRapidClickCount()); + } + } + + @Test + void get_ratio_rapid_click() { + double[] expected = new double[]{0.3*100, 0.5333333333333333*100, 0.2*100}; + for (int i = 0; i < FIXTURE.length; i++) { + assertEquals(expected[i], FIXTURE[i].getRatioRapidClick()); + } + } + + @Test + void get_deck() { // TODO Implement this method fail(); } @Test - void setScore() { - // TODO Implement this method - fail(); - } - - @Test - void updateScore() { - // TODO Implement this method - fail(); - } - - @Test - void isWinner() { - // TODO Implement this method - fail(); - } - - @Test - void setWinner() { - // TODO Implement this method - fail(); - } - - @Test - void getClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void setClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void incrementClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void getRightClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void setRightClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void incrementRightClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void getRatioRightClick() { - // TODO Implement this method - fail(); - } - - @Test - void getRapidClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void setRapidClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void incrementRapidClickCount() { - // TODO Implement this method - fail(); - } - - @Test - void getRatioRapidClick() { - // TODO Implement this method - fail(); - } - - @Test - void getDeck() { - // TODO Implement this method - fail(); - } - - @Test - void testToString() { + void test_to_string() { // TODO Implement this method fail(); } diff --git a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java index acf7f78..5005984 100644 --- a/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java +++ b/S2/DevWeb/Projet/src/test/java/uppa/project/pojo/RecoveryPasswordTokenTest.java @@ -20,21 +20,21 @@ class RecoveryPasswordTokenTest { }; } @Test - void getId() { + void get_id() { assertEquals(1, FIXTURE[0].getId()); assertEquals(2, FIXTURE[1].getId()); assertEquals(3, FIXTURE[2].getId()); } @Test - void getToken() { + void get_token() { assertEquals("token1", FIXTURE[0].getToken()); assertEquals("token2", FIXTURE[1].getToken()); assertEquals("token3", FIXTURE[2].getToken()); } @Test - void setToken() { + void set_token() { String[] expected = new String[]{"token1", "token2", "token3"}; for (int i = 0; i < FIXTURE.length; i++) { FIXTURE[i].setToken(expected[i]); @@ -43,7 +43,7 @@ class RecoveryPasswordTokenTest { } @Test - void getUser() { + void get_user() { User[] expected = new User[]{ new User(new BigDecimal(1), "username1", "password1", "email1", new Date(1996, 1, 4), User.Gender.MALE, new ArrayList()), new User(new BigDecimal(2), "username2", "password2", "email2", new Date(1996, 2, 5), User.Gender.FEMALE, new ArrayList()), @@ -60,7 +60,7 @@ class RecoveryPasswordTokenTest { } @Test - void setUser() { + void set_user() { User[] expected = new User[]{ new User(new BigDecimal(4), "username4", "password4", "email4", new Date(1996, 4, 7), User.Gender.MALE, new ArrayList()), new User(new BigDecimal(5), "username5", "password5", "email5", new Date(1996, 5, 8), User.Gender.FEMALE, new ArrayList()), @@ -78,7 +78,7 @@ class RecoveryPasswordTokenTest { } @Test - void getExpiresAt() { + void get_expires_at() { Date[] expected = new Date[]{ new Date(2024, 1, 2), new Date(2024, 3, 4), @@ -89,7 +89,7 @@ class RecoveryPasswordTokenTest { } @Test - void setExpiresAt() { + void set_expires_at() { Date[] expected = new Date[]{ new Date(2024, 2, 3), new Date(2024, 4, 5), @@ -101,13 +101,7 @@ class RecoveryPasswordTokenTest { } @Test - void to_string_return_the_rigth_format() { - // TODO Implement this method - fail(); - } - - @Test - void getExpirationDate() { + void get_expiration_date() { Date[] expected = new Date[]{ new Date(2024, 1, 2), new Date(2024, 3, 4), @@ -116,4 +110,10 @@ class RecoveryPasswordTokenTest { assertEquals(expected[i], FIXTURE[i].getExpirationDate()); } } + + @Test + void to_string_return_the_rigth_format() { + // TODO Implement this method + fail(); + } }