From 7b12223ac60b449135a0a011a01c94869b2e01ec Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 10:10:51 +0100 Subject: [PATCH 1/5] ajout puit --- .../automation/rock_paper_scissors/play/domain/Move.java | 8 +++++--- .../rock_paper_scissors/play/PlayControllerTest.java | 4 +++- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.java | 1 + 3 files changed, 9 insertions(+), 4 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..d1e6625 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 ROCK -> other == SCISSORS || other == WELL; case PAPER -> other == ROCK; - case SCISSORS -> other == PAPER; + case SCISSORS -> other == PAPER || other == WELL; + case WELL -> other == PAPER; }; } } diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java index 1e0cd10..7009cbe 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java @@ -46,7 +46,9 @@ public class PlayControllerTest { public static Stream scenario() { return Stream.of( Arguments.of(Move.ROCK, Move.SCISSORS, WIN), - Arguments.of(Move.ROCK, Move.PAPER, LOOSE) + Arguments.of(Move.ROCK, Move.PAPER, LOOSE), + Arguments.of(Move.WELL, Move.PAPER, LOOSE), + Arguments.of(Move.ROCK, Move.WELL, WIN) ); } 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..7a9c9a0 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 @@ -24,5 +24,6 @@ class RandomCpuPickerTest { 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 -- 2.52.0 From 59c73787849eaf92db9dffcec3e054a7cd61348d Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 10:50:49 +0100 Subject: [PATCH 2/5] ajout puit --- .../automation/rock_paper_scissors/play/domain/Move.java | 6 +++--- .../rock_paper_scissors/play/domain/MoveTest.java | 7 +++++-- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.java | 2 +- 3 files changed, 9 insertions(+), 6 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 d1e6625..7cf3342 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 @@ -8,9 +8,9 @@ public enum Move { public boolean beats(Move other) { return switch (this) { - case ROCK -> other == SCISSORS || other == WELL; - case PAPER -> other == ROCK; - case SCISSORS -> other == PAPER || other == WELL; + case ROCK -> other == SCISSORS; + case PAPER -> other == ROCK || other == WELL; + case SCISSORS -> other == PAPER; case WELL -> other == PAPER; }; } 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..0338411 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,10 @@ 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.ROCK), + Arguments.of(Move.WELL,Move.SCISSORS), + Arguments.of(Move.WELL,Move.PAPER) ); } } 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 7a9c9a0..2b6b8eb 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 @@ -20,7 +20,7 @@ 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)); -- 2.52.0 From b39bf8b726ec80a8055e23872a6634c23c44847a Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 10:54:18 +0100 Subject: [PATCH 3/5] correction puit --- .../but3/automation/rock_paper_scissors/play/domain/Move.java | 2 +- 1 file changed, 1 insertion(+), 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 7cf3342..34c1f20 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 @@ -11,7 +11,7 @@ public enum Move { case ROCK -> other == SCISSORS; case PAPER -> other == ROCK || other == WELL; case SCISSORS -> other == PAPER; - case WELL -> other == PAPER; + case WELL -> other == ROCK || other == SCISSORS; }; } } -- 2.52.0 From 6ee72f6939014338ca947eef938b2e91c2fa1bfb Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 11:00:07 +0100 Subject: [PATCH 4/5] correction --- .../rock_paper_scissors/play/PlayControllerTest.java | 4 +--- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java index 7009cbe..1e0cd10 100644 --- a/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java +++ b/src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java @@ -46,9 +46,7 @@ public class PlayControllerTest { public static Stream scenario() { return Stream.of( Arguments.of(Move.ROCK, Move.SCISSORS, WIN), - Arguments.of(Move.ROCK, Move.PAPER, LOOSE), - Arguments.of(Move.WELL, Move.PAPER, LOOSE), - Arguments.of(Move.ROCK, Move.WELL, WIN) + Arguments.of(Move.ROCK, Move.PAPER, LOOSE) ); } 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 0338411..a614643 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 @@ -35,8 +35,7 @@ class MoveTest { Arguments.of(Move.PAPER,Move.ROCK), Arguments.of(Move.SCISSORS,Move.PAPER), Arguments.of(Move.WELL,Move.ROCK), - Arguments.of(Move.WELL,Move.SCISSORS), - Arguments.of(Move.WELL,Move.PAPER) + Arguments.of(Move.WELL,Move.SCISSORS) ); } } -- 2.52.0 From 0a3e375ec9110422d7b23e541d23adcf7ae178c1 Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 11:30:13 +0100 Subject: [PATCH 5/5] correction --- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a614643..458de26 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 @@ -35,7 +35,8 @@ class MoveTest { Arguments.of(Move.PAPER,Move.ROCK), Arguments.of(Move.SCISSORS,Move.PAPER), Arguments.of(Move.WELL,Move.ROCK), - Arguments.of(Move.WELL,Move.SCISSORS) + Arguments.of(Move.WELL,Move.SCISSORS), + Arguments.of(Move.PAPER,Move.WELL) ); } } -- 2.52.0