From 7b12223ac60b449135a0a011a01c94869b2e01ec Mon Sep 17 00:00:00 2001 From: dick Date: Thu, 27 Nov 2025 10:10:51 +0100 Subject: [PATCH] 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