Add test for Round 6 of simple swiss

api-webapp/src/test/kotlin/BasicTests.kt

@@ -416,7 +416,7 @@ class BasicTests: TestBase() {
         games_np = TestAPI.post("/api/tour/$id_np/pair/5", Json.Array("all")).asArray()
         logger.info("games for round 5: {}", games_np.toString())
 
-        assertTrue(compare_weights("weights.txt", "opengotha/simpleswiss_weights_R5.txt"), "Not matching opengotha weights for round 4")
+        assertTrue(compare_weights("weights.txt", "opengotha/simpleswiss_weights_R5.txt"), "Not matching opengotha weights for round 5")
         assertTrue(compare_games(games_np, Json.parse(pairings_R5.toString())!!.asArray()), "pairings for round 5 differ")
         //assertEquals(pairings_R4, games_np.toString(), "pairings for round 3 differ")
         logger.info("Pairings for round 5 match OpenGotha")
@@ -428,6 +428,21 @@ class BasicTests: TestBase() {
         }
         logger.info("Results succesfully entered for round 5")
 
+        // *** Test Round 6 ***
+        games_np = TestAPI.post("/api/tour/$id_np/pair/6", Json.Array("all")).asArray()
+        logger.info("games for round 6: {}", games_np.toString())
+
+        assertTrue(compare_weights("weights.txt", "opengotha/simpleswiss_weights_R6.txt"), "Not matching opengotha weights for round 6")
+        assertTrue(compare_games(games_np, Json.parse(pairings_R6.toString())!!.asArray()), "pairings for round 6 differ")
+        logger.info("Pairings for round 6 match OpenGotha")
+
+        firstGameID = (games_np.getJson(0)!!.asObject()["id"] as Long?)!!.toInt()
+        for (game_id in firstGameID..firstGameID+15) {
+            resp_np = TestAPI.put("/api/tour/$id_np/res/6", Json.parse("""{"id":$game_id,"result":"b"}""")).asObject()
+            assertTrue(resp_np.getBoolean("success") == true, "expecting success")
+        }
+        logger.info("Results succesfully entered for round 6")
+
     }
 
 }

api-webapp/src/test/resources/opengotha/tournamentfiles/simpleswiss_nopairings.xml

@@ -14,11 +14,11 @@
         <Player agaExpirationDate="" agaId="" club="76Ro" country="FR" egfPin="" ffgLicence="8665300" ffgLicenceStatus="L" firstName="Jean-Luc" grade="9K" name="Gaillard" participating="11111111111111111111" rank="9K" rating="1127" ratingOrigin="EGF : 1127" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="75Pa" country="FR" egfPin="" ffgLicence="1800039" ffgLicenceStatus="L" firstName="Gilles" grade="7K" name="Habart" participating="11111111111111111111" rank="7K" rating="1343" ratingOrigin="EGF : 1343" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="75Op" country="FR" egfPin="" ffgLicence="7907800" ffgLicenceStatus="L" firstName="Jérôme" grade="3D" name="Hubert" participating="11111111111111111111" rank="3D" rating="2300" ratingOrigin="FFG : 276" registeringStatus="FIN" smmsCorrection="0"/>
-        <Player agaExpirationDate="" agaId="" club="64Ba" country="FR" egfPin="" ffgLicence="1200009" ffgLicenceStatus="C" firstName="Philippe" grade="3K" name="Batailler" participating="11111000000000000000" rank="3K" rating="1793" ratingOrigin="EGF : 1793" registeringStatus="FIN" smmsCorrection="0"/>
+        <Player agaExpirationDate="" agaId="" club="64Ba" country="FR" egfPin="" ffgLicence="1200009" ffgLicenceStatus="C" firstName="Philippe" grade="3K" name="Batailler" participating="11111110000000000000" rank="3K" rating="1793" ratingOrigin="EGF : 1793" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="31Ba" country="FR" egfPin="" ffgLicence="0425000" ffgLicenceStatus="L" firstName="Philippe" grade="7K" name="Grimond" participating="11111111111111111111" rank="7K" rating="1378" ratingOrigin="EGF : 1378" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="86Po" country="FR" egfPin="" ffgLicence="9725084" ffgLicenceStatus="L" firstName="Fabrice" grade="7K" name="Neant" participating="11111111111111111111" rank="7K" rating="1340" ratingOrigin="EGF : 1340" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="63Ce" country="FR" egfPin="" ffgLicence="2100032" ffgLicenceStatus="L" firstName="William" grade="30K" name="Dupré" participating="11111111111111111111" rank="30K" rating="1150" ratingOrigin="FFG : -9999" registeringStatus="FIN" smmsCorrection="0"/>
-        <Player agaExpirationDate="" agaId="" club="35Re" country="FR" egfPin="" ffgLicence="9237201" ffgLicenceStatus="L" firstName="Marc" grade="4K" name="Guillou" participating="11111000000000000000" rank="4K" rating="1745" ratingOrigin="EGF : 1745" registeringStatus="FIN" smmsCorrection="0"/>
+        <Player agaExpirationDate="" agaId="" club="35Re" country="FR" egfPin="" ffgLicence="9237201" ffgLicenceStatus="L" firstName="Marc" grade="4K" name="Guillou" participating="11111110000000000000" rank="4K" rating="1745" ratingOrigin="EGF : 1745" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="75Al" country="FR" egfPin="" ffgLicence="1400130" ffgLicenceStatus="L" firstName="Guy" grade="20K" name="Jollivet" participating="11111111111111111111" rank="20K" rating="160" ratingOrigin="EGF : 160" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="44Na" country="FR" egfPin="" ffgLicence="8004400" ffgLicenceStatus="L" firstName="Marc" grade="11K" name="Jegou" participating="11111111111111111111" rank="11K" rating="904" ratingOrigin="EGF : 904" registeringStatus="FIN" smmsCorrection="0"/>
         <Player agaExpirationDate="" agaId="" club="44Na" country="FR" egfPin="" ffgLicence="1450001" ffgLicenceStatus="L" firstName="Yvan" grade="4K" name="Martin" participating="11111111111111111111" rank="4K" rating="1617" ratingOrigin="EGF : 1617" registeringStatus="FIN" smmsCorrection="0"/>