Skip to content

Commit 079a0c8

Browse files
committed
test(server): clean up LobbyTest
Also re-enables one test from #124 since it seems to be working again. # Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
1 parent 38e8052 commit 079a0c8

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

server/test/sc/server/LobbyTest.kt

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sc.server
22

3-
import org.junit.Assert
43
import org.junit.Test
54
import sc.server.helpers.TestHelper
65
import sc.server.network.RealServerTest
@@ -10,26 +9,18 @@ class LobbyTest: RealServerTest() {
109

1110
@Test
1211
fun shouldConnectAndDisconnect() {
13-
try {
14-
val player1 = connectClient("localhost", serverPort)
15-
val player2 = connectClient("localhost", serverPort)
16-
17-
player1.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
18-
player2.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
19-
20-
// Was game created?
21-
TestHelper.assertEqualsWithTimeout(1, { lobby.games.size }, 2000)
22-
Assert.assertNotNull(lobby.games)
23-
Assert.assertNotEquals(0, lobby.games.size.toLong())
24-
Assert.assertNotNull(lobby.clientManager)
25-
26-
player1.stop()
27-
// FIXME sometimes fails - see Issue #124
28-
// TestHelper.assertEqualsWithTimeout(0, { lobby.games.size }, 5000)
29-
} catch (e: Exception) {
30-
e.printStackTrace()
31-
Assert.fail()
32-
}
12+
val player1 = connectClient("localhost", serverPort)
13+
val player2 = connectClient("localhost", serverPort)
14+
15+
player1.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
16+
player2.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)
17+
18+
// Wait for game to be created
19+
TestHelper.assertEqualsWithTimeout(1, { lobby.games.size }, 2000)
20+
21+
// Game should be stopped when one player dies
22+
player1.stop()
23+
TestHelper.assertEqualsWithTimeout(0, { lobby.games.size }, 5000)
3324
}
3425

3526
}

0 commit comments

Comments
 (0)