Sanitize test data

icpc · Sep 5, 2023 · 64fb8e1 · 64fb8e1
1 parent 8ab37af
commit 64fb8e1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/cds/src/test/kotlin/org/icpclive/cds/CdsLoadersTest.kt b/src/cds/src/test/kotlin/org/icpclive/cds/CdsLoadersTest.kt
@@ -143,16 +143,19 @@ object CdsLoadersTest {
                 result
             }
         }
-        val actual = json.encodeToString(result)
-        val expected = expectedFile.toFile().takeIf { it.exists() }?.readText() ?: ""
+        fun sanitize(s: String) = s.trim().replace(" +$", "").replace(System.lineSeparator(), "\n")
+        val actual = sanitize(json.encodeToString(result))
+        val expected = sanitize(expectedFile.toFile().takeIf { it.exists() }?.readText() ?: "")
         if (actual != expected) {
             if (updateTestData) {
                 expectedFile.toFile().printWriter().use {
-                    it.print(actual)
+                    it.print(actual.replace("\n", System.lineSeparator()))
                 }
             }
             throw AssertionFailedError(
-                "Actual result doesn't match expected in file ${expectedFile}",
+                "Actual result doesn't match expected in file ${expectedFile}\n" +
+                        "Expected: $expected\n" +
+                        "Actual: $actual\n",
                 expected,
                 actual,
             )