pierront/rock-paper-scissors
1
0
Fork 23
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #9

Closed
Damien RIERA wants to merge 3 commits from riera/rock-paper-scissors:main into main
pull from: riera/rock-paper-scissors:main
merge into: pierront:main
Conversation 0 Commits 3 Files Changed 3 +3 -2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04e7e6e381 - Show all commits

2
src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java
View File

@@ -9,7 +9,7 @@ public enum Move {
public boolean beats(Move other) { public boolean beats(Move other) {
return switch (this) { return switch (this) {
case ROCK -> other == SCISSORS; case ROCK -> other == SCISSORS;
case PAPER -> other == ROCK; case PAPER -> other == ROCK || other == WELL;
case SCISSORS -> other == PAPER; case SCISSORS -> other == PAPER;
case WELL -> other == ROCK || other == SCISSORS; case WELL -> other == ROCK || other == SCISSORS;
}; };

3
src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java
View File

@@ -35,7 +35,8 @@ class MoveTest {
Arguments.of(Move.PAPER,Move.ROCK), Arguments.of(Move.PAPER,Move.ROCK),
Arguments.of(Move.SCISSORS,Move.PAPER), Arguments.of(Move.SCISSORS,Move.PAPER),
Arguments.of(Move.WELL,Move.ROCK), Arguments.of(Move.WELL,Move.ROCK),
Arguments.of(Move.WELL,Move.SCISSORS) Arguments.of(Move.WELL,Move.SCISSORS),
Arguments.of(Move.PAPER,Move.WELL)
); );
} }
} }