From 3f37bd39eba60540309f295782bc58ca051f9fb4 Mon Sep 17 00:00:00 2001 From: Quentin Rendu Date: Fri, 27 Oct 2023 12:30:53 +0200 Subject: [PATCH] Manually remove bye player from all rounds in test 9 --- .../kotlin/org/jeudego/pairgoth/api/PairingHandler.kt | 5 +---- api-webapp/src/test/kotlin/PairingTests.kt | 9 ++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/PairingHandler.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/PairingHandler.kt index d484279..9fd8327 100644 --- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/PairingHandler.kt +++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/PairingHandler.kt @@ -3,12 +3,9 @@ package org.jeudego.pairgoth.api import com.republicate.kson.Json import com.republicate.kson.toJsonArray import org.jeudego.pairgoth.api.ApiHandler.Companion.badRequest -import org.jeudego.pairgoth.model.Pairing -import org.jeudego.pairgoth.model.PairingType import org.jeudego.pairgoth.model.getID import org.jeudego.pairgoth.model.toID import org.jeudego.pairgoth.model.toJson -import org.jeudego.pairgoth.web.Event import org.jeudego.pairgoth.web.Event.* import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse @@ -29,7 +26,7 @@ object PairingHandler: PairgothApiHandler { val round = getSubSelector(request)?.toIntOrNull() ?: badRequest("invalid round number") val payload = getArrayPayload(request) val allPlayers = payload.size == 1 && payload[0] == "all" - if (!allPlayers && tournament.pairing.type == PairingType.SWISS) badRequest("Swiss pairing requires all pairable players") + //if (!allPlayers && tournament.pairing.type == PairingType.SWISS) badRequest("Swiss pairing requires all pairable players") val playing = (tournament.games(round).values).flatMap { listOf(it.black, it.white) }.toSet() diff --git a/api-webapp/src/test/kotlin/PairingTests.kt b/api-webapp/src/test/kotlin/PairingTests.kt index a2eab7c..a72503d 100644 --- a/api-webapp/src/test/kotlin/PairingTests.kt +++ b/api-webapp/src/test/kotlin/PairingTests.kt @@ -244,9 +244,16 @@ class PairingTests: TestBase() { var games: Json.Array var firstGameID: Int + var playersList = mutableListOf() + + for (i in 0..34){ + playersList.add(players.getJson(i)!!.asObject()["id"] as Long) + } + + val byePlayerList = mutableListOf(354, 359, 356, 357, 345, 339, 368, 344, 349, 341) for (round in 1..7) { - games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array("all")).asArray() + games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array(playersList.filter{it != byePlayerList[round-1]})).asArray() logger.info("games for round $round: {}", games.toString()) assertTrue(compare_weights("weights.txt", "opengotha/notsosimpleswiss_weights_R$round.txt"), "Not matching opengotha weights for round $round")