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

Fix: Game Init

Browse Source
This commit is contained in:
rubenpirreram
2026-05-03 17:43:52 +02:00
parent e50cf43b73
commit 7e8421387d
5 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java
+7 -7
View File
@@ -36,7 +36,7 @@ class GameControllerTest {
assertTrue(controller.slotChoice(current.getUserName(), i));
}
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
return order;
}
@@ -89,12 +89,12 @@ class GameControllerTest {
private void resolveActionsUntilOptionalCardEffect(Game game, GameController controller) {
int guard = 0;
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS && guard < 100) {
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS && guard < 100) {
guard++;
resolveOneMandatoryAction(game, controller);
}
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
}
private void resolveOneMandatoryAction(Game game, GameController controller) {
@@ -154,7 +154,7 @@ class GameControllerTest {
assertTrue(controller.slotChoice(current.getUserName(), slotIndexes[i]));
}
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
return order;
}
@@ -206,7 +206,7 @@ class GameControllerTest {
Queue<Player> order = completeSlotChoice(game, controller);
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(order.poll(), game.getCurrentState().getCurrentPlayer());
}
@@ -320,7 +320,7 @@ class GameControllerTest {
assertTrue(controller.slotChoice(current.getUserName(), i));
}
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
Player tempPlayer = players.poll();
assertNotNull(tempPlayer);
@@ -395,7 +395,7 @@ class GameControllerTest {
completeSlotChoice(game, controller);
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
String cur = game.getCurrentState().getCurrentPlayer().getUserName();
src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
+3 -3
View File
@@ -70,7 +70,7 @@ class CurrentStateTest {
void getGameStage() {
Player p = new Player("test");
Slot s = new Slot('A');
GameStages g = GameStages.RESOLVING_ACTIONS;
GameStages g = GameStages.RES_ACTIONS;
CurrentState curr = new CurrentState();
curr.PlayerUpdate(p, s);
curr.GameStageUpdate(g);
@@ -122,12 +122,12 @@ class CurrentStateTest {
void gameStageUpdate() {
Player p = new Player("test");
Slot s = new Slot('A');
GameStages g = GameStages.RESOLVING_ACTIONS;
GameStages g = GameStages.RES_ACTIONS;
CurrentState curr = new CurrentState();
assertEquals(GameStages.WAITING, curr.getGameStage());
curr.PlayerUpdate(p, s);
curr.GameStageUpdate(g);
assertEquals(GameStages.RESOLVING_ACTIONS, curr.getGameStage());
assertEquals(GameStages.RES_ACTIONS, curr.getGameStage());
}
@Test
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+17 -17
View File
@@ -30,7 +30,7 @@ class GameTest {
assertTrue(game.SlotChoiceByIndex(current, i));
}
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
return order;
}
@@ -63,7 +63,7 @@ class GameTest {
}
private void resolveAllMandatoryActions(Game game) {
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS) {
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS) {
resolveOneMandatoryAction(game);
}
}
@@ -126,15 +126,15 @@ class GameTest {
}
private void resolveActionsUntilOptionalCardEffect(Game game) {
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS) {
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS) {
resolveOneMandatoryAction(game);
}
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
}
private void resolveOptionalPhaseIfPresent(Game game) {
while (game.getCurrentState().getGameStage() == GameStages.OPTIONAL_CARD_EFFECT) {
while (game.getCurrentState().getGameStage() == GameStages.OPT_CARD_E) {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
@@ -147,7 +147,7 @@ class GameTest {
completeSlotChoice(game);
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
resolveAllMandatoryActions(game);
@@ -157,7 +157,7 @@ class GameTest {
private void resolveCurrentPlayerCompletely(Game game, Player expectedPlayer) {
assertEquals(expectedPlayer, game.getCurrentState().getCurrentPlayer());
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS
&& expectedPlayer.equals(game.getCurrentState().getCurrentPlayer())) {
resolveOneMandatoryAction(game);
}
@@ -357,7 +357,7 @@ class GameTest {
assertNotNull(thirdPlayer);
assertEquals(thirdPlayer, game.getCurrentState().getCurrentPlayer());
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS
&& thirdPlayer.equals(game.getCurrentState().getCurrentPlayer())) {
resolveOneMandatoryAction(game);
}
@@ -497,7 +497,7 @@ class GameTest {
assertTrue(game.NoOptionalCard(current));
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
assertNotEquals(current, game.getCurrentState().getCurrentPlayer());
}
@@ -662,7 +662,7 @@ class GameTest {
assertDoesNotThrow(() -> resolveAllMandatoryActions(game));
assertNotEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertNotEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
}
@@ -879,7 +879,7 @@ class GameTest {
completeSlotChoice(game);
}
if (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS) {
if (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS) {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
@@ -920,7 +920,7 @@ class GameTest {
resolveOneMandatoryAction(game);
}
if (game.getCurrentState().getGameStage() == GameStages.OPTIONAL_CARD_EFFECT) {
if (game.getCurrentState().getGameStage() == GameStages.OPT_CARD_E) {
resolveOptionalPhaseIfPresent(game);
}
@@ -939,7 +939,7 @@ class GameTest {
completeSlotChoice(game);
while (game.getCurrentState().getGameStage() == GameStages.RESOLVING_ACTIONS) {
while (game.getCurrentState().getGameStage() == GameStages.RES_ACTIONS) {
Player current = game.getCurrentState().getCurrentPlayer();
if (game.getCurrentState().getNUpper() > 0
@@ -977,7 +977,7 @@ class GameTest {
Player thirdChooser = game.getCurrentState().getCurrentPlayer();
assertTrue(game.SlotChoiceByIndex(thirdChooser, 1));
assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(GameStages.RES_ACTIONS, game.getCurrentState().getGameStage());
assertEquals(secondChooser, game.getCurrentState().getCurrentPlayer());
@@ -1009,7 +1009,7 @@ class GameTest {
completeSlotChoice(game);
resolveAllMandatoryActions(game);
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
assertDoesNotThrow(() -> resolveOptionalPhaseIfPresent(game));
@@ -1032,7 +1032,7 @@ class GameTest {
completeSlotChoice(game);
resolveAllMandatoryActions(game);
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
Player player = players.get(0);
@@ -1068,7 +1068,7 @@ class GameTest {
completeSlotChoice(game);
resolveAllMandatoryActions(game);
assertEquals(GameStages.OPTIONAL_CARD_EFFECT, game.getCurrentState().getGameStage());
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
Player player = players.get(0);
assertNotNull(player);