forked from pierront/rock-paper-scissors
Compare commits
2 Commits
main
...
well-funct
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a6d438a40 | |||
| 5e855f3d1c |
@@ -3,13 +3,17 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
|
|||||||
public enum Move {
|
public enum Move {
|
||||||
ROCK,
|
ROCK,
|
||||||
PAPER,
|
PAPER,
|
||||||
SCISSORS;
|
SCISSORS,
|
||||||
|
WELL;
|
||||||
|
|
||||||
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);
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class MoveTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void should_check_move_size(){
|
void should_check_move_size(){
|
||||||
Assertions.assertEquals(3, Move.values().length);
|
Assertions.assertEquals(4, Move.values().length);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ParameterizedTest(name = "{0} should beat {1}")
|
@ParameterizedTest(name = "{0} should beat {1}")
|
||||||
@@ -33,7 +33,10 @@ class MoveTest {
|
|||||||
return Stream.of(
|
return Stream.of(
|
||||||
Arguments.of(Move.ROCK,Move.SCISSORS),
|
Arguments.of(Move.ROCK,Move.SCISSORS),
|
||||||
Arguments.of(Move.PAPER,Move.ROCK),
|
Arguments.of(Move.PAPER,Move.ROCK),
|
||||||
Arguments.of(Move.SCISSORS,Move.PAPER)
|
Arguments.of(Move.PAPER,Move.WELL),
|
||||||
|
Arguments.of(Move.SCISSORS,Move.PAPER),
|
||||||
|
Arguments.of(Move.WELL,Move.ROCK),
|
||||||
|
Arguments.of(Move.WELL,Move.SCISSORS)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi;
|
|||||||
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.Move;
|
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain.Move;
|
||||||
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.RandomCpuPicker;
|
import fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.spi.RandomCpuPicker;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.params.provider.Arguments;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -20,9 +21,10 @@ class RandomCpuPickerTest {
|
|||||||
obtainedMoves.add(picker.pick());
|
obtainedMoves.add(picker.pick());
|
||||||
}
|
}
|
||||||
|
|
||||||
assertEquals(3, obtainedMoves.size());
|
assertEquals(4, obtainedMoves.size());
|
||||||
assertTrue(obtainedMoves.contains(Move.ROCK));
|
assertTrue(obtainedMoves.contains(Move.ROCK));
|
||||||
assertTrue(obtainedMoves.contains(Move.PAPER));
|
assertTrue(obtainedMoves.contains(Move.PAPER));
|
||||||
assertTrue(obtainedMoves.contains(Move.SCISSORS));
|
assertTrue(obtainedMoves.contains(Move.SCISSORS));
|
||||||
|
assertTrue(obtainedMoves.contains(Move.WELL));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user