Restored local changes after SSH re-clone
This commit is contained in:
@@ -12,7 +12,7 @@ class CardDeckTest {
|
||||
@Test
|
||||
void loadOnlyCharacter(){
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/only_character_deck.csv", 4);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/cards.csv"), 4);
|
||||
assertEquals(2, cardDeck.getTribeDeck().size());
|
||||
}
|
||||
|
||||
@@ -22,13 +22,15 @@ class CardDeckTest {
|
||||
void doubleLoad(){
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/only_building_deck.csv", 4);
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/only_building_deck.csv", 4);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/only_building_deck.csv"), 4);
|
||||
assertEquals(0, cardDeck.getTribeDeck().size());
|
||||
assertEquals(6, cardDeck.getBuildingDeck(Era.I).size());
|
||||
assertEquals(7, cardDeck.getBuildingDeck(Era.II).size());
|
||||
assertEquals(8, cardDeck.getBuildingDeck(Era.III).size());
|
||||
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/only_event_deck.csv", 4);
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/only_event_deck.csv", 4);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/only_event_deck.csv"), 4);
|
||||
assertEquals(3, cardDeck.getTribeDeck().size());
|
||||
assertEquals(0, cardDeck.getBuildingDeck(Era.I).size());
|
||||
assertEquals(0, cardDeck.getBuildingDeck(Era.II).size());
|
||||
@@ -45,7 +47,9 @@ class CardDeckTest {
|
||||
int drawnCards = tribeDraw + buildingDraw;
|
||||
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/test_deck.csv"), 5);
|
||||
|
||||
//int deckSize = cardDeck.getTribeDeck().size() + cardDeck.getBuildingDeck().size();
|
||||
|
||||
List<Card> cards = cardDeck.drawTribe(tribeDraw);
|
||||
@@ -61,8 +65,8 @@ class CardDeckTest {
|
||||
@Test
|
||||
void drawTribe() {
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/test_deck.csv"), 5);
|
||||
List<Card> cards = cardDeck.drawTribe(5);
|
||||
assertEquals(5, cards.size());
|
||||
}
|
||||
@@ -71,7 +75,8 @@ class CardDeckTest {
|
||||
@Test
|
||||
void drawBuilding() {
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/test_deck.csv"), 5);
|
||||
|
||||
// List<BuildingCard> buildingCards = cardDeck.drawBuilding(3);
|
||||
// assertEquals(3, buildingCards.size());
|
||||
@@ -82,7 +87,8 @@ class CardDeckTest {
|
||||
@Test
|
||||
void drawTooManyCards() {
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/only_character_deck.csv", 5);
|
||||
//cardDeck.setForNPlayer("./src/test/resources/files/only_character_deck.csv", 5);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/only_character_deck.csv"), 5);
|
||||
|
||||
List<Card> cards = cardDeck.drawTribe(5);
|
||||
assertEquals(3, cards.size());
|
||||
@@ -92,7 +98,8 @@ class CardDeckTest {
|
||||
@Test
|
||||
void shuffledDeck() {
|
||||
CardDeck cardDeck = new CardDeck();
|
||||
cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
// cardDeck.setForNPlayer("./src/test/resources/files/test_deck.csv", 5);
|
||||
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/test_deck.csv"), 5);
|
||||
|
||||
assertEquals(Era.I, cardDeck.drawTribe(1).getFirst().getEra());
|
||||
assertEquals(Era.FINAL, cardDeck.drawTribe(100).getLast().getEra());
|
||||
|
||||
Reference in New Issue
Block a user