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

Refactor of network stack

Browse Source
This commit is contained in:
aleandro
2026-06-09 19:23:58 +02:00
parent 73f3d152af
commit 2fb43c385b
18 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java
+16 -16
View File
@@ -29,7 +29,7 @@ class GameControllerTest {
Totems selectedTotem = availableTotems.get(0);
assertTrue(controller.TotemChoice(
assertTrue(controller.totemChoice(
current.getUserName(),
selectedTotem.name()
));
@@ -149,7 +149,7 @@ class GameControllerTest {
if (game.getCurrentState().getNUpper() == 0
|| game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard)) {
assertTrue(controller.SkipTurn(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.SkipTurn(username));
assertTrue(controller.skipTurn(username));
return;
}
}
@@ -250,7 +250,7 @@ class GameControllerTest {
Totems selectedTotem = game.getAvailableTotems().get(0);
assertFalse(controller.TotemChoice(wrongUsername, selectedTotem.name()));
assertFalse(controller.totemChoice(wrongUsername, selectedTotem.name()));
}
@Test
@@ -261,7 +261,7 @@ class GameControllerTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(controller.DisconnectedPlayer(current.getUserName()));
assertTrue(controller.disconnectedPlayer(current.getUserName()));
assertTrue(game.disconnetedPlayers.containsKey(current));
assertTrue(game.disconnetedPlayers.get(current));
@@ -275,8 +275,8 @@ class GameControllerTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(controller.DisconnectedPlayer(current.getUserName()));
assertTrue(controller.ReconnectPlayer(current.getUserName()));
assertTrue(controller.disconnectedPlayer(current.getUserName()));
assertTrue(controller.reconnectPlayer(current.getUserName()));
}
@Test
@@ -289,13 +289,13 @@ class GameControllerTest {
assertFalse(controller.drawLowerTribeCard("ghost", 0));
assertFalse(controller.drawUpperBuildingCard("ghost", 0));
assertFalse(controller.drawLowerBuildingCard("ghost", 0));
assertFalse(controller.SkipTurn("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"));
assertFalse(controller.skipTurn("ghost"));
assertFalse(controller.totemChoice("ghost", Totems.values()[0].name()));
assertFalse(controller.disconnectedPlayer("ghost"));
assertFalse(controller.reconnectPlayer("ghost"));
}
@Test
@@ -625,7 +625,7 @@ class GameControllerTest {
assertTrue(optionalPlayer.buildingCards.stream()
.anyMatch(building -> building.getEffectId() == 12));
assertTrue(controller.SkipTurn(optionalPlayer.getUserName()));
assertTrue(controller.skipTurn(optionalPlayer.getUserName()));
}
@Test
@@ -695,7 +695,7 @@ class GameControllerTest {
assertFalse(controller.drawUpperTribeCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.drawUpperBuildingCard(wrongPlayer.getUserName(), 0));
assertFalse(controller.SkipTurn(wrongPlayer.getUserName()));
assertFalse(controller.skipTurn(wrongPlayer.getUserName()));
}
@Test
@@ -714,7 +714,7 @@ class GameControllerTest {
assertFalse(game.getLowerListTribeCards().isEmpty());
assertTrue(firstNonEventIndexOrMinusOne(game.getLowerListTribeCards()) != -1);
assertFalse(controller.SkipTurn(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.SkipTurn(current.getUserName()));
assertFalse(controller.skipTurn(current.getUserName()));
}
src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java
+21 -21
View File
@@ -31,7 +31,7 @@ class GameTest {
Totems selectedTotem = availableTotems.get(0);
assertTrue(game.TotemChoice(current, selectedTotem));
assertTrue(game.totemChoice(current, selectedTotem));
assertEquals(selectedTotem, current.totem);
}
@@ -119,7 +119,7 @@ class GameTest {
if(game.getCurrentState().getNUpper() == 0 || game.getUpperListTribeCards().stream().allMatch(TribeCard::IsEventCard))
{
assertTrue(game.SkipTurn(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.SkipTurn(current));
assertTrue(game.skipTurn(current));
return;
}
}
@@ -177,7 +177,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.SkipTurn(current));
assertTrue(game.skipTurn(current));
}
}
@@ -355,12 +355,12 @@ class GameTest {
Player firstPlayer = game.getCurrentState().getCurrentPlayer();
Totems chosenTotem = game.getAvailableTotems().get(0);
assertTrue(game.TotemChoice(firstPlayer, chosenTotem));
assertTrue(game.totemChoice(firstPlayer, chosenTotem));
Player secondPlayer = game.getCurrentState().getCurrentPlayer();
assertNotNull(secondPlayer);
assertFalse(game.TotemChoice(secondPlayer, chosenTotem));
assertFalse(game.totemChoice(secondPlayer, chosenTotem));
}
@Test
@@ -380,7 +380,7 @@ class GameTest {
Totems availableTotem = game.getAvailableTotems().get(0);
assertFalse(game.TotemChoice(wrongPlayer, availableTotem));
assertFalse(game.totemChoice(wrongPlayer, availableTotem));
}
@Test
@@ -400,7 +400,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
Totems chosenTotem = game.getAvailableTotems().get(0);
assertTrue(game.TotemChoice(current, chosenTotem));
assertTrue(game.totemChoice(current, chosenTotem));
assertEquals(initialAvailableTotems - 1, game.getAvailableTotems().size());
assertFalse(game.getAvailableTotems().contains(chosenTotem));
@@ -651,7 +651,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.SkipTurn(current));
assertTrue(game.skipTurn(current));
assertEquals(GameStages.OPT_CARD_E, game.getCurrentState().getGameStage());
assertNotEquals(current, game.getCurrentState().getCurrentPlayer());
@@ -787,7 +787,7 @@ class GameTest {
assertFalse(game.DrawUpperTribeCardByIndex(current, 0));
assertFalse(game.DrawUpperBuildingCardByIndex(current, 0));
assertFalse(game.SkipTurn(current));
assertFalse(game.skipTurn(current));
}
@Test
@@ -808,7 +808,7 @@ class GameTest {
assertFalse(game.DrawUpperTribeCardByIndex(wrongPlayer, 0));
assertFalse(game.DrawUpperBuildingCardByIndex(wrongPlayer, 0));
assertFalse(game.SkipTurn(wrongPlayer));
assertFalse(game.skipTurn(wrongPlayer));
assertFalse(game.DrawUpperTribeCardByIndex(current, -1));
assertFalse(game.DrawUpperTribeCardByIndex(current, 999));
@@ -949,7 +949,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.SkipTurn(current));
assertTrue(game.skipTurn(current));
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertEquals(roundBefore + 1, game.getCurrentState().getRound());
@@ -1228,7 +1228,7 @@ class GameTest {
.findFirst()
.orElseThrow();
assertFalse(game.SkipTurn(wrongPlayer));
assertFalse(game.skipTurn(wrongPlayer));
}
@Test
@@ -1255,7 +1255,7 @@ class GameTest {
"The test requires at least one drawable tribe card."
);
assertFalse(game.SkipTurn(current));
assertFalse(game.skipTurn(current));
}
@Test
@@ -1327,7 +1327,7 @@ class GameTest {
assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage());
assertFalse(game.SkipTurn(current));
assertFalse(game.skipTurn(current));
}
@Test
@@ -1339,7 +1339,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertNotNull(current);
assertTrue(game.DisconnectedPlayer(current));
assertTrue(game.disconnectedPlayer(current));
assertTrue(game.disconnetedPlayers.containsKey(current));
assertTrue(game.disconnetedPlayers.get(current));
@@ -1354,8 +1354,8 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertTrue(game.DisconnectedPlayer(current));
assertFalse(game.DisconnectedPlayer(current));
assertTrue(game.disconnectedPlayer(current));
assertFalse(game.disconnectedPlayer(current));
}
@Test
@@ -1366,10 +1366,10 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertTrue(game.DisconnectedPlayer(current));
assertTrue(game.disconnectedPlayer(current));
assertTrue(game.disconnetedPlayers.containsKey(current));
assertTrue(game.ReconnectPlayer(current));
assertTrue(game.reconnectPlayer(current));
assertFalse(game.disconnetedPlayers.containsKey(current));
}
@@ -1381,7 +1381,7 @@ class GameTest {
Player current = game.getCurrentState().getCurrentPlayer();
assertTrue(game.DisconnectedPlayer(current));
assertTrue(game.disconnectedPlayer(current));
assertFalse(game.disconnetedPlayers.isEmpty());
game.ClearDisconnected();