6 Commits

Author SHA1 Message Date
6c90a66d8d Merge pull request 'clement-branch' (#1) from clement-branch into main
Reviewed-on: jannaire/rock-paper-scissors#1
2025-11-27 11:57:50 +01:00
1b1abeb540 ajout puit correction erreur
All checks were successful
rock-paper-scissors/pipeline/pr-main This commit looks good
2025-11-27 11:42:01 +01:00
e9a0a64625 ajout puit correction erreur 2025-11-27 11:39:39 +01:00
417f0ffd7f ajout puit correction erreur 2025-11-27 11:33:36 +01:00
cd612bd998 ajout puit correction erreur 2025-11-27 11:25:35 +01:00
0944a2db43 ajout puit 2025-11-27 11:22:31 +01:00
3 changed files with 11 additions and 5 deletions

View File

@@ -3,13 +3,15 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
public enum Move { public enum Move {
ROCK, ROCK,
PAPER, PAPER,
SCISSORS; SCISSORS,
PUIT;
public boolean beats(Move other) { public boolean beats(Move other) {
return switch (this) { return switch (this) {
case ROCK -> other == SCISSORS; case ROCK -> other == SCISSORS;
case PAPER -> other == ROCK; case PAPER -> other == ROCK || other == PUIT;
case SCISSORS -> other == PAPER; case SCISSORS -> other == PAPER;
case PUIT -> other == ROCK || other == SCISSORS;
}; };
} }
} }

View File

@@ -14,7 +14,7 @@ class MoveTest {
@Test @Test
void should_check_move_size(){ void should_check_move_size(){
Assertions.assertEquals(3, Move.values().length); Assertions.assertEquals(4, Move.values().length);
} }
@ParameterizedTest(name = "{0} should beat {1}") @ParameterizedTest(name = "{0} should beat {1}")
@@ -33,7 +33,10 @@ class MoveTest {
return Stream.of( return Stream.of(
Arguments.of(Move.ROCK,Move.SCISSORS), Arguments.of(Move.ROCK,Move.SCISSORS),
Arguments.of(Move.PAPER,Move.ROCK), Arguments.of(Move.PAPER,Move.ROCK),
Arguments.of(Move.SCISSORS,Move.PAPER) Arguments.of(Move.SCISSORS,Move.PAPER),
Arguments.of(Move.PAPER,Move.PUIT),
Arguments.of(Move.PUIT,Move.ROCK),
Arguments.of(Move.PUIT,Move.SCISSORS)
); );
} }
} }

View File

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