pedro/mesos2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restored local changes after SSH re-clone

Browse Source
This commit is contained in:
pedretl
2026-04-13 13:36:36 +02:00
parent f6781b2882
commit 9e8b0475fd
13 changed files with 125 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/Server/BuildingManagerTest.java
View File

@@ -63,8 +63,8 @@ class BuildingManagerTest {
players.add(loser);
CardDeck cardDeck = new CardDeck();
cardDeck.setForNPlayer("./src/test/resources/files/only_building_deck.csv", 5);
//cardDeck.setForNPlayerPath("./src/test/resources/files/only_building_deck.csv", 5);
cardDeck.setForNPlayer(BuildingManagerTest.class.getResourceAsStream("/files/only_building_deck.csv"), 4);
//for(BuildingCard c: cardDeck.drawBuilding(30)){
// buildingManager.addActiveBuilding(c, players.getFirst());
//}

25
src/test/java/Server/Cards/CardDeckTest.java
View File

@@ -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());

3
src/test/java/Server/EventsSolverTest.java
View File

@@ -78,7 +78,8 @@ class EventsSolverTest {
@Test
void solveEvents() {
CardDeck cardDeck = new CardDeck();
cardDeck.setForNPlayer("./src/test/resources/files/only_event_deck.csv", 5);
//cardDeck.setForNPlayerPath("./src/test/resources/files/only_event_deck.csv", 5);
cardDeck.setForNPlayer(getClass().getResourceAsStream("/files/only_event_deck.csv"), 5);
List<EventCard> events = new ArrayList<>();
for(Card c: cardDeck.getTribeDeck()){

20
src/test/java/Server/GameBoardTest.java
View File

@@ -26,7 +26,9 @@ class GameBoardTest {
players.add(player3);
players.add(player4);
players.add(player5);
deck.setForNPlayer(".\\src\\test\\resources\\files\\test_gameboard.csv",5);
//deck.setForNPlayerPath(".\\src\\test\\resources\\files\\test_gameboard.csv",5);
deck.setForNPlayer(getClass().getResourceAsStream("/files/test_gameboard.csv"), 5);
}
@Test
@@ -45,7 +47,9 @@ class GameBoardTest {
//test that a hunter card has been added to the player
CardDeck deck2 = new CardDeck();
deck2.setForNPlayer("./src/test/resources/files/test_gameboard_characters.csv",5);
//deck2.setForNPlayerPath("./src/test/resources/files/test_gameboard_characters.csv",5);
deck2.setForNPlayer(getClass().getResourceAsStream("/files/test_gameboard_characters.csv"), 5);
GameBoard gameBoard = new GameBoard(Era.I,deck2,players.size());
Player player = new Player("Lucy", TotemColor.BLUE);
gameBoard.setupInitialRows(5);
@@ -57,7 +61,9 @@ class GameBoardTest {
void drawTopCard() {
//tests that a hunter card has been added to the player
CardDeck deck2 = new CardDeck();
deck2.setForNPlayer("./src/test/resources/files/test_gameboard_characters.csv",5);
//deck2.setForNPlayerPath("./src/test/resources/files/test_gameboard_characters.csv",5);
deck2.setForNPlayer(getClass().getResourceAsStream("/files/test_gameboard_characters.csv"), 5);
GameBoard gameBoard = new GameBoard(Era.I,deck2,players.size());
Player player = new Player("Lucy", TotemColor.BLUE);
gameBoard.setupInitialRows(5);
@@ -70,7 +76,9 @@ class GameBoardTest {
//tests that the result is a list of event cards
CardDeck deck2 = new CardDeck();
deck2.setForNPlayer(".\\src\\test\\resources\\files\\test_gameboard_events.csv",5);
//deck2.setForNPlayerPath(".\\src\\test\\resources\\files\\test_gameboard_events.csv",5);
deck2.setForNPlayer(getClass().getResourceAsStream("/files/test_gameboard_events.csv"), 5);
GameBoard gameBoard = new GameBoard(Era.I,deck2,players.size());
gameBoard.setupInitialRows(5);
@@ -111,7 +119,9 @@ class GameBoardTest {
//tests that with era change the top row of building is of era II
CardDeck deck2 = new CardDeck();
deck2.setForNPlayer(".\\src\\test\\resources\\files\\only_building_deck.csv",5);
//deck2.setForNPlayerPath(".\\src\\test\\resources\\files\\only_building_deck.csv",5);
deck2.setForNPlayer(getClass().getResourceAsStream("/files/only_building_deck.csv"), 5);
GameBoard gameBoard = new GameBoard(Era.II,deck2,players.size());
//assertEquals(Era.II,gameBoard.ChangeBuildings().getFirst().getEra());