fix(server): update CancelRequest testing

Author: Xerus

server/src/sc/server/Lobby.kt

@@ -54,7 +54,7 @@ class Lobby : IClientListener {
         source.removeClientListener(this)
     }
 
-    /** handle requests or moves of clients  */
+    /** Handle requests or moves of clients. */
     @Throws(RescuableClientException::class, InvalidGameStateException::class)
     override fun onRequest(source: Client, callback: PacketCallback) {
         val packet = callback.packet
@@ -101,18 +101,16 @@ class Lobby : IClientListener {
                     val room = this.gameManager.findRoom(packet.roomId)
                     val slot = room.slots[packet.slot]
                     slot.role.player.isCanTimeout = packet.activate
-
                 }
                 is StepRequest -> // It is not checked whether there is a prior pending StepRequest
                     if (source.isAdministrator) {
                         val room = this.gameManager.findRoom(packet.roomId)
                         room.step(packet.forced)
                     }
                 is CancelRequest -> if (source.isAdministrator) {
+                    requireNotNull(packet.roomId) { "Can't cancel a game with roomId null!" }
                     val room = this.gameManager.findRoom(packet.roomId)
                     room.cancel()
-                    // TODO check whether all clients receive game over message
-                    this.gameManager.games.remove(room)
                 }
                 is TestModeRequest -> if (source.isAdministrator) {
                     val testMode = packet.testMode

server/test/sc/protocol/requests/RequestTest.kt

@@ -308,18 +308,20 @@ class RequestTest : RealServerTest() {
 
     @Test
     fun cancelRequest() {
+        val listener = TestLobbyClientListener()
+        player1.addListener(listener)
+
         player1.authenticate(PASSWORD)
         player1.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
         player2.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
-        val listener = TestLobbyClientListener()
-        player1.addListener(listener)
 
-        // Wait for messages to get to server
+        // Wait for server to go
         assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isNotEmpty() }, 1000))
+        assertTrue(TestHelper.waitUntilTrue({ listener.roomId != null }, 2000))
 
         player1.send(CancelRequest(listener.roomId))
-        assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isEmpty() }, 3000))
-        assertEquals(0, lobby.gameManager.games.size.toLong())
+        assertTrue(TestHelper.waitUntilTrue({ lobby.gameManager.games.isEmpty() }, 10000))
+        assertEquals(0, lobby.gameManager.games.size)
     }
 
     @Test