From 699de028107480b758a7ede75b275750c99371d7 Mon Sep 17 00:00:00 2001 From: Patrick FELIX-VIMALARATNAM Date: Sat, 29 Nov 2025 19:29:39 +0100 Subject: [PATCH 1/5] Update src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java add WELL in the game, the WELL loose in front of the PAPER and win against the ROCK and the SCISSORS. --- .../automation/rock_paper_scissors/play/domain/Move.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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..f7aa317 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); }; } } -- 2.52.0 From b4a28fdcf87a9f49a003971d5af0b33914262528 Mon Sep 17 00:00:00 2001 From: Patrick FELIX-VIMALARATNAM Date: Sat, 29 Nov 2025 19:37:30 +0100 Subject: [PATCH 2/5] Update src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java add the test ofr the WELL adding --- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 5 ++++- 1 file changed, 4 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 c21526b..2377564 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.WELL,Move.SCISSORS), + Arguments.of(Move.WELL,Move.ROCK), + Arguments.of(Move.PAPER,Move.WELL) ); } } -- 2.52.0 From a96b007c1f92dee1d830f1b6e38628c00416dc79 Mon Sep 17 00:00:00 2001 From: Patrick FELIX-VIMALARATNAM Date: Sat, 29 Nov 2025 19:48:26 +0100 Subject: [PATCH 3/5] Update src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java --- .../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 f7aa317..5d70574 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 || other == WELL ); + case PAPER -> (other == ROCK || other == WELL); case SCISSORS -> other == PAPER; case WELL -> (other == ROCK || other == SCISSORS); }; -- 2.52.0 From 556908555a81794e045bc497aaf3b4d202332f5f Mon Sep 17 00:00:00 2001 From: Patrick FELIX-VIMALARATNAM Date: Sat, 29 Nov 2025 19:50:50 +0100 Subject: [PATCH 4/5] Update src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java forgetting to change the expected number of possible moves --- .../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 2377564..ede4216 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}") -- 2.52.0 From 5ced2b83e2df5ac66bbe7e83f8ccfa410d240eb7 Mon Sep 17 00:00:00 2001 From: Patrick FELIX-VIMALARATNAM Date: Sat, 29 Nov 2025 19:55:45 +0100 Subject: [PATCH 5/5] Update src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java Change in the expected number of possible strokes and new possible stroke for the CPU --- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.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/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 -- 2.52.0