From 5fc9cd89aff0fdcf80d0bcc2827f5975988dca09 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Tue, 3 Mar 2020 16:01:52 +0100 Subject: [PATCH 1/6] =?UTF-8?q?Referat=20fra=20m=C3=B8te.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/team/referater/referat_03_03_2020.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/team/referater/referat_03_03_2020.md b/docs/team/referater/referat_03_03_2020.md index 413fe4a..11d980a 100644 --- a/docs/team/referater/referat_03_03_2020.md +++ b/docs/team/referater/referat_03_03_2020.md @@ -18,6 +18,8 @@ Det er blitt jobbet med deck-klassene og diskutert hvordan disse skal implemente Faser og runder er blitt gjennomgått step-by-step. Vi diskuterer forskjellige måter vi vil implementere de forskjellige aspektene som kommer med disse fasene og rundene. +Grafisk design er blitt grovt skissert + #### Fase - Kjør programmeringskort etter høyest verdi @@ -63,3 +65,17 @@ de forskjellige aspektene som kommer med disse fasene og rundene. - Program +#### Initialisering +- Last inn og stokke kort + +- Bestem robot ID + + +### Brukerhistorier +- Som spiller må jeg vite hvilken robot som er min for å riktig kunne +programmere roboten min + +- Som spiller må jeg ha et unikt navn for å kunne identifiseres + +- Som spiller må jeg kunne annonsere power down runden før jeg skal ta power down for å få +ta en gyldig power down \ No newline at end of file From f1bb6ae34bd39166db2296052eabad4ff730ddae Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:25:18 +0100 Subject: [PATCH 2/6] Fikser opp i kode, kommentarer og testing for kort og kortstokk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../inf112/fiasko/roborally/objects/Deck.java | 100 +++++------------- .../fiasko/roborally/objects/PlayerDeck.java | 15 --- .../roborally/objects/ProgrammingCard.java | 24 ++--- .../objects/ProgrammingCardDeck.java | 17 +++ ...Deck.java => TestProgrammingCardDeck.java} | 50 ++++----- 5 files changed, 75 insertions(+), 131 deletions(-) delete mode 100644 src/main/java/inf112/fiasko/roborally/objects/PlayerDeck.java create mode 100644 src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java rename src/test/java/inf112/fiasko/roborally/objects/{TestPlayerDeck.java => TestProgrammingCardDeck.java} (61%) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Deck.java b/src/main/java/inf112/fiasko/roborally/objects/Deck.java index 25f364e..76a58a6 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Deck.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Deck.java @@ -8,115 +8,65 @@ import java.util.Random; * This class represents a deck of cards */ public abstract class Deck implements IDeck { - private ArrayList cardDeck; - + private final ArrayList cardList; /** - * Initilazes the deck with cards + * Initializes the deck with cards * @param cardList list of cards */ - public Deck (ArrayList cardList){ - this.cardDeck = cardList; + public Deck (ArrayList cardList) { + this.cardList = cardList; } - - /** - * This method shuffles the cards in the deck so that they are in a random order - */ - @Override public void shuffle() { - Random randomNumber = new Random(); - - for (int i = cardDeck.size() - 1; i > 0; i--) { - int randomIndex = randomNumber.nextInt(i); - - T CardRandomIndex = cardDeck.get(randomIndex); - cardDeck.add(randomIndex, cardDeck.get(i)); - cardDeck.remove(randomIndex+1); - cardDeck.add(i, CardRandomIndex); - cardDeck.remove(i+1); - + Random randomGenerator = new Random(); + int deckSize = cardList.size(); + int halfDeckSize = deckSize / 2; + int timesToShuffle = 30 * deckSize; + for (int i = 0; i < timesToShuffle; i++) { + int oldPosition = randomGenerator.nextInt(halfDeckSize); + int newPosition = randomGenerator.nextInt(deckSize - halfDeckSize) + halfDeckSize; + cardList.add(newPosition, cardList.remove(oldPosition)); } } - /** - * draws a card form the other deck and adds it to the current deck - * @param other The deck to draw the card from - */ @Override - public void draw(IDeck other){ - Deck otherDeck = (Deck) other; - cardDeck.add(otherDeck.cardDeck.get(0)); - otherDeck.cardDeck.remove(0); + public void draw(IDeck other) { + Deck otherDeck = (Deck) other; + cardList.add(otherDeck.cardList.remove(0)); } - /** - * draws n cards from the other deck and adds them to the current deck - * @param other The other deck to draw from - * @param n The number of cards to draw - */ @Override public void draw(IDeck other, int n) { - Deck otherDeck = (Deck) other; - if(n<1||n>otherDeck.size()){ - throw new IllegalArgumentException("n cant be below 1 or over the size of the other card deck"); + Deck otherDeck = (Deck) other; + if (n < 1 || n > otherDeck.size()) { + throw new IllegalArgumentException("n can't be below 1 or over the size of the other card deck"); } - else { - for (int i=0; i other) { - Deck otherDeck = (Deck) other; - int size = otherDeck.size(); - for (int i=0; i otherDeck = (Deck) other; + otherDeck.draw(this, this.size()); } - /** - * checks if the deck is empty - * @return true if deck is empty false otherwise - */ @Override public boolean isEmpty() { - return cardDeck.isEmpty(); + return cardList.isEmpty(); } - /** - * gets the size of the current deck - * @return size of the deck - */ @Override public int size() { - return cardDeck.size(); + return cardList.size(); } - /** - * gets the list of cards inn this deck - * @return list of cards inn the deck - */ @Override public List getCards() { - - ArrayList returnDeck = new ArrayList<>(); - for (T card:cardDeck){ - returnDeck.add(card); - } - return returnDeck; - + return new ArrayList<>(cardList); } - - } diff --git a/src/main/java/inf112/fiasko/roborally/objects/PlayerDeck.java b/src/main/java/inf112/fiasko/roborally/objects/PlayerDeck.java deleted file mode 100644 index b2af4a9..0000000 --- a/src/main/java/inf112/fiasko/roborally/objects/PlayerDeck.java +++ /dev/null @@ -1,15 +0,0 @@ -package inf112.fiasko.roborally.objects; - -import java.util.ArrayList; - -public class PlayerDeck extends Deck { - - /** - * initalizes the PlayerDeck with a list of cards - * @param cardlist list of programing cards - */ - public PlayerDeck(ArrayList cardlist) { - super(cardlist); - } - -} diff --git a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java index ba6ed98..3ee46b2 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java +++ b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCard.java @@ -5,37 +5,33 @@ import inf112.fiasko.roborally.element_properties.Action; /** * This class represents a programming card */ - public class ProgrammingCard implements ICardWithoutSuit { - private Integer cardValue; - private Action cardAction; + private final Integer cardValue; + private final Action cardAction; /** * Initializes the value and the action of the card * @param cardValue the value of the card * @param cardAction the action of the card */ - public ProgrammingCard(int cardValue,Action cardAction){ - this.cardValue=cardValue; - this.cardAction=cardAction; + public ProgrammingCard(int cardValue, Action cardAction){ + this.cardValue = cardValue; + this.cardAction = cardAction; } - /** - * Returns the value of the card - * @return the value of the card - */ @Override public Integer getValue() { return cardValue; } - /** - * Returns the action the card should perform - * @return the action of the card - */ @Override public Action getSymbol() { return cardAction; } + + @Override + public String toString() { + return this.getValue() + " " + this.cardAction.toString(); + } } diff --git a/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java new file mode 100644 index 0000000..aeb18cf --- /dev/null +++ b/src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java @@ -0,0 +1,17 @@ +package inf112.fiasko.roborally.objects; + +import java.util.ArrayList; + +/** + * This class represents a deck containing programming cards + */ +public class ProgrammingCardDeck extends Deck { + + /** + * Initializes the PlayerDeck with a list of cards + * @param cardList list of programing cards + */ + public ProgrammingCardDeck(ArrayList cardList) { + super(cardList); + } +} diff --git a/src/test/java/inf112/fiasko/roborally/objects/TestPlayerDeck.java b/src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java similarity index 61% rename from src/test/java/inf112/fiasko/roborally/objects/TestPlayerDeck.java rename to src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java index 7669cd7..62fb3f1 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/TestPlayerDeck.java +++ b/src/test/java/inf112/fiasko/roborally/objects/TestProgrammingCardDeck.java @@ -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 cardlist = new ArrayList(); - private ArrayList 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 cardlist = new ArrayList<>(); + private final ArrayList 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); - - - } - - - } From 0fb2e3c7c717bd80b39db9496cca8964b85ef66e Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:29:29 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Legger=20til=20kopiering=20av=20kortliste?= =?UTF-8?q?=20i=20konstukt=C3=B8ren=20til=20kortstokk=20for=20=C3=A5=20hin?= =?UTF-8?q?dre=20kortstokken=20i=20=C3=A5=20kunne=20bli=20endret=20utenifr?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/inf112/fiasko/roborally/objects/Deck.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Deck.java b/src/main/java/inf112/fiasko/roborally/objects/Deck.java index 76a58a6..2551c6e 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Deck.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Deck.java @@ -15,7 +15,7 @@ public abstract class Deck implements IDeck { * @param cardList list of cards */ public Deck (ArrayList cardList) { - this.cardList = cardList; + this.cardList = new ArrayList<>(cardList); } @Override From a42ec0759c3330746979b9c5ea56860dde2392d9 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:56:04 +0100 Subject: [PATCH 4/6] Legger til en klasse som laster inn kortstokker med en metode for programmeringskort-kortstokken. Closes #23 --- .../roborally/utility/DeckLoaderUtil.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java diff --git a/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java new file mode 100644 index 0000000..d46c8b4 --- /dev/null +++ b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java @@ -0,0 +1,37 @@ +package inf112.fiasko.roborally.utility; + +import inf112.fiasko.roborally.element_properties.Action; +import inf112.fiasko.roborally.objects.ProgrammingCard; +import inf112.fiasko.roborally.objects.ProgrammingCardDeck; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; + +/** + * Helper class for loading card decks + */ +public final class DeckLoaderUtil { + + /** + * Returns a programming card deck containing all official programming cards + * @return A programming card deck with programming cards + * @throws IOException If the programming cards file is invalid + */ + public static ProgrammingCardDeck loadProgrammingCardsDeck() throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader( + ResourceUtil.getResourceAsInputStream("programming_cards.txt"))); + int numberOfCards = Integer.parseInt(reader.readLine()); + List programmingCardList = new ArrayList<>(); + for (int i = 0; i < numberOfCards; i++) { + String cardLine = reader.readLine(); + String[] parts = cardLine.split(" "); + int cardPriority = Integer.parseInt(parts[0]); + Action cardAction = Action.valueOf(parts[1]); + programmingCardList.add(new ProgrammingCard(cardPriority, cardAction)); + } + return new ProgrammingCardDeck(programmingCardList); + } +} From 9f7ebb59b13b480cae245bdf89b317913b651a8b Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:56:37 +0100 Subject: [PATCH 5/6] =?UTF-8?q?Fikser=20navn=20p=C3=A5=20programming=5Fcar?= =?UTF-8?q?ds.txt=20fra=20programing=5Fcards.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/{programing_cards.txt => programming_cards.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/{programing_cards.txt => programming_cards.txt} (100%) diff --git a/src/main/resources/programing_cards.txt b/src/main/resources/programming_cards.txt similarity index 100% rename from src/main/resources/programing_cards.txt rename to src/main/resources/programming_cards.txt From 315cbb2590bd286b6805e6510cad0e160dfc3a6a Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 3 Mar 2020 17:57:27 +0100 Subject: [PATCH 6/6] =?UTF-8?q?Fikser=20en=20del=20sm=C3=A5feil=20i=20Deck?= =?UTF-8?q?,=20ProgrammingCardDeck=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()); } }