test: test sur les ajout de l'égalité

Reviewed-on: pierront/rock-paper-scissors#6

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java

@@ -3,13 +3,21 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
 public enum Move {
     ROCK,
     PAPER,
-    SCISSORS;
+    SCISSORS,
+    WELL;
 
-    public boolean beats(Move other) {
-        return switch (this) {
+    public Result beats(Move other) {
+        if(this.equals(other)){
+            return Result.EQUAL;
+        }
+        boolean result = switch (this) {
             case ROCK -> other == SCISSORS;
-            case PAPER -> other == ROCK;
+            case PAPER -> other == ROCK || other == WELL;
             case SCISSORS -> other == PAPER;
+            case WELL -> other == ROCK || other == SCISSORS;
+
+
         };
+        return result ? Result.WIN  : Result.LOOSE;
     }
 }

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Result.java

@@ -0,0 +1,8 @@
+package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
+
+public enum Result {
+
+    WIN,
+    LOOSE,
+    EQUAL;
+}

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayer.java

@@ -9,17 +9,16 @@ import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatSa
 @DomainService
 public record RockPaperScissorsPlayer(CpuPick cpuPick, StatSave statSave) implements RockPaperScissorsPlay {
 
-    public static final String WIN = "WIN";
-    public static final String LOOSE = "LOOSE";
+
 
     @Override
     public RoundResult playRound(String name, Move move) {
+
         var cpuPicked = this.cpuPick.pick();
-        boolean beats = move.beats(cpuPicked);
-        String result = beats ? WIN : LOOSE;
-        if (result.equals(WIN)) {
+        Result beats = move.beats(cpuPicked);
+        if (beats.equals(Result.WIN)) {
             this.statSave.addWin(name);
         }
-        return new RoundResult(result, name, cpuPicked);
+        return new RoundResult(beats.toString(), name, cpuPicked);
     }
 }

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/web/StatBoardReponse.java

@@ -2,13 +2,16 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.web;
 
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatBoard;
 
+import java.util.Comparator;
 import java.util.List;
 
 public record StatBoardReponse(List<Stat> stats) {
 
-    public StatBoardReponse(StatBoard statBoard) {
-        this(statBoard.stats().entrySet().stream()
-                .map(Stat::fromMap)
-                .toList());
-    }
+  public StatBoardReponse(StatBoard statBoard) {
+    this(statBoard.stats().entrySet().stream()
+        .map(Stat::fromMap)
+        .sorted(Comparator.comparingInt(
+            stat -> -stat.wins()))
+        .toList());
+  }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/ModulithStructureTests.java

@@ -3,7 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors;
 import org.junit.jupiter.api.Test;
 import org.springframework.modulith.core.ApplicationModules;
 
-public class ModulithStructureTests {
+class ModulithStructureTests {
 
     @Test
     void verifyModularStructure() {

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java

@@ -4,6 +4,7 @@ import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.ddd.DomainService;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.ddd.Stub;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.configuration.PlayConfiguration;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.Move;
+import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.Result;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.RockPaperScissorsPlayer;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.CpuPick;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.FakeCpuPicker;
@@ -24,8 +25,6 @@ import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.stream.Stream;
 
-import static fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.RockPaperScissorsPlayer.LOOSE;
-import static fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.RockPaperScissorsPlayer.WIN;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -45,14 +44,14 @@ public class PlayControllerTest {
 
     public static Stream<Arguments> scenario() {
         return Stream.of(
-                Arguments.of(Move.ROCK, Move.SCISSORS, WIN),
-                Arguments.of(Move.ROCK, Move.PAPER, LOOSE)
+                Arguments.of(Move.ROCK, Move.SCISSORS, Result.WIN),
+                Arguments.of(Move.ROCK, Move.PAPER, Result.LOOSE)
         );
     }
 
     @ParameterizedTest
     @MethodSource("scenario")
-    void shouldReturnWinResult_whenPlayerPlaysRock(Move playerMove, Move cpuMove, String expectedResult) throws Exception {
+    void shouldReturnWinResult_whenPlayerPlaysRock(Move playerMove, Move cpuMove, Result expectedResult) throws Exception {
         FakeCpuConfiguration.cpuPick.setNextMove(cpuMove);
         mockMvc.perform(
                         post(PLAY_ENDPOINT)
@@ -64,7 +63,7 @@ public class PlayControllerTest {
                                         """, playerMove))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE)
                 ).andExpect(status().isOk())
-                .andExpect(jsonPath("$.result").value(expectedResult))
+                .andExpect(jsonPath("$.result").value(expectedResult.toString()))
                 .andExpect(jsonPath("$.cpu").value(cpuMove.name()));
     }
 

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/RockPaperScissorsPlayApplicationTest.java

@@ -26,7 +26,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
         webEnvironment = RANDOM_PORT
 )
 @Import(FakeCpuConfiguration.class)
-public class RockPaperScissorsPlayApplicationTest {
+class RockPaperScissorsPlayApplicationTest {
 
     @Autowired
     private TestRestTemplate restTemplate;

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java

@@ -4,36 +4,50 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class MoveTest {
+class MoveTest {
 
     @Test
     void should_check_move_size(){
-        Assertions.assertEquals(3, Move.values().length);
+        Assertions.assertEquals(4, Move.values().length);
     }
 
     @ParameterizedTest(name = "{0} should beat {1}")
     @MethodSource("winnable")
     void should_win(Move move1, Move move2) {
-        assertTrue(move1.beats(move2));
+        assertEquals(Result.WIN ,move1.beats(move2));
     }
 
     @ParameterizedTest(name = "{1} should not beat {0}")
     @MethodSource("winnable")
     void should_loose(Move move1, Move move2) {
-        assertFalse(move2.beats(move1));
+        assertEquals(Result.LOOSE ,move2.beats(move1));
     }
 
+
+
+
+    @ParameterizedTest(name = "{0} should be equal {0}")
+    @EnumSource(Move.class)
+    void should_equal(Move move) {
+        assertEquals(Result.EQUAL,move.beats(move));
+    }
+
+
     static Stream<Arguments> winnable(){
         return Stream.of(
                 Arguments.of(Move.ROCK,Move.SCISSORS),
                 Arguments.of(Move.PAPER,Move.ROCK),
-                Arguments.of(Move.SCISSORS,Move.PAPER)
+                Arguments.of(Move.PAPER,Move.WELL),
+                Arguments.of(Move.SCISSORS,Move.PAPER),
+                Arguments.of(Move.WELL,Move.ROCK),
+                Arguments.of(Move.WELL,Move.SCISSORS)
         );
     }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/RockPaperScissorsPlayTest.java

@@ -1,17 +1,16 @@
 package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.RockPaperScissorsPlay;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.FakeCpuPicker;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatSaver;
-import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.spi.stub.InMemoryStatRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 public class RockPaperScissorsPlayTest {

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java

@@ -20,9 +20,10 @@ class RandomCpuPickerTest {
             obtainedMoves.add(picker.pick());
         }
 
-        assertEquals(3, obtainedMoves.size());
+        assertEquals(4, obtainedMoves.size());
         assertTrue(obtainedMoves.contains(Move.ROCK));
         assertTrue(obtainedMoves.contains(Move.PAPER));
         assertTrue(obtainedMoves.contains(Move.SCISSORS));
+        assertTrue(obtainedMoves.contains(Move.WELL));
     }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatApplicationTest.java

@@ -14,7 +14,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @ApplicationModuleTest(
         webEnvironment = RANDOM_PORT
 )
-public class StatApplicationTest {
+class StatApplicationTest {
     @Autowired
     private TestRestTemplate restTemplate;
 
@@ -27,9 +27,9 @@ public class StatApplicationTest {
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
         assertThat(json.from(response.getBody())).extractingJsonPathArrayValue("@.stats").hasSize(2);
-        assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[0].name").isEqualTo("joe");
-        assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(1);
-        assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("eoj");
-        assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(3);
+        assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[0].name").isEqualTo("eoj");
+        assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[0].wins").isEqualTo(3);
+        assertThat(json.from(response.getBody())).extractingJsonPathStringValue("@.stats[1].name").isEqualTo("joe");
+        assertThat(json.from(response.getBody())).extractingJsonPathNumberValue("@.stats[1].wins").isEqualTo(1);
     }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatBoardGetterTest.java

@@ -3,6 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatBoard;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.domain.StatBoardGetter;
 import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.stat.spi.stub.InMemoryStatRepository;
+import java.util.LinkedHashMap;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
@@ -10,19 +11,20 @@ import java.util.HashMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class StatBoardGetterTest {
-    @Test
-    public void should_get_stat_board() {
-        HashMap<String, Integer> stats = new HashMap<>();
-        stats.put("joe", 1);
-        stats.put("eoj", 5);
-        InMemoryStatRepository statRepository = new InMemoryStatRepository(stats);
+class StatBoardGetterTest {
 
-        StatBoardGet statBoardGet = new StatBoardGetter(statRepository);
+  @Test
+  void should_get_stat_board() {
+    HashMap<String, Integer> stats = new LinkedHashMap<>();
+    stats.put("eoj", 5);
+    stats.put("joe", 1);
+    InMemoryStatRepository statRepository = new InMemoryStatRepository(stats);
 
-        StatBoard statBoard = statBoardGet.board();
+    StatBoardGet statBoardGet = new StatBoardGetter(statRepository);
 
-        assertNotNull(statBoard);
-        assertEquals(stats, statBoard.stats());
-    }
+    StatBoard statBoard = statBoardGet.board();
+
+    assertNotNull(statBoard);
+    assertEquals(stats, statBoard.stats());
+  }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatControllerTest.java

@@ -20,7 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @WebMvcTest(StatController.class)
 @Import(StatConfiguration.class)
-public class StatControllerTest {
+class StatControllerTest {
 
     private static final String STAT_ENDPOINT = "/stat";
 
@@ -36,8 +36,8 @@ public class StatControllerTest {
         mockMvc.perform(get(STAT_ENDPOINT))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.stats").isArray())
-                .andExpect(jsonPath("$.stats[0].name").value("joe"))
-                .andExpect(jsonPath("$.stats[0].wins").value(1));
+                .andExpect(jsonPath("$.stats[0].name").value("eoj"))
+                .andExpect(jsonPath("$.stats[0].wins").value(3));
     }
 
     @TestConfiguration

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/stat/StatSaverTest.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class StatSaverTest {
+class StatSaverTest {
     @ParameterizedTest(name = "name = {0}, initial = {1}, expected = {2}")
     @CsvSource({"joe,0,1", "eoj,2,3"})
     void should_save(String name, int initial, int expected) {