Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed: PickOptionalTribeCard and PickOptionalBuildingCard in Game and GameController

Browse Source
This commit is contained in:
rubenpirreram
2026-05-17 16:32:42 +02:00
parent d9ef7983f8
commit 4b4614d17e
8 changed files with 90 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java
+20 -20
View File
@@ -149,7 +149,7 @@ class GameControllerTest {
if (game.getCurrentState().getNUpper() == 0
|| game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard)) {
assertTrue(controller.SkipNoDrawable(username));
assertTrue(controller.SkipTurn(username));
return;
}
}
@@ -172,7 +172,7 @@ class GameControllerTest {
if (game.getCurrentState().getNLower() == 0
|| game.getLowerListTribeCards().stream().allMatch(TribeCard::IsEventCard)) {
assertTrue(controller.SkipNoDrawable(username));
assertTrue(controller.SkipTurn(username));
return;
}
}
@@ -289,10 +289,10 @@ class GameControllerTest {
assertFalse(controller.drawLowerTribeCard("ghost", 0));
assertFalse(controller.drawUpperBuildingCard("ghost", 0));
assertFalse(controller.drawLowerBuildingCard("ghost", 0));
assertFalse(controller.SkipNoDrawable("ghost"));
assertFalse(controller.pickOptionalTribeCard("ghost", 0));
assertFalse(controller.pickOptionalBuildingCard("ghost", 0));
assertFalse(controller.noOptionalCard("ghost"));
assertFalse(controller.SkipTurn("ghost"));
assertFalse(controller.drawUpperTribeCard("ghost", 0));
assertFalse(controller.drawUpperBuildingCard("ghost", 0));
assertFalse(controller.SkipTurn("ghost"));
assertFalse(controller.TotemChoice("ghost", Totems.values()[0].name()));
assertFalse(controller.DisconnectedPlayer("ghost"));
assertFalse(controller.ReconnectPlayer("ghost"));
@@ -505,8 +505,8 @@ class GameControllerTest {
String cur = game.getCurrentState().getCurrentPlayer().getUserName();
assertFalse(controller.pickOptionalTribeCard(cur, 0));
assertFalse(controller.pickOptionalBuildingCard(cur, 0));
assertFalse(controller.drawUpperTribeCard(cur, 0));
assertFalse(controller.drawUpperBuildingCard(cur, 0));
}
@Test
@@ -530,7 +530,7 @@ class GameControllerTest {
int charactersBefore = optionalPlayer.getTotCharacters();
assertTrue(controller.pickOptionalTribeCard(optionalPlayer.getUserName(), index));
assertTrue(controller.drawUpperTribeCard(optionalPlayer.getUserName(), index));
assertEquals(charactersBefore + 1, optionalPlayer.getTotCharacters());
}
@@ -558,7 +558,7 @@ class GameControllerTest {
int foodBefore = optionalPlayer.getFoodValue();
int buildingsBefore = optionalPlayer.buildingCards.size();
assertTrue(controller.pickOptionalBuildingCard(optionalPlayer.getUserName(), 0));
assertTrue(controller.drawUpperBuildingCard(optionalPlayer.getUserName(), 0));
assertTrue(optionalPlayer.getFoodValue() <= foodBefore);
assertEquals(buildingsBefore + 1, optionalPlayer.buildingCards.size());
@@ -625,7 +625,7 @@ class GameControllerTest {
assertTrue(optionalPlayer.buildingCards.stream()
.anyMatch(building -> building.getEffectId() == 12));
assertTrue(controller.noOptionalCard(optionalPlayer.getUserName()));
assertTrue(controller.SkipTurn(optionalPlayer.getUserName()));
}
@Test
@@ -666,11 +666,11 @@ class GameControllerTest {
String username = optionalPlayer.getUserName();
assertFalse(controller.pickOptionalTribeCard(username, -1));
assertFalse(controller.pickOptionalTribeCard(username, 999));
assertFalse(controller.drawUpperTribeCard(username, -1));
assertFalse(controller.drawUpperTribeCard(username, 999));
assertFalse(controller.pickOptionalBuildingCard(username, -1));
assertFalse(controller.pickOptionalBuildingCard(username, 999));
assertFalse(controller.drawUpperBuildingCard(username, -1));
assertFalse(controller.drawUpperBuildingCard(username, 999));
}
@Test
@@ -693,9 +693,9 @@ class GameControllerTest {
assertNotNull(wrongPlayer);
assertFalse(controller.pickOptionalTribeCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.pickOptionalBuildingCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.noOptionalCard(wrongPlayer.getUserName()));
assertFalse(controller.drawUpperTribeCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.drawUpperBuildingCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.SkipTurn(wrongPlayer.getUserName()));
}
@Test
@@ -714,7 +714,7 @@ class GameControllerTest {
assertFalse(game.getLowerListTribeCards().isEmpty());
assertTrue(firstNonEventIndexOrMinusOne(game.getLowerListTribeCards()) != -1);
assertFalse(controller.SkipNoDrawable(current.getUserName()));
assertFalse(controller.SkipTurn(current.getUserName()));
}
@Test
@@ -733,7 +733,7 @@ class GameControllerTest {
assertFalse(game.getUpperListTribeCards().isEmpty());
assertTrue(firstNonEventIndexOrMinusOne(game.getUpperListTribeCards()) != -1);
assertFalse(controller.SkipNoDrawable(current.getUserName()));
assertFalse(controller.SkipTurn(current.getUserName()));
}
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+22 -22
View File
@@ -119,7 +119,7 @@ class GameTest {
if(game.getCurrentState().getNUpper() == 0 || game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard))
{
assertTrue(game.SkipNoDrawable(current));
assertTrue(game.SkipTurn(current));
return;
}
@@ -140,7 +140,7 @@ class GameTest {
if(game.getCurrentState().getNLower() == 0 || game.getLowerListTribeCards().stream().allMatch(TribeCard::IsEventCard))
{
assertTrue(game.SkipNoDrawable(current));
assertTrue(game.SkipTurn(current));
return;
}
}
@@ -177,7 +177,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.NoOptionalCard(current));
assertTrue(game.SkipTurn(current));
}
}
@@ -578,7 +578,7 @@ class GameTest {
int charactersBefore = current.getTotCharacters();
assertTrue(game.PickOptionalTribeCardByIndex(current, index));
assertTrue(game.DrawUpperTribeCardByIndex(current, index));
assertEquals(charactersBefore + 1, current.getTotCharacters());
}
@@ -616,7 +616,7 @@ class GameTest {
int upperBuildingsBefore = game.getUpperListBuilding().size();
int foodBefore = current.getFoodValue();
assertTrue(game.PickOptionalBuildingCard(current, 0));
assertTrue(game.DrawUpperBuildingCardByIndex(current, 0));
assertEquals(buildingsBefore + 1, current.buildingCards.size());
assertEquals(upperBuildingsBefore - 1, game.getUpperListBuilding().size());
@@ -651,7 +651,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.NoOptionalCard(current));
assertTrue(game.SkipTurn(current));
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
assertNotEquals(current, game.getCurrentState().getCurrentPlayer());
@@ -785,9 +785,9 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertFalse(game.PickOptionalTribeCardByIndex(current, 0));
assertFalse(game.PickOptionalBuildingCard(current, 0));
assertFalse(game.NoOptionalCard(current));
assertFalse(game.DrawUpperTribeCardByIndex(current, 0));
assertFalse(game.DrawUpperBuildingCardByIndex(current, 0));
assertFalse(game.SkipTurn(current));
}
@Test
@@ -806,15 +806,15 @@ class GameTest {
Player wrongPlayer = current.equals(players.get(0)) ? players.get(1) : players.get(0);
assertFalse(game.PickOptionalTribeCardByIndex(wrongPlayer, 0));
assertFalse(game.PickOptionalBuildingCard(wrongPlayer, 0));
assertFalse(game.NoOptionalCard(wrongPlayer));
assertFalse(game.DrawUpperTribeCardByIndex(wrongPlayer, 0));
assertFalse(game.DrawUpperBuildingCardByIndex(wrongPlayer, 0));
assertFalse(game.SkipTurn(wrongPlayer));
assertFalse(game.PickOptionalTribeCardByIndex(current, -1));
assertFalse(game.PickOptionalTribeCardByIndex(current, 999));
assertFalse(game.DrawUpperTribeCardByIndex(current, -1));
assertFalse(game.DrawUpperTribeCardByIndex(current, 999));
assertFalse(game.PickOptionalBuildingCard(current, -1));
assertFalse(game.PickOptionalBuildingCard(current, 999));
assertFalse(game.DrawUpperBuildingCardByIndex(current, -1));
assertFalse(game.DrawUpperBuildingCardByIndex(current, 999));
}
@@ -949,7 +949,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.NoOptionalCard(current));
assertTrue(game.SkipTurn(current));
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertEquals(roundBefore + 1, game.getCurrentState().getRound());
@@ -1009,7 +1009,7 @@ class GameTest {
"There must be at least one upper building card to test that the player cannot buy it."
);
assertFalse(game.PickOptionalBuildingCard(current, 0));
assertFalse(game.DrawUpperBuildingCardByIndex(current, 0));
}
@Test
@@ -1228,7 +1228,7 @@ class GameTest {
.findFirst()
.orElseThrow();
assertFalse(game.SkipNoDrawable(wrongPlayer));
assertFalse(game.SkipTurn(wrongPlayer));
}
@Test
@@ -1255,7 +1255,7 @@ class GameTest {
"The test requires at least one drawable tribe card."
);
assertFalse(game.SkipNoDrawable(current));
assertFalse(game.SkipTurn(current));
}
@Test
@@ -1282,7 +1282,7 @@ class GameTest {
int charactersBefore = current.getTotCharacters();
int upperSizeBefore = game.getUpperListTribeCards().size();
assertFalse(game.PickOptionalTribeCardByIndex(current, eventIndex));
assertFalse(game.DrawUpperTribeCardByIndex(current, eventIndex));
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
assertEquals(current, game.getCurrentState().getCurrentPlayer());
@@ -1352,7 +1352,7 @@ class GameTest {
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertFalse(game.SkipNoDrawable(current));
assertFalse(game.SkipTurn(current));
}
@Test