From 315cbb2590bd286b6805e6510cad0e160dfc3a6a Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:57:27 +0100 Subject: [PATCH] =?UTF-8?q?Fikser=20en=20del=20sm=C3=A5feil=20i=20Deck,=20?= =?UTF-8?q?ProgrammingCardDeck=20og=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inf112/fiasko/roborally/objects/Deck.java | 13 +++- .../objects/ProgrammingCardDeck.java | 4 +- ...Deck.java => ProgrammingCardDeckTest.java} | 72 ++++++++----------- 3 files changed, 43 insertions(+), 46 deletions(-) rename src/test/java/inf112/fiasko/roborally/objects/{TestProgrammingCardDeck.java => ProgrammingCardDeckTest.java} (57%) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Deck.java b/src/main/java/inf112/fiasko/roborally/objects/Deck.java index 2551c6e..c1aeac2 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Deck.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Deck.java @@ -8,13 +8,13 @@ import java.util.Random; * This class represents a deck of cards */ public abstract class Deck implements IDeck { - private final ArrayList cardList; + private final List cardList; /** * Initializes the deck with cards * @param cardList list of cards */ - public Deck (ArrayList cardList) { + public Deck (List cardList) { this.cardList = new ArrayList<>(cardList); } @@ -68,5 +68,14 @@ public abstract class Deck implements IDeck { public List getCards() { return new ArrayList<>(cardList); } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + for (T card : cardList) { + builder.append(card.toString()).append("\n"); + } + return builder.toString(); + } } diff --git a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java index aeb18cf..00ef479 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java +++ b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java @@ -1,6 +1,6 @@ package inf112.fiasko.roborally.objects; -import java.util.ArrayList; +import java.util.List; /** * This class represents a deck containing programming cards @@ -11,7 +11,7 @@ public class ProgrammingCardDeck extends Deck { * Initializes the PlayerDeck with a list of cards * @param cardList list of programing cards */ - public ProgrammingCardDeck(ArrayList cardList) { + public ProgrammingCardDeck(List cardList) { super(cardList); } } diff --git a/src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java similarity index 57% rename from src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java rename to src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java index 62fb3f1..b073cb2 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ProgrammingCardDeckTest.java @@ -1,15 +1,18 @@ package inf112.fiasko.roborally.objects; import inf112.fiasko.roborally.element_properties.Action; +import inf112.fiasko.roborally.utility.DeckLoaderUtil; 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.io.IOException; import java.util.ArrayList; -public class TestProgrammingCardDeck { +public class ProgrammingCardDeckTest { + private ProgrammingCardDeck fullDeck; 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); @@ -22,6 +25,11 @@ public class TestProgrammingCardDeck { private ProgrammingCardDeck testDeck2; @Before public void setUp() { + try { + fullDeck = DeckLoaderUtil.loadProgrammingCardsDeck(); + } catch (IOException e) { + e.printStackTrace(); + } cardlist.add(programmingCard1); cardlist.add(programmingCard2); cardlist.add(programmingCard3); @@ -32,13 +40,13 @@ public class TestProgrammingCardDeck { testDeck2 = new ProgrammingCardDeck(cardlist2); } @Test - public void testSize(){ + public void testSize() { assertEquals(3,testDeck.size()); testDeck.emptyInto(testDeck2); assertEquals(0,testDeck.size()); } @Test - public void testDrawCard(){ + public void testDrawCard() { assertEquals(3,testDeck.size()); assertEquals(3,testDeck2.size()); testDeck.draw(testDeck2); @@ -46,60 +54,40 @@ public class TestProgrammingCardDeck { assertEquals(2,testDeck2.size()); } @Test - public void testDrawMultipulCards(){ - assertEquals(3,testDeck.size()); - assertEquals(3,testDeck2.size()); + public void testDrawMultipleCards() { + assertEquals(3, testDeck.size()); + assertEquals(3, testDeck2.size()); testDeck.draw(testDeck2, 3); - assertEquals(6,testDeck.size()); - assertEquals(0,testDeck2.size()); + assertEquals(6, testDeck.size()); + assertEquals(0, testDeck2.size()); } @Test - public void testEmptyInto(){ - assertEquals(3,testDeck.size()); - assertEquals(3,testDeck2.size()); + public void testEmptyInto() { + assertEquals(3, testDeck.size()); + assertEquals(3, testDeck2.size()); testDeck.emptyInto(testDeck2); - assertEquals(0,testDeck.size()); - assertEquals(6,testDeck2.size()); + assertEquals(0, testDeck.size()); + assertEquals(6, testDeck2.size()); } @Test - public void testIsEmpty(){ + public void testIsEmpty() { assertFalse(testDeck.isEmpty()); testDeck.emptyInto(testDeck2); assertTrue(testDeck.isEmpty()); } @Test - public void testGetCards(){ + public void testGetCards() { testDeck2.emptyInto(testDeck); - assertEquals(programmingCard1,testDeck.getCards().get(0)); - assertEquals(programmingCard3,testDeck.getCards().get(2)); - assertEquals(programmingCard6,testDeck.getCards().get(5)); + assertEquals(programmingCard1, testDeck.getCards().get(0)); + assertEquals(programmingCard3, testDeck.getCards().get(2)); + assertEquals(programmingCard6, testDeck.getCards().get(5)); } @Test - public void testshuffle(){ - ProgrammingCard card1 = testDeck.getCards().get(0); - int noe = card1.getValue(); - ProgrammingCard card2 = testDeck.getCards().get(1); - int noe2 = card2.getValue(); - ProgrammingCard card3 = testDeck.getCards().get(2); - int noe3 = card3.getValue(); - - System.out.println(noe); - System.out.println(noe2); - System.out.println(noe3); - - testDeck.shuffle(); - - ProgrammingCard scard1 = testDeck.getCards().get(0); - int snoe = scard1.getValue(); - ProgrammingCard scard2 = testDeck.getCards().get(1); - int snoe2 = scard2.getValue(); - ProgrammingCard scard3 = testDeck.getCards().get(2); - int snoe3 = scard3.getValue(); - - System.out.println(snoe); - System.out.println(snoe2); - System.out.println(snoe3); + public void testShuffle() { + System.out.print(fullDeck.toString()); + fullDeck.shuffle(); + System.out.print(fullDeck.toString()); } }