From 93428c09d7d9768ab8ec5626b04400c402d6af66 Mon Sep 17 00:00:00 2001 From: raphael Date: Thu, 27 Nov 2025 10:17:32 +0100 Subject: [PATCH 1/2] Ajout du puit (WELL) --- .../automation/rock_paper_scissors/play/domain/Move.java | 4 +++- .../rock_paper_scissors/play/domain/MoveTest.java | 6 ++++-- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.java | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java index 29eb0fd..8c477cf 100644 --- a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java +++ b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java @@ -3,13 +3,15 @@ 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) { case ROCK -> other == SCISSORS; case PAPER -> other == ROCK; case SCISSORS -> other == PAPER; + case WELL -> other == SCISSORS || other == ROCK; }; } } diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java index c21526b..9ddeb04 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java @@ -14,7 +14,7 @@ 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}") @@ -33,7 +33,9 @@ class MoveTest { return Stream.of( Arguments.of(Move.ROCK,Move.SCISSORS), Arguments.of(Move.PAPER,Move.ROCK), - Arguments.of(Move.SCISSORS,Move.PAPER) + Arguments.of(Move.SCISSORS,Move.PAPER), + Arguments.of(Move.WELL,Move.SCISSORS), + Arguments.of(Move.WELL,Move.ROCK) ); } } diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java index 9a09192..1f3d372 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java @@ -1,7 +1,6 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi; import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.Move; -import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.RandomCpuPicker; import org.junit.jupiter.api.Test; import java.util.HashSet; @@ -20,9 +19,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)); } } \ No newline at end of file From 78cdf7c628d437adacf1532a5716dbafec923690 Mon Sep 17 00:00:00 2001 From: raphael Date: Thu, 27 Nov 2025 10:36:53 +0100 Subject: [PATCH 2/2] Ajout de l'outcome feuille bat puit --- .../but3/automation/rock_paper_scissors/play/domain/Move.java | 2 +- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java index 8c477cf..51a508f 100644 --- a/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java +++ b/src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java @@ -9,7 +9,7 @@ public enum Move { public boolean beats(Move other) { return switch (this) { case ROCK -> other == SCISSORS; - case PAPER -> other == ROCK; + case PAPER -> other == ROCK || other == WELL; case SCISSORS -> other == PAPER; case WELL -> other == SCISSORS || other == ROCK; }; diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java index 9ddeb04..d1f66a3 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java @@ -33,6 +33,7 @@ class MoveTest { 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.WELL,Move.SCISSORS), Arguments.of(Move.WELL,Move.ROCK)