From fbaf7d065207469a3e47f7b8ff4175960b30b483 Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Fri, 19 Jun 2026 18:46:07 +0200 Subject: [PATCH] Fix: Fixed Issues With Max Player Username Length (Changed From 32 To 10) In PlayerTest.java And GameTest.java. --- .../it/polimi/ingsw/gc14/Model/GameTest.java | 54 +++++++++---------- .../polimi/ingsw/gc14/Model/PlayerTest.java | 8 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java index d534095..6b6b586 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -703,7 +703,7 @@ class GameTest { void slotChoiceByIndexShouldReturnFalseOutsideSlotChoiceStage() { Game game = new Game(3); - addPlayers(game, 3, "slot_out_"); + addPlayers(game, 3, "so_"); completeSlotChoice(game); @@ -779,7 +779,7 @@ class GameTest { void optionalMethodsShouldReturnFalseOutsideOptionalState() { Game game = new Game(3); - addPlayers(game, 3, "optional_out_"); + addPlayers(game, 3, "oo_"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -793,7 +793,7 @@ class GameTest { void optionalMethodsShouldRejectWrongPlayerAndInvalidIndexes() { Game game = new Game(3); - List players = addPlayers(game, 3, "invalid"); + List players = addPlayers(game, 3, "i_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -822,7 +822,7 @@ class GameTest { void shouldNotCrashWhenNoPlayerHasOptionalEffect() { Game game = new Game(3); - addPlayers(game, 3, "no_optional_"); + addPlayers(game, 3, "no_"); completeSlotChoice(game); @@ -927,8 +927,8 @@ class GameTest { void addPlayerShouldRejectDifferentPlayerWithSameUsername() { Game game = new Game(3); - assertTrue(game.addPlayer(new Player("same_name"))); - assertFalse(game.addPlayer(new Player("same_name"))); + assertTrue(game.addPlayer(new Player("sn_"))); + assertFalse(game.addPlayer(new Player("sn_"))); } @Test @@ -936,7 +936,7 @@ class GameTest { void roundShouldAdvanceAfterOnlyOptionalPlayerSkipsOptionalCard() { Game game = new Game(3); - List players = addPlayers(game, 3, "single"); + List players = addPlayers(game, 3, "s_"); players.get(0).getBuildingCards().add(new BuildingCard(12, 1, 1, 1)); @@ -985,7 +985,7 @@ class GameTest { @Test void pickOptionalBuildingCardShouldReturnFalseIfPlayerCannotPay() { Game game = new Game(3); - List players = addPlayers(game, 3, "no_food_"); + List players = addPlayers(game, 3, "nf_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -1016,7 +1016,7 @@ class GameTest { void shouldDrawLowerBuildingWhenAvailableAndPlayerCanPay() { Game game = new Game(3); - addPlayers(game, 3, "lower_building_"); + addPlayers(game, 3, "lb_"); for (int safety = 0; safety < 300; safety++) { @@ -1082,7 +1082,7 @@ class GameTest { void drawBuildingShouldReturnFalseIfPlayerCannotPay() { Game game = new Game(3); - addPlayers(game, 3, "no_food"); + addPlayers(game, 3, "nf_"); for (int safety = 0; safety < 300; safety++) { @@ -1142,7 +1142,7 @@ class GameTest { @Test void shouldResolvePlayersAccordingToSlotOrder() { Game game = new Game(3); - addPlayers(game, 3, "slot_order_"); + addPlayers(game, 3, "so_"); Player firstChooser = game.getCurrentState().getCurrentPlayer(); assertTrue(game.slotChoiceByIndex(firstChooser, 2)); @@ -1171,7 +1171,7 @@ class GameTest { void endGameShouldNotCrashWhenTriggeredAfterRoundTen() { Game game = new Game(3); - List players = addPlayers(game, 3, "end_game_"); + List players = addPlayers(game, 3, "eg_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -1217,7 +1217,7 @@ class GameTest { void skipDrawingShouldRejectWrongPlayer() { Game game = new Game(3); - List players = addPlayers(game, 3, "skip_wrong_"); + List players = addPlayers(game, 3, "sw_"); completeSlotChoice(game); @@ -1234,7 +1234,7 @@ class GameTest { void skipDrawingShouldReturnFalseWhenDrawableCardsExist() { Game game = new Game(3); - addPlayers(game, 3, "skip_drawable_"); + addPlayers(game, 3, "sd_"); completeSlotChoice(game); @@ -1262,7 +1262,7 @@ class GameTest { void pickOptionalTribeCardShouldRejectEventCardIfPresent() { Game game = new Game(3); - List players = addPlayers(game, 3, "optional_event_"); + List players = addPlayers(game, 3, "oe_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -1319,7 +1319,7 @@ class GameTest { void skipDrawingShouldRejectOutsideResolvingActions() { Game game = new Game(3); - addPlayers(game, 3, "skip_out_"); + addPlayers(game, 3, "so_"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -1333,7 +1333,7 @@ class GameTest { void disconnectedCurrentPlayerDuringSlotChoiceShouldAdvanceTurn() { Game game = new Game(3); - addPlayers(game, 3, "disconnect_slot"); + addPlayers(game, 3, "ds_"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -1349,7 +1349,7 @@ class GameTest { void disconnectedPlayerShouldReturnFalseIfAlreadyDisconnected() { Game game = new Game(3); - addPlayers(game, 3, "disconnect"); + addPlayers(game, 3, "d_"); Player current = game.getCurrentState().getCurrentPlayer(); @@ -1361,7 +1361,7 @@ class GameTest { void reconnectPlayerShouldRemovePlayerFromDisconnectedMapDuringSlotChoice() { Game game = new Game(3); - addPlayers(game, 3, "reconnect_"); + addPlayers(game, 3, "r_"); Player current = game.getCurrentState().getCurrentPlayer(); @@ -1376,7 +1376,7 @@ class GameTest { void clearDisconnectedShouldEmptyDisconnectedPlayersMap() { Game game = new Game(3); - addPlayers(game, 3, "disconnect"); + addPlayers(game, 3, "d_"); Player current = game.getCurrentState().getCurrentPlayer(); @@ -1393,7 +1393,7 @@ class GameTest { void drawLowerBuildingShouldReturnFalseIfPlayerCannotPay() { Game game = new Game(3); - addPlayers(game, 3, "no_food"); + addPlayers(game, 3, "nf_"); for (int safety = 0; safety < 300; safety++) { @@ -1455,7 +1455,7 @@ class GameTest { void drawLowerBuildingShouldRejectWrongPlayer() { Game game = new Game(3); - List players = addPlayers(game, 3, "wrong"); + List players = addPlayers(game, 3, "w"); for (int safety = 0; safety < 300; safety++) { @@ -1526,7 +1526,7 @@ class GameTest { void slotChoiceShouldAddFoodWhenChoosingSlotAInFivePlayerGame() { Game game = new Game(5); - addPlayers(game, 5, "slot_a_"); + addPlayers(game, 5, "sa_"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -1572,7 +1572,7 @@ class GameTest { void slotChoiceShouldNotAddFoodWhenChoosingNonASlot() { Game game = new Game(5); - addPlayers(game, 5, "non_a"); + addPlayers(game, 5, "na_"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -1589,7 +1589,7 @@ class GameTest { void endGameShouldAddExactBuildingPrestigeValues() { Game game = new Game(3); - List players = addPlayers(game, 3, "build_scor"); + List players = addPlayers(game, 3, "bs_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -1653,7 +1653,7 @@ class GameTest { void endGameShouldAddExactBuilderPrestigeValues() { Game game = new Game(3); - List players = addPlayers(game, 3, "builder_scor"); + List players = addPlayers(game, 3, "bs_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -1709,7 +1709,7 @@ class GameTest { void endGameShouldAddExactInventorPrestigeValues() { Game game = new Game(3); - List players = addPlayers(game, 3, "inventor_scor"); + List players = addPlayers(game, 3, "is_"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java index 3df5515..8c10495 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -210,14 +210,14 @@ class PlayerTest { assertTrue(artistString.contains("Artists:")); assertTrue(artistString.contains("BUILDING CARDS")); - Player onlyBuilder = new Player("onlyBuilde"); + Player onlyBuilder = new Player("onlyBldr"); onlyBuilder.getBuilders().add(new Builder(1, 1, 1)); String builderString = onlyBuilder.toString(); assertTrue(builderString.contains("Builders:")); assertTrue(builderString.contains("BUILDING CARDS")); - Player onlyGatherer = new Player("onlyGatherer"); + Player onlyGatherer = new Player("onlyGathr"); onlyGatherer.getGatherers().add(new Gatherer(1, 1)); String gathererString = onlyGatherer.toString(); @@ -231,14 +231,14 @@ class PlayerTest { assertTrue(shamanString.contains("Shamans:")); assertTrue(shamanString.contains("BUILDING CARDS")); - Player onlyInventor = new Player("onlyInventor"); + Player onlyInventor = new Player("onlyInv"); onlyInventor.getInventors().add(new Inventor(1, 1)); String inventorString = onlyInventor.toString(); assertTrue(inventorString.contains("Inventors:")); assertTrue(inventorString.contains("BUILDING CARDS")); - Player onlyHunter = new Player("onlyHunter"); + Player onlyHunter = new Player("onlyHntr"); onlyHunter.getHunters().add(new Hunter(1, true)); String hunterString = onlyHunter.toString();