From 1c498a61d3307ba68ae3f3c9cfad7ae14b1c96aa Mon Sep 17 00:00:00 2001 From: vaisse Date: Thu, 27 Nov 2025 11:35:59 +0100 Subject: [PATCH 1/3] ajout du 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 | 3 ++- 3 files changed, 11 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..a5212fd 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..db1b590 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.SCISSORS), + Arguments.of(Move.WELL, Move.ROCK), + 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 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 2b9fa81cc260af2048f3e020ac49edb4afff3515 Mon Sep 17 00:00:00 2001 From: vaisse Date: Thu, 27 Nov 2025 11:47:20 +0100 Subject: [PATCH 2/3] maj puit. corrs 1 --- .../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 db1b590..f8a4295 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 @@ -36,7 +36,7 @@ class MoveTest { Arguments.of(Move.SCISSORS,Move.PAPER), Arguments.of(Move.WELL, Move.SCISSORS), Arguments.of(Move.WELL, Move.ROCK), - Arguments.of(Move.WELL, Move.PAPER); + Arguments.of(Move.WELL, Move.PAPER) ); } } From 710d3617ad2b4121931fb40fb3c82283e37b9f4b Mon Sep 17 00:00:00 2001 From: vaisse Date: Thu, 27 Nov 2025 11:56:14 +0100 Subject: [PATCH 3/3] maj puit. corrs 2 --- .../rock_paper_scissors/play/domain/MoveTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f8a4295..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 @@ -34,9 +34,9 @@ class MoveTest { Arguments.of(Move.ROCK,Move.SCISSORS), Arguments.of(Move.PAPER,Move.ROCK), Arguments.of(Move.SCISSORS,Move.PAPER), - Arguments.of(Move.WELL, Move.SCISSORS), - Arguments.of(Move.WELL, Move.ROCK), - Arguments.of(Move.WELL, Move.PAPER) + Arguments.of(Move.WELL,Move.SCISSORS), + Arguments.of(Move.WELL,Move.ROCK), + Arguments.of(Move.PAPER,Move.WELL) ); } }