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

Fix: Fixed Issues With Max Player Username Length (Changed From 32 To 10) In PlayerTest.java And GameTest.java.

Browse Source
This commit is contained in:
GabrieleRadice
2026-06-19 18:46:07 +02:00
parent 9e7a1f7662
commit fbaf7d0652
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+27 -27
View File
@@ -703,7 +703,7 @@ class GameTest {
void slotChoiceByIndexShouldReturnFalseOutsideSlotChoiceStage() { void slotChoiceByIndexShouldReturnFalseOutsideSlotChoiceStage() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "slot_out_"); addPlayers(game, 3, "so_");
completeSlotChoice(game); completeSlotChoice(game);
@@ -779,7 +779,7 @@ class GameTest {
void optionalMethodsShouldReturnFalseOutsideOptionalState() { void optionalMethodsShouldReturnFalseOutsideOptionalState() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "optional_out_"); addPlayers(game, 3, "oo_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current); assertNotNull(current);
@@ -793,7 +793,7 @@ class GameTest {
void optionalMethodsShouldRejectWrongPlayerAndInvalidIndexes() { void optionalMethodsShouldRejectWrongPlayerAndInvalidIndexes() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "invalid"); List<Player> players = addPlayers(game, 3, "i_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -822,7 +822,7 @@ class GameTest {
void shouldNotCrashWhenNoPlayerHasOptionalEffect() { void shouldNotCrashWhenNoPlayerHasOptionalEffect() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "no_optional_"); addPlayers(game, 3, "no_");
completeSlotChoice(game); completeSlotChoice(game);
@@ -927,8 +927,8 @@ class GameTest {
void addPlayerShouldRejectDifferentPlayerWithSameUsername() { void addPlayerShouldRejectDifferentPlayerWithSameUsername() {
Game game = new Game(3); Game game = new Game(3);
assertTrue(game.addPlayer(new Player("same_name"))); assertTrue(game.addPlayer(new Player("sn_")));
assertFalse(game.addPlayer(new Player("same_name"))); assertFalse(game.addPlayer(new Player("sn_")));
} }
@Test @Test
@@ -936,7 +936,7 @@ class GameTest {
void roundShouldAdvanceAfterOnlyOptionalPlayerSkipsOptionalCard() { void roundShouldAdvanceAfterOnlyOptionalPlayerSkipsOptionalCard() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "single"); List<Player> players = addPlayers(game, 3, "s_");
players.get(0).getBuildingCards().add(new BuildingCard(12, 1, 1, 1)); players.get(0).getBuildingCards().add(new BuildingCard(12, 1, 1, 1));
@@ -985,7 +985,7 @@ class GameTest {
@Test @Test
void pickOptionalBuildingCardShouldReturnFalseIfPlayerCannotPay() { void pickOptionalBuildingCardShouldReturnFalseIfPlayerCannotPay() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "no_food_"); List<Player> players = addPlayers(game, 3, "nf_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -1016,7 +1016,7 @@ class GameTest {
void shouldDrawLowerBuildingWhenAvailableAndPlayerCanPay() { void shouldDrawLowerBuildingWhenAvailableAndPlayerCanPay() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "lower_building_"); addPlayers(game, 3, "lb_");
for (int safety = 0; safety < 300; safety++) { for (int safety = 0; safety < 300; safety++) {
@@ -1082,7 +1082,7 @@ class GameTest {
void drawBuildingShouldReturnFalseIfPlayerCannotPay() { void drawBuildingShouldReturnFalseIfPlayerCannotPay() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "no_food"); addPlayers(game, 3, "nf_");
for (int safety = 0; safety < 300; safety++) { for (int safety = 0; safety < 300; safety++) {
@@ -1142,7 +1142,7 @@ class GameTest {
@Test @Test
void shouldResolvePlayersAccordingToSlotOrder() { void shouldResolvePlayersAccordingToSlotOrder() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "slot_order_"); addPlayers(game, 3, "so_");
Player firstChooser = game.getCurrentState().getCurrentPlayer(); Player firstChooser = game.getCurrentState().getCurrentPlayer();
assertTrue(game.slotChoiceByIndex(firstChooser, 2)); assertTrue(game.slotChoiceByIndex(firstChooser, 2));
@@ -1171,7 +1171,7 @@ class GameTest {
void endGameShouldNotCrashWhenTriggeredAfterRoundTen() { void endGameShouldNotCrashWhenTriggeredAfterRoundTen() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "end_game_"); List<Player> players = addPlayers(game, 3, "eg_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -1217,7 +1217,7 @@ class GameTest {
void skipDrawingShouldRejectWrongPlayer() { void skipDrawingShouldRejectWrongPlayer() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "skip_wrong_"); List<Player> players = addPlayers(game, 3, "sw_");
completeSlotChoice(game); completeSlotChoice(game);
@@ -1234,7 +1234,7 @@ class GameTest {
void skipDrawingShouldReturnFalseWhenDrawableCardsExist() { void skipDrawingShouldReturnFalseWhenDrawableCardsExist() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "skip_drawable_"); addPlayers(game, 3, "sd_");
completeSlotChoice(game); completeSlotChoice(game);
@@ -1262,7 +1262,7 @@ class GameTest {
void pickOptionalTribeCardShouldRejectEventCardIfPresent() { void pickOptionalTribeCardShouldRejectEventCardIfPresent() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "optional_event_"); List<Player> players = addPlayers(game, 3, "oe_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -1319,7 +1319,7 @@ class GameTest {
void skipDrawingShouldRejectOutsideResolvingActions() { void skipDrawingShouldRejectOutsideResolvingActions() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "skip_out_"); addPlayers(game, 3, "so_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current); assertNotNull(current);
@@ -1333,7 +1333,7 @@ class GameTest {
void disconnectedCurrentPlayerDuringSlotChoiceShouldAdvanceTurn() { void disconnectedCurrentPlayerDuringSlotChoiceShouldAdvanceTurn() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "disconnect_slot"); addPlayers(game, 3, "ds_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current); assertNotNull(current);
@@ -1349,7 +1349,7 @@ class GameTest {
void disconnectedPlayerShouldReturnFalseIfAlreadyDisconnected() { void disconnectedPlayerShouldReturnFalseIfAlreadyDisconnected() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "disconnect"); addPlayers(game, 3, "d_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
@@ -1361,7 +1361,7 @@ class GameTest {
void reconnectPlayerShouldRemovePlayerFromDisconnectedMapDuringSlotChoice() { void reconnectPlayerShouldRemovePlayerFromDisconnectedMapDuringSlotChoice() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "reconnect_"); addPlayers(game, 3, "r_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
@@ -1376,7 +1376,7 @@ class GameTest {
void clearDisconnectedShouldEmptyDisconnectedPlayersMap() { void clearDisconnectedShouldEmptyDisconnectedPlayersMap() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "disconnect"); addPlayers(game, 3, "d_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
@@ -1393,7 +1393,7 @@ class GameTest {
void drawLowerBuildingShouldReturnFalseIfPlayerCannotPay() { void drawLowerBuildingShouldReturnFalseIfPlayerCannotPay() {
Game game = new Game(3); Game game = new Game(3);
addPlayers(game, 3, "no_food"); addPlayers(game, 3, "nf_");
for (int safety = 0; safety < 300; safety++) { for (int safety = 0; safety < 300; safety++) {
@@ -1455,7 +1455,7 @@ class GameTest {
void drawLowerBuildingShouldRejectWrongPlayer() { void drawLowerBuildingShouldRejectWrongPlayer() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "wrong"); List<Player> players = addPlayers(game, 3, "w");
for (int safety = 0; safety < 300; safety++) { for (int safety = 0; safety < 300; safety++) {
@@ -1526,7 +1526,7 @@ class GameTest {
void slotChoiceShouldAddFoodWhenChoosingSlotAInFivePlayerGame() { void slotChoiceShouldAddFoodWhenChoosingSlotAInFivePlayerGame() {
Game game = new Game(5); Game game = new Game(5);
addPlayers(game, 5, "slot_a_"); addPlayers(game, 5, "sa_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current); assertNotNull(current);
@@ -1572,7 +1572,7 @@ class GameTest {
void slotChoiceShouldNotAddFoodWhenChoosingNonASlot() { void slotChoiceShouldNotAddFoodWhenChoosingNonASlot() {
Game game = new Game(5); Game game = new Game(5);
addPlayers(game, 5, "non_a"); addPlayers(game, 5, "na_");
Player current = game.getCurrentState().getCurrentPlayer(); Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current); assertNotNull(current);
@@ -1589,7 +1589,7 @@ class GameTest {
void endGameShouldAddExactBuildingPrestigeValues() { void endGameShouldAddExactBuildingPrestigeValues() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "build_scor"); List<Player> players = addPlayers(game, 3, "bs_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -1653,7 +1653,7 @@ class GameTest {
void endGameShouldAddExactBuilderPrestigeValues() { void endGameShouldAddExactBuilderPrestigeValues() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "builder_scor"); List<Player> players = addPlayers(game, 3, "bs_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
@@ -1709,7 +1709,7 @@ class GameTest {
void endGameShouldAddExactInventorPrestigeValues() { void endGameShouldAddExactInventorPrestigeValues() {
Game game = new Game(3); Game game = new Game(3);
List<Player> players = addPlayers(game, 3, "inventor_scor"); List<Player> players = addPlayers(game, 3, "is_");
giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2));
src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java
+4 -4
View File
@@ -210,14 +210,14 @@ class PlayerTest {
assertTrue(artistString.contains("Artists:")); assertTrue(artistString.contains("Artists:"));
assertTrue(artistString.contains("BUILDING CARDS")); assertTrue(artistString.contains("BUILDING CARDS"));
Player onlyBuilder = new Player("onlyBuilde"); Player onlyBuilder = new Player("onlyBldr");
onlyBuilder.getBuilders().add(new Builder(1, 1, 1)); onlyBuilder.getBuilders().add(new Builder(1, 1, 1));
String builderString = onlyBuilder.toString(); String builderString = onlyBuilder.toString();
assertTrue(builderString.contains("Builders:")); assertTrue(builderString.contains("Builders:"));
assertTrue(builderString.contains("BUILDING CARDS")); assertTrue(builderString.contains("BUILDING CARDS"));
Player onlyGatherer = new Player("onlyGatherer"); Player onlyGatherer = new Player("onlyGathr");
onlyGatherer.getGatherers().add(new Gatherer(1, 1)); onlyGatherer.getGatherers().add(new Gatherer(1, 1));
String gathererString = onlyGatherer.toString(); String gathererString = onlyGatherer.toString();
@@ -231,14 +231,14 @@ class PlayerTest {
assertTrue(shamanString.contains("Shamans:")); assertTrue(shamanString.contains("Shamans:"));
assertTrue(shamanString.contains("BUILDING CARDS")); assertTrue(shamanString.contains("BUILDING CARDS"));
Player onlyInventor = new Player("onlyInventor"); Player onlyInventor = new Player("onlyInv");
onlyInventor.getInventors().add(new Inventor(1, 1)); onlyInventor.getInventors().add(new Inventor(1, 1));
String inventorString = onlyInventor.toString(); String inventorString = onlyInventor.toString();
assertTrue(inventorString.contains("Inventors:")); assertTrue(inventorString.contains("Inventors:"));
assertTrue(inventorString.contains("BUILDING CARDS")); assertTrue(inventorString.contains("BUILDING CARDS"));
Player onlyHunter = new Player("onlyHunter"); Player onlyHunter = new Player("onlyHntr");
onlyHunter.getHunters().add(new Hunter(1, true)); onlyHunter.getHunters().add(new Hunter(1, true));
String hunterString = onlyHunter.toString(); String hunterString = onlyHunter.toString();