Skip to content
Snippets Groups Projects
Commit 30e1936c authored by giovanni.novati@studenti.unimi.it's avatar giovanni.novati@studenti.unimi.it
Browse files

REFACTORING: rimossi i TODO. Specificato la classe nel comparable

parent 54d4cc69
No related branches found
No related tags found
No related merge requests found
......@@ -7,11 +7,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
public class Player implements Iterable<Card>, Comparable {
// TODO rendere la classe Comparable con altri Player confrontando i punteggi
// TODO rendere la classe Iterable sulle carte che ha in mano
public class Player implements Iterable<Card>, Comparable<Player> {
private @NotNull final String name;
private @NotNull final List<Card> cards = new ArrayList<>();
private @NotNull final List<Card> personalDeck = new ArrayList<>();
......@@ -92,7 +88,7 @@ public class Player implements Iterable<Card>, Comparable {
}
@Override
public int compareTo(@NotNull Object o) {
return getPoints() - ((Player) o).getPoints();
public int compareTo(@NotNull Player player) {
return getPoints() - player.getPoints();
}
}
......@@ -11,22 +11,22 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
public class PlayerTest {
@Test
void iterablePlayerTest(){
Player pl1 = new Player("Gio");
List<Card> cards = List.of(
Card.get(Rank.ASSO,Suit.BASTONI),
Card.get(Rank.ASSO,Suit.COPPE),
Card.get(Rank.TRE,Suit.BASTONI));
for (Card card : cards) {
for (Card card : cards)
pl1.giveCard(card);
}
Iterator<Card> it = pl1.iterator();
for (Card card : cards) {
for (Card card : cards)
assertThat(card).isEqualTo(it.next());
}
}
@Test
void comparePlayerTest(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment