Fix tests

Author: Zomis

games-server/src/main/kotlin/net/zomis/games/server2/ais/ServerAI.kt

@@ -64,12 +64,7 @@ class ServerAI(val gameType: String, val name: String, val perform: ServerGameAI
             executor.submit {
                 try {
                     val aiMoves = playerIndex.map {
-                        perform.invoke(game, it).map { move ->
-                            val gameImpl = move.game.obj as GameImpl<Any>
-                            val serializedMove = gameImpl.actions.type(move.moveType)!!
-                                .actionType.serialize.serialize(move.move)
-                            PlayerGameMoveRequest(move.game, move.player, move.moveType, serializedMove)
-                        }
+                        perform.invoke(game, it).map { act -> act.serialize(game.obj as GameImpl<Any>) }
                     }
                     aiMoves.filter { it.isNotEmpty() }.forEach {singleAIMoves ->
                         events.execute(DelayedAIMoves(singleAIMoves))
@@ -90,4 +85,10 @@ class ServerAI(val gameType: String, val name: String, val perform: ServerGameAI
         events.execute(ClientJsonMessage(client, interestingGames))
     }
 
-}
+}
+
+fun PlayerGameMoveRequest.serialize(gameImpl: GameImpl<*>): PlayerGameMoveRequest {
+    val serializedMove = gameImpl.actions.type(this.moveType)!!
+            .actionType.serialize.serialize(this.move)
+    return PlayerGameMoveRequest(this.game, this.player, this.moveType, serializedMove)
+}

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

@@ -15,6 +15,7 @@ import net.zomis.games.impl.SetGameModel
 import net.zomis.games.server2.ais.AIRepository
 import net.zomis.games.server2.ais.ServerAIs
 import net.zomis.games.server2.ais.gamescorers.SplendorScorers
+import net.zomis.games.server2.ais.serialize
 import net.zomis.games.server2.clients.WSClient
 import net.zomis.games.server2.clients.getInt
 import net.zomis.games.server2.clients.getText
@@ -136,7 +137,7 @@ class DslRandomPlayTest {
                 } else {
                     serverAIs.randomAction(game, playerIndex).firstOrNull()
                 }
-            }
+            }.map { it.serialize(gameImpl) }
             if (actions.isEmpty()) {
                 p1.sendAndExpectResponse("""{ "route": "games/$dslGame/1/view" }""")
                 p1.expectJsonObject { it.getText("type") == "GameView" }