diff --git a/api-webapp/src/test/kotlin/BasicTests.kt b/api-webapp/src/test/kotlin/BasicTests.kt index e449901..dc88e5b 100644 --- a/api-webapp/src/test/kotlin/BasicTests.kt +++ b/api-webapp/src/test/kotlin/BasicTests.kt @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestMethodOrder import java.nio.charset.StandardCharsets +import kotlin.math.abs import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue @@ -249,15 +250,15 @@ class BasicTests: TestBase() { } - var diff_found = false + var identical = true for ((key, value) in map1) { // Check if key exists in both if (map2.containsKey(key)) { // Compare values //logger.info("Comparing $key") - if (value != map2[key] && diff_found==false) { + if (abs(value!![9] - map2[key]!![9])>10 && identical==true) { // Key exists but values differ - print key - logger.info("Difference found at $key : $value") + logger.info("Difference found at $key") logger.info("baseDuplicateGameCost = "+value!![0].toString()+" "+map2[key]!![0].toString()) logger.info("baseRandomCost = "+value!![1].toString()+" "+map2[key]!![1].toString()) logger.info("baseBWBalanceCost = "+value!![2].toString()+" "+map2[key]!![2].toString()) @@ -268,12 +269,13 @@ class BasicTests: TestBase() { logger.info("secHandiCost = "+value!![7].toString()+" "+map2[key]!![7].toString()) logger.info("secGeoCost = "+value!![8].toString()+" "+map2[key]!![8].toString()) logger.info("totalCost = "+value!![9].toString()+" "+map2[key]!![9].toString()) - diff_found = true + identical = false } } } - return map1==map2 + //return map1==map2 + return identical } fun compare_string(string1:String, string2:String): String{ @@ -363,7 +365,7 @@ class BasicTests: TestBase() { logger.info("games for round 3: {}", games_np.toString()) assertTrue(compare_weights("weights.txt", "opengotha/simpleswiss_weights_R3.txt"), "Not matching opengotha weights for round 3") - assertEquals(pairings_R2, games_np.toString(), "pairings for round 2 differ") + assertEquals(pairings_R3, games_np.toString(), "pairings for round 3 differ") logger.info("Pairings for round 3 match OpenGotha")