From 0944a2db43bd34149329a926f84e342b8309e4ff Mon Sep 17 00:00:00 2001 From: Jannaire Date: Thu, 27 Nov 2025 11:22:31 +0100 Subject: [PATCH 1/5] ajout puit --- .../automation/rock_paper_scissors/play/domain/Move.java | 4 +++- .../automation/rock_paper_scissors/play/domain/MoveTest.java | 5 ++++- .../rock_paper_scissors/play/spi/RandomCpuPickerTest.java | 3 ++- 3 files changed, 9 insertions(+), 3 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..45a7261 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 @@ -4,12 +4,14 @@ public enum Move { ROCK, PAPER, SCISSORS; + PUIT; public boolean beats(Move other) { return switch (this) { case ROCK -> other == SCISSORS; - case PAPER -> other == ROCK; + case PAPER -> other == ROCK || other == PUIT; case SCISSORS -> other == PAPER; + case PUIT -> 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..fe1a396 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.PUIT,Move.Rock), + Arguments.of(Move.PUIT,Move.SCISSORS), + Arguments.of(Move.PAPER.Move.PUIT) ); } } 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..7a962c3 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.PUIT)); } } \ No newline at end of file -- 2.52.0 From cd612bd998566a01066aecd20267362f768ba5ad Mon Sep 17 00:00:00 2001 From: Jannaire Date: Thu, 27 Nov 2025 11:25:35 +0100 Subject: [PATCH 2/5] ajout puit correction erreur --- .../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 fe1a396..b37612e 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 417f0ffd7f99db56a756bdf3712d4abca9c3dce1 Mon Sep 17 00:00:00 2001 From: Jannaire Date: Thu, 27 Nov 2025 11:33:36 +0100 Subject: [PATCH 3/5] ajout puit correction erreur --- .../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 45a7261..0880818 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,7 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain; public enum Move { ROCK, PAPER, - SCISSORS; + SCISSORS, PUIT; public boolean beats(Move other) { -- 2.52.0 From e9a0a6462519622b5a8cef1e8c039dfbd18a3f69 Mon Sep 17 00:00:00 2001 From: Jannaire Date: Thu, 27 Nov 2025 11:39:39 +0100 Subject: [PATCH 4/5] ajout puit correction erreur --- .../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 b37612e..641ca21 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.PUIT,Move.Rock), Arguments.of(Move.PUIT,Move.SCISSORS), - Arguments.of(Move.PAPER.Move.PUIT) + Arguments.of(Move.PAPER,Move.PUIT) ); } } -- 2.52.0 From 1b1abeb54083e80fbb595cf74c91c13f99acf02f Mon Sep 17 00:00:00 2001 From: Jannaire Date: Thu, 27 Nov 2025 11:42:01 +0100 Subject: [PATCH 5/5] ajout puit correction erreur --- .../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 641ca21..31850e6 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.PUIT,Move.Rock), - Arguments.of(Move.PUIT,Move.SCISSORS), - Arguments.of(Move.PAPER,Move.PUIT) + Arguments.of(Move.PAPER,Move.PUIT), + Arguments.of(Move.PUIT,Move.ROCK), + Arguments.of(Move.PUIT,Move.SCISSORS) ); } } -- 2.52.0