From 338c90f674e8e48d4e89b7af73c6eced30b899a8 Mon Sep 17 00:00:00 2001 From: ducreux Date: Thu, 27 Nov 2025 11:23:12 +0100 Subject: [PATCH 1/2] WELL --- .../automation/rock_paper_scissors/play/domain/Move.java | 6 ++++-- .../rock_paper_scissors/play/domain/MoveTest.java | 5 ++++- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.java | 3 ++- 3 files changed, 10 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..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 @@ -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 PAPER -> other == ROCK || other == WELL; case SCISSORS -> other == PAPER; + case WELL -> other == ROCK || other == SCISSORS; }; } } 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..34c22fb 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,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.PAPER,Move.WELL), + Arguments.of(Move.WELL,Move.ROCK), + Arguments.of(Move.WELL,Move.SCISSORS) ); } } 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..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,9 +20,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 b3c70dc20d6b4f90b05342785cb90c4b828e882c Mon Sep 17 00:00:00 2001 From: ducreux Date: Thu, 27 Nov 2025 11:25:35 +0100 Subject: [PATCH 2/2] =?UTF-8?q?r=C3=A9paration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 2 +- 1 file changed, 1 insertion(+), 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 34c22fb..ce7956e 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}")