test(server): simplify a little

Author: xeruf

server/test/sc/server/network/MockClient.java renamed to server/test/sc/server/helpers/MockClient.java

@@ -1,12 +1,12 @@
-package sc.server.network;
+package sc.server.helpers;
 
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sc.networking.UnprocessedPacketException;
 import sc.protocol.ProtocolPacket;
 import sc.protocol.room.RoomPacket;
-import sc.server.helpers.StringNetworkInterface;
+import sc.server.network.Client;
 import sc.shared.InvalidGameStateException;
 
 import java.io.IOException;

server/test/sc/server/network/ClientXmlReadTest.java

@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Timeout;
 import sc.networking.clients.XStreamClient;
 import sc.server.helpers.ExamplePacket;
+import sc.server.helpers.MockClient;
 import sc.server.helpers.StringNetworkInterface;
 
 import java.io.IOException;

server/test/sc/server/network/LobbyTest.kt

@@ -14,8 +14,8 @@ class LobbyTest: RealServerTest() {
 
     @Test
     fun shouldEndGameOnDisconnect() {
-        val player1 = connectClient("localhost", serverPort)
-        val player2 = connectClient("localhost", serverPort)
+        val player1 = connectPlayer()
+        val player2 = connectPlayer()
 
         player1.joinGame(TestPlugin.TEST_PLUGIN_UUID)
         player2.joinGame(TestPlugin.TEST_PLUGIN_UUID)
@@ -29,8 +29,8 @@ class LobbyTest: RealServerTest() {
 
     @Test
     fun shouldEndGameOnIllegalMessage() {
-        val player1 = connectClient("localhost", serverPort)
-        val player2 = connectClient("localhost", serverPort)
+        val player1 = connectPlayer()
+        val player2 = connectPlayer()
 
         val listener = TestLobbyClientListener()
         player1.addListener(listener)

server/test/sc/server/network/RealServerTest.kt

@@ -31,8 +31,8 @@ abstract class RealServerTest {
     protected val serverPort: Int
         get() = NewClientListener.lastUsedPort
 
-    fun connectClient(host: String, port: Int) =
-            LobbyClient(host, port).apply { start() }
+    fun connectPlayer() =
+            LobbyClient("localhost", serverPort).apply { start() }
 
     @ExperimentalTime
     fun await(clue: String? = null, time: Duration = 1.seconds, f: () -> Boolean) = runBlocking {

server/test/sc/server/network/RequestTest.kt

@@ -8,7 +8,10 @@ import org.junit.jupiter.api.Test
 import sc.framework.plugins.AbstractGame
 import sc.framework.plugins.protocol.MoveRequest
 import sc.networking.clients.LobbyClient
-import sc.protocol.requests.*
+import sc.protocol.requests.CancelRequest
+import sc.protocol.requests.PauseGameRequest
+import sc.protocol.requests.StepRequest
+import sc.protocol.requests.TestModeRequest
 import sc.protocol.room.ErrorMessage
 import sc.server.Configuration
 import sc.server.client.PlayerListener
@@ -28,11 +31,11 @@ class RequestTest: RealServerTest() {
 
     @BeforeEach
     fun prepare() {
-        player1 = connectClient("localhost", serverPort)
+        player1 = connectPlayer()
         Thread.sleep(200)
-        player2 = connectClient("localhost", serverPort)
+        player2 = connectPlayer()
         Thread.sleep(200)
-        player3 = connectClient("localhost", serverPort)
+        player3 = connectPlayer()
         Thread.sleep(200)
     }
 

server/test/sc/server/roles/AbstractRoleTest.java

@@ -6,9 +6,9 @@
 import sc.server.Configuration;
 import sc.server.Lobby;
 import sc.server.gaming.GameRoomManager;
+import sc.server.helpers.MockClient;
 import sc.server.network.AuthenticationFailedException;
 import sc.server.network.ClientManager;
-import sc.server.network.MockClient;
 import sc.server.plugins.GamePluginManager;
 import sc.server.plugins.PluginLoaderException;
 import sc.server.plugins.TestPlugin;

server/test/sc/server/roles/AdministratorTest.java

@@ -6,8 +6,8 @@
 import sc.protocol.requests.AuthenticateRequest;
 import sc.protocol.requests.PrepareGameRequest;
 import sc.server.Configuration;
+import sc.server.helpers.MockClient;
 import sc.server.network.Client;
-import sc.server.network.MockClient;
 import sc.server.network.PacketCallback;
 import sc.server.plugins.TestPlugin;
 

server/test/sc/server/roles/ContestTest.java

@@ -8,8 +8,8 @@
 import sc.protocol.responses.GamePreparedResponse;
 import sc.server.gaming.GameRoom;
 import sc.server.gaming.PlayerSlot;
+import sc.server.helpers.MockClient;
 import sc.server.network.Client;
-import sc.server.network.MockClient;
 import sc.server.network.PacketCallback;
 import sc.server.plugins.TestPlugin;
 import sc.shared.InvalidGameStateException;

server/test/sc/server/roles/PlayerTest.java

@@ -4,13 +4,17 @@
 import org.junit.jupiter.api.Test;
 import sc.api.plugins.exceptions.RescuableClientException;
 import sc.framework.plugins.protocol.MoveRequest;
+import sc.protocol.RemovedFromGame;
+import sc.protocol.requests.JoinGameRequest;
+import sc.protocol.requests.JoinPreparedRoomRequest;
+import sc.protocol.requests.ObservationRequest;
+import sc.protocol.requests.PrepareGameRequest;
+import sc.protocol.responses.GamePreparedResponse;
+import sc.protocol.responses.JoinedRoomResponse;
 import sc.protocol.room.MementoMessage;
 import sc.protocol.room.RoomPacket;
-import sc.protocol.requests.*;
-import sc.protocol.responses.*;
-import sc.protocol.RemovedFromGame;
+import sc.server.helpers.MockClient;
 import sc.server.network.Client;
-import sc.server.network.MockClient;
 import sc.server.network.PacketCallback;
 import sc.server.plugins.TestGameState;
 import sc.server.plugins.TestMove;