Update Jenkins pipeline setup instructions in README.

README.md

@@ -7,6 +7,8 @@ Se rendre sur : https://grond.iut-fbleau.fr/pierront/rock-paper-scissors
 
 Faire un fork
 
+`/!\ ATTENTION NE PRENDRE QUE LA BRANCHE MAIN /!\`
+
 ## Créer la VM pour jenkins
 ### Créer la règle pare-feu pour accéder aux ports 8080 et 8081
 Aller dans la section Pare-Feu
@@ -117,7 +119,7 @@ Vous devriez voir la page d'accueil de Jenkins
 ---
 
 ## Création d'un pipeline
-* Aller dans la section Manage Jenkins -> New Item
+* Aller sur l'accueil Jenkins -> New Item
 * Nommer le projet : rock-paper-scissors
 * Choisir le type de projet : Multibranch Pipeline
 * Cliquer sur OK
@@ -126,7 +128,6 @@ Vous devriez voir la page d'accueil de Jenkins
   * utiliser le jeton gitea-token
   * owner : _<votre nom d'utilisateur gitea>_
   * Choisir le projet : rock-paper-scissors
-* Choisir le provider : Git
 * Choisir le repository : https://grond.iut-fbleau.fr/pierront/rock-paper-scissors.git
 * Cliquer sur Save
 

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

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

@@ -1,8 +0,0 @@
-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,16 +9,17 @@ 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();
-        Result beats = move.beats(cpuPicked);
+        boolean beats = move.beats(cpuPicked);
-        if (beats.equals(Result.WIN)) {
+        String result = beats ? WIN : LOOSE;
+        if (result.equals(WIN)) {
             this.statSave.addWin(name);
         }
-        return new RoundResult(beats.toString(), name, cpuPicked);
+        return new RoundResult(result, name, cpuPicked);
     }
 }

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

@@ -4,7 +4,6 @@ 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;
@@ -25,6 +24,8 @@ 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;
@@ -44,14 +45,14 @@ public class PlayControllerTest {
 
     public static Stream<Arguments> scenario() {
         return Stream.of(
-                Arguments.of(Move.ROCK, Move.SCISSORS, Result.WIN),
+                Arguments.of(Move.ROCK, Move.SCISSORS, WIN),
-                Arguments.of(Move.ROCK, Move.PAPER, Result.LOOSE)
+                Arguments.of(Move.ROCK, Move.PAPER, LOOSE)
         );
     }
 
     @ParameterizedTest
     @MethodSource("scenario")
-    void shouldReturnWinResult_whenPlayerPlaysRock(Move playerMove, Move cpuMove, Result expectedResult) throws Exception {
+    void shouldReturnWinResult_whenPlayerPlaysRock(Move playerMove, Move cpuMove, String expectedResult) throws Exception {
         FakeCpuConfiguration.cpuPick.setNextMove(cpuMove);
         mockMvc.perform(
                         post(PLAY_ENDPOINT)
@@ -63,7 +64,7 @@ public class PlayControllerTest {
                                         """, playerMove))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE)
                 ).andExpect(status().isOk())
-                .andExpect(jsonPath("$.result").value(expectedResult.toString()))
+                .andExpect(jsonPath("$.result").value(expectedResult))
                 .andExpect(jsonPath("$.cpu").value(cpuMove.name()));
     }
 

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

@@ -4,7 +4,6 @@ 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;
@@ -15,39 +14,26 @@ class MoveTest {
 
     @Test
     void should_check_move_size(){
-        Assertions.assertEquals(4, Move.values().length);
+        Assertions.assertEquals(3, Move.values().length);
     }
 
     @ParameterizedTest(name = "{0} should beat {1}")
     @MethodSource("winnable")
     void should_win(Move move1, Move move2) {
-        assertEquals(Result.WIN ,move1.beats(move2));
+        assertTrue(move1.beats(move2));
     }
 
     @ParameterizedTest(name = "{1} should not beat {0}")
     @MethodSource("winnable")
     void should_loose(Move move1, Move move2) {
-        assertEquals(Result.LOOSE ,move2.beats(move1));
+        assertFalse(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.PAPER,Move.WELL),
+                Arguments.of(Move.SCISSORS,Move.PAPER)
-                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,10 +20,9 @@ class RandomCpuPickerTest {
             obtainedMoves.add(picker.pick());
         }
 
-        assertEquals(4, obtainedMoves.size());
+        assertEquals(3, obtainedMoves.size());
         assertTrue(obtainedMoves.contains(Move.ROCK));
         assertTrue(obtainedMoves.contains(Move.PAPER));
         assertTrue(obtainedMoves.contains(Move.SCISSORS));
-        assertTrue(obtainedMoves.contains(Move.WELL));
     }
 }