EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-11-04 11:43:44 +01:00
Code Issues Projects Releases Wiki Activity

Fikser opp i kode, kommentarer og testing for kort og kortstokk

Browse Source 
Fjerner overflødige kommentarer i Deck
Forenkler en del kode i Deck
Fikser uparameteriserte typer i Deck
Bytter navn på PlayerDeck til ProgrammingCardDeck
Fjerner overflødige kommentarer i ProgrammingCard
Legger final til ting som ikke skal endres
Fikser mellomrom noen steder
Legger til en toString() metode til ProgrammingCard for enklere debugging
Fikser uparameteriserte lister i TestProgrammingCardDeck
Fjerner unødvendige mellomrom i TestProgrammingCardDeck
This commit is contained in:
Kristian Knarvik
2020-03-03 17:25:18 +01:00
parent 985676c6ea
commit f1bb6ae34b
5 changed files with 75 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/test/java/inf112/fiasko/roborally/objects/TestPlayerDeck.java → src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java
View File

@@ -4,20 +4,22 @@ import inf112.fiasko.roborally.element_properties.Action;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
public class TestPlayerDeck {
private ProgrammingCard programmingCard1 = new ProgrammingCard(5, Action.MOVE_1);
private ProgrammingCard programmingCard2 = new ProgrammingCard(6, Action.MOVE_2);
private ProgrammingCard programmingCard3 = new ProgrammingCard(7, Action.MOVE_3);
private ProgrammingCard programmingCard4 = new ProgrammingCard(55, Action.MOVE_1);
private ProgrammingCard programmingCard5 = new ProgrammingCard(66, Action.MOVE_2);
private ProgrammingCard programmingCard6 = new ProgrammingCard(756, Action.MOVE_3);
private ArrayList<ProgrammingCard> cardlist = new ArrayList();
private ArrayList<ProgrammingCard> cardlist2 = new ArrayList();
private PlayerDeck testDeck;
private PlayerDeck testDeck2;
public class TestProgrammingCardDeck {
private final ProgrammingCard programmingCard1 = new ProgrammingCard(5, Action.MOVE_1);
private final ProgrammingCard programmingCard2 = new ProgrammingCard(6, Action.MOVE_2);
private final ProgrammingCard programmingCard3 = new ProgrammingCard(7, Action.MOVE_3);
private final ProgrammingCard programmingCard4 = new ProgrammingCard(55, Action.MOVE_1);
private final ProgrammingCard programmingCard5 = new ProgrammingCard(66, Action.MOVE_2);
private final ProgrammingCard programmingCard6 = new ProgrammingCard(756, Action.MOVE_3);
private final ArrayList<ProgrammingCard> cardlist = new ArrayList<>();
private final ArrayList<ProgrammingCard> cardlist2 = new ArrayList<>();
private ProgrammingCardDeck testDeck;
private ProgrammingCardDeck testDeck2;
@Before
public void setUp() {
cardlist.add(programmingCard1);
@@ -26,8 +28,8 @@ public class TestPlayerDeck {
cardlist2.add(programmingCard4);
cardlist2.add(programmingCard5);
cardlist2.add(programmingCard6);
testDeck = new PlayerDeck(cardlist);
testDeck2 = new PlayerDeck(cardlist2);
testDeck = new ProgrammingCardDeck(cardlist);
testDeck2 = new ProgrammingCardDeck(cardlist2);
}
@Test
public void testSize(){
@@ -61,9 +63,9 @@ public class TestPlayerDeck {
}
@Test
public void testIsEmpty(){
assertEquals(false,testDeck.isEmpty());
assertFalse(testDeck.isEmpty());
testDeck.emptyInto(testDeck2);
assertEquals(true,testDeck.isEmpty());
assertTrue(testDeck.isEmpty());
}
@Test
@@ -76,11 +78,11 @@ public class TestPlayerDeck {
@Test
public void testshuffle(){
ProgrammingCard card1 =(ProgrammingCard) testDeck.getCards().get(0);
ProgrammingCard card1 = testDeck.getCards().get(0);
int noe = card1.getValue();
ProgrammingCard card2 =(ProgrammingCard) testDeck.getCards().get(1);
ProgrammingCard card2 = testDeck.getCards().get(1);
int noe2 = card2.getValue();
ProgrammingCard card3 =(ProgrammingCard) testDeck.getCards().get(2);
ProgrammingCard card3 = testDeck.getCards().get(2);
int noe3 = card3.getValue();
System.out.println(noe);
@@ -89,21 +91,15 @@ public class TestPlayerDeck {
testDeck.shuffle();
ProgrammingCard scard1 =(ProgrammingCard) testDeck.getCards().get(0);
ProgrammingCard scard1 = testDeck.getCards().get(0);
int snoe = scard1.getValue();
ProgrammingCard scard2 =(ProgrammingCard) testDeck.getCards().get(1);
ProgrammingCard scard2 = testDeck.getCards().get(1);
int snoe2 = scard2.getValue();
ProgrammingCard scard3 =(ProgrammingCard) testDeck.getCards().get(2);
ProgrammingCard scard3 = testDeck.getCards().get(2);
int snoe3 = scard3.getValue();
System.out.println(snoe);
System.out.println(snoe2);
System.out.println(snoe3);
}
}