Update Connect4Test

Author: Zomis

games-server/src/test/kotlin/net/zomis/games/server2/Connect4Test.kt

@@ -11,6 +11,8 @@ import java.net.URI
 
 class Connect4Test {
 
+    data class Connect4Move(val playerIndex: Int, val x: Int, val y: Int)
+
     private val logger = KLoggers.logger(this)
 
     var server: Server2? = null
@@ -49,15 +51,20 @@ class Connect4Test {
         }
 
         sendAndExpect(p1, p2, listOf(
-            Pair(1, 3), Pair(2, 4), Pair(1, 2), Pair(2, 5), Pair(1, 1), Pair(2, 6)
+            Connect4Move(1, 3, 5),
+            Connect4Move(2, 4, 5),
+            Connect4Move(1, 2, 5),
+            Connect4Move(2, 5, 5),
+            Connect4Move(1, 1, 5),
+            Connect4Move(2, 6, 5)
         ))
 
         // Try to cheat - wrong player
-        p2.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 6 }""")
+        p2.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": { "x": 6, "y": 5 } }""")
         p2.takeUntilJson { it.getText("type") == "IllegalMove" }
 
         // Win the game
-        p1.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 0 }""")
+        p1.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": { "x": 0, "y": 5 } }""")
         var obj = p1.takeUntilJson { it.getText("type") == "PlayerEliminated" }
         assert(obj.getText("gameType") == "Connect4")
         assert(obj.getInt("player") == 0)
@@ -86,20 +93,13 @@ class Connect4Test {
         p2.close()
     }
 
-    private fun sendAndExpect(p1: WSClient, p2: WSClient, pairs: List<Pair<Int, Int>>) {
+    private fun sendAndExpect(p1: WSClient, p2: WSClient, pairs: List<Connect4Move>) {
         pairs.forEach({
-            val cl = if (it.first == 1) p1 else p2
-            cl.send("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": ${it.second} }""")
+            val cl = if (it.playerIndex == 1) p1 else p2
+            cl.send("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": {"x": ${it.x}, "y": ${it.y} } }""")
             p1.expectJsonObject { true }
             p2.expectJsonObject { true }
         })
-
-//        p1.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 3 }""")
-//        p2.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 4 }""")
-//        p1.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 2 }""")
-//        p2.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 5 }""")
-//        p1.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 1 }""")
-//        p2.sendAndExpectResponse("""v1:{ "game": "Connect4", "gameId": "1", "type": "move", "move": 6 }""")
     }
 
 }