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) {
+    public Result beats(Move other) {
-        return switch (this) {
+        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);
+        Result beats = move.beats(cpuPicked);
-        String result = beats ? WIN : LOOSE;
+        if (beats.equals(Result.WIN)) {
-        if (result.equals(WIN)) {
             this.statSave.addWin(name);
         }
-        return new RoundResult(result, name, cpuPicked);
+        return new RoundResult(beats.toString(), name, cpuPicked);
     }
 }

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.SCISSORS, Result.WIN),
-                Arguments.of(Move.ROCK, Move.PAPER, LOOSE)
+                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/domain/MoveTest.java

@@ -4,6 +4,7 @@ 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;
@@ -14,26 +15,39 @@ 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/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));
     }
 }