From 89043c8393df12ccb83b5e355795fa81c3d157f5 Mon Sep 17 00:00:00 2001 From: aleandro Date: Fri, 19 Jun 2026 18:33:51 +0200 Subject: [PATCH] Max player username lenght is 10 --- README.md | 10 ++++---- .../it/polimi/ingsw/gc14/Model/Player.java | 2 +- .../it/polimi/ingsw/gc14/Model/GameTest.java | 24 +++++++++---------- .../ingsw/gc14/Model/Orders/Order2Test.java | 4 ++-- .../ingsw/gc14/Model/Orders/Order3Test.java | 6 ++--- .../ingsw/gc14/Model/Orders/Order4Test.java | 10 ++++---- .../ingsw/gc14/Model/Orders/Order5Test.java | 11 ++++----- .../polimi/ingsw/gc14/Model/PlayerTest.java | 12 +++++----- 8 files changed, 38 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 37d417c..7cceaf8 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,11 @@ java -jar ClientTUI.jar All'avvio il client chiede interattivamente: -| Campo | Valori accettati | -|---|---| -| `Username` | stringa libera, max 32 caratteri | -| `Number of players [2-5]` | intero tra 2 e 5 | -| `Network [rmi/tcp]` | `rmi` oppure `tcp` | +| Campo | Valori accettati | +|---|------------------------------------------------------| +| `Username` | stringa libera, max 10 caratteri | +| `Number of players [2-5]` | intero tra 2 e 5 | +| `Network [rmi/tcp]` | `rmi` oppure `tcp` | | `Server IP [localhost]` | indirizzo IP del server; invio vuoto usa `localhost` | ### Comandi disponibili in-game (TUI) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index f231186..909b55b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -20,7 +20,7 @@ public class Player implements Serializable { /** * The maximum length allowed for the username string. */ - private static final int MAX_USERNAME_LENGTH = 32; + private static final int MAX_USERNAME_LENGTH = 10; /** * Identifier for the {@code Player} when displaying the game through the GUI. 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 33f9f8a..d534095 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -793,7 +793,7 @@ class GameTest { void optionalMethodsShouldRejectWrongPlayerAndInvalidIndexes() { Game game = new Game(3); - List players = addPlayers(game, 3, "optional_invalid_"); + List players = addPlayers(game, 3, "invalid"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); @@ -936,7 +936,7 @@ class GameTest { void roundShouldAdvanceAfterOnlyOptionalPlayerSkipsOptionalCard() { Game game = new Game(3); - List players = addPlayers(game, 3, "single_optional_"); + List players = addPlayers(game, 3, "single"); players.get(0).getBuildingCards().add(new BuildingCard(12, 1, 1, 1)); @@ -1082,7 +1082,7 @@ class GameTest { void drawBuildingShouldReturnFalseIfPlayerCannotPay() { Game game = new Game(3); - addPlayers(game, 3, "no_food_upper_building_"); + addPlayers(game, 3, "no_food"); for (int safety = 0; safety < 300; safety++) { @@ -1333,7 +1333,7 @@ class GameTest { void disconnectedCurrentPlayerDuringSlotChoiceShouldAdvanceTurn() { Game game = new Game(3); - addPlayers(game, 3, "disconnect_slot_"); + addPlayers(game, 3, "disconnect_slot"); Player current = game.getCurrentState().getCurrentPlayer(); assertNotNull(current); @@ -1349,7 +1349,7 @@ class GameTest { void disconnectedPlayerShouldReturnFalseIfAlreadyDisconnected() { Game game = new Game(3); - addPlayers(game, 3, "disconnect_twice_"); + addPlayers(game, 3, "disconnect"); Player current = game.getCurrentState().getCurrentPlayer(); @@ -1376,7 +1376,7 @@ class GameTest { void clearDisconnectedShouldEmptyDisconnectedPlayersMap() { Game game = new Game(3); - addPlayers(game, 3, "clear_disconnect_"); + addPlayers(game, 3, "disconnect"); Player current = game.getCurrentState().getCurrentPlayer(); @@ -1393,7 +1393,7 @@ class GameTest { void drawLowerBuildingShouldReturnFalseIfPlayerCannotPay() { Game game = new Game(3); - addPlayers(game, 3, "no_food_lower_building_"); + addPlayers(game, 3, "no_food"); 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_lower_building_"); + List players = addPlayers(game, 3, "wrong"); for (int safety = 0; safety < 300; safety++) { @@ -1572,7 +1572,7 @@ class GameTest { void slotChoiceShouldNotAddFoodWhenChoosingNonASlot() { Game game = new Game(5); - addPlayers(game, 5, "slot_non_a_"); + addPlayers(game, 5, "non_a"); 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, "final_building_scoring_"); + List players = addPlayers(game, 3, "build_scor"); 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, "final_builder_scoring_"); + List players = addPlayers(game, 3, "builder_scor"); 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, "final_inventor_scoring_"); + List players = addPlayers(game, 3, "inventor_scor"); giveOptionalEffectToAllPlayers(players.get(0), players.get(1), players.get(2)); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java index 3453764..1b6fe47 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java @@ -157,8 +157,8 @@ class Order2Test { @Test void toStringTest() { - String usr1 = "wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"; - String usr2 = "L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"; + String usr1 = "test1"; + String usr2 = "test2"; Player p1 = new Player(usr1); Player p2 = new Player(usr2); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java index 863efd9..50693bb 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java @@ -182,9 +182,9 @@ class Order3Test { } @Test void toStringTest() { - String usr1 = "wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"; - String usr2 = "L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"; - String usr3 = "L*Ncw1rjjrF2xn%H@4d1iC@&NNIooQQk"; + String usr1 = "test1"; + String usr2 = "test2"; + String usr3 = "test3"; Player p1 = new Player(usr1); Player p2 = new Player(usr2); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java index 03a1c9e..cda4d79 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java @@ -273,10 +273,10 @@ class Order4Test { @Test void toStringTest() { - String usr1 = "wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"; - String usr2 = "L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"; - String usr3 = "L*Ncw1rjjrF2xn%H@4d1iC@&NNIooQQk"; - String usr4 = "L*Ncw1rjkrF2xn%H@4d1iC@&NNIooQQk"; + String usr1 = "test1"; + String usr2 = "test2"; + String usr3 = "test3"; + String usr4 = "test4"; Player p1 = new Player(usr1); Player p2 = new Player(usr2); @@ -331,7 +331,5 @@ class Order4Test { assertTrue(order.toString().contains("+1๐Ÿ–")); assertTrue(order.toString().contains("--")); assertTrue(order.toString().contains("-1๐Ÿ–/-2๐Ÿ…")); - - //TODO testare IndexOutOfBoundsException } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java index fff545f..8330dd9 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java @@ -362,11 +362,11 @@ class Order5Test { } @Test void toStringTest() { - String usr1 = "wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"; - String usr2 = "L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"; - String usr3 = "L*Ncw1rjjrF2xn%H@4d1iC@&NNIooQQk"; - String usr4 = "L*Ncw1rjkrF2xn%H@4d1iC@&NNIooQQk"; - String usr5 = "L*pcw1rjjrF2xn%H@4d1iC@&NNIooQQk"; + String usr1 = "test1"; + String usr2 = "test2"; + String usr3 = "test3"; + String usr4 = "test4"; + String usr5 = "test5"; Player p1 = new Player(usr1); Player p2 = new Player(usr2); @@ -429,7 +429,6 @@ class Order5Test { assertTrue(order.toString().contains("--")); assertTrue(order.toString().contains("-1๐Ÿ–/-2๐Ÿ…")); - //TODO capire come รจ testato IndexOutOfBoundsExceptions } } 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 b3e6025..3df5515 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -18,7 +18,7 @@ class PlayerTest { String usr = "test"; Player p = new Player(usr); assertEquals(usr, p.getUserName()); - assertTrue(p.getUserName().length() <= 32); + assertTrue(p.getUserName().length() <= 10); assertFalse(p.getUserName().isEmpty()); } @@ -153,12 +153,12 @@ class PlayerTest { @Test void setUserName() { - String UserName = "abcdabcdabcdabcdabcdabcdabcdabcd"; + String UserName = "abcdabcdab"; Player p = new Player(UserName); assertEquals(0, p.getFoodValue()); assertEquals(0, p.getPrestigeValue()); - assertEquals(32, p.getUserName().length()); - String username = "abcdabcdabcda"; + assertEquals(10, p.getUserName().length()); + String username = "abcdabcdab"; p = new Player(username); //Constructor default values testing @@ -173,7 +173,7 @@ class PlayerTest { assertTrue(p.getArtists().isEmpty()); assertTrue(p.getBuildingCards().isEmpty()); - assertTrue(p.getUserName().length() <= 32); + assertTrue(p.getUserName().length() <= 10); assertFalse(p.getUserName().isEmpty()); } @@ -210,7 +210,7 @@ class PlayerTest { assertTrue(artistString.contains("Artists:")); assertTrue(artistString.contains("BUILDING CARDS")); - Player onlyBuilder = new Player("onlyBuilder"); + Player onlyBuilder = new Player("onlyBuilde"); onlyBuilder.getBuilders().add(new Builder(1, 1, 1)); String builderString = onlyBuilder.toString();