diff --git a/src/main/java/uta/cse3310/GameServer.java b/src/main/java/uta/cse3310/GameServer.java index 60b8558..c0c0ee4 100644 --- a/src/main/java/uta/cse3310/GameServer.java +++ b/src/main/java/uta/cse3310/GameServer.java @@ -50,7 +50,12 @@ public void removePlayer(int playerId) { System.out.println("Player " + player.getName() + " removed."); } } - + public List getPlayer(){ + return players; + } + public int getSessionId(){ + return sessionId; + } public void createSession() { sessionId = generateSessionId(); System.out.println("Session " + sessionId + " created."); diff --git a/src/test/java/cse3310/GameServerTest.java b/src/test/java/uta/cse3310/GameServerTest.java similarity index 75% rename from src/test/java/cse3310/GameServerTest.java rename to src/test/java/uta/cse3310/GameServerTest.java index 7bc765e..4ba0f9a 100644 --- a/src/test/java/cse3310/GameServerTest.java +++ b/src/test/java/uta/cse3310/GameServerTest.java @@ -1,23 +1,22 @@ -/* package uta.cse3310; +package uta.cse3310; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; - +import static org.junit.jupiter.api.Assertions.*; public class GameServerTest { private GameServer gameServer; private Player player1; private Player player2; - @Before + @BeforeEach public void setUp() { gameServer = new GameServer(); player1 = new Player("Hannah"); player2 = new Player("Montanna"); - gameServer.addPlayers(player1); - gameServer.addPlayers(player2); + gameServer.addPlayer(player1); + gameServer.addPlayer(player2); gameServer.createSession(); } @@ -45,19 +44,19 @@ public void testHandlePlayerAction() { public void testBroadcastGameState() { gameServer.broadcastGameState(gameServer.getSessionId()); } - + @Test public void testAddPlayers() { Player newPlayer = new Player("Alice"); - gameServer.addPlayers(newPlayer); - List players = gameServer.getPlayers(); + gameServer.addPlayer(newPlayer); + List players = gameServer.getPlayer(); assertTrue(players.contains(newPlayer)); } @Test public void testRemovePlayers() { - gameServer.removePlayers(player1.getId()); - List players = gameServer.getPlayers(); + gameServer.removePlayer(player1.getId()); + List players = gameServer.getPlayer(); assertFalse(players.contains(player1)); } @@ -67,4 +66,4 @@ public void testCreateSession() { int sessionId = gameServer.getSessionId(); assertNotNull(sessionId); } -}*/ \ No newline at end of file +} \ No newline at end of file