#764 Change XmlPreprocessor more functional and

remove should_exists
Flank · May 8, 2020 · df19d79 · df19d79
1 parent 5350fc3
commit df19d79
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/test_runner/buildSrc/src/main/kotlin/Deps.kt b/test_runner/buildSrc/src/main/kotlin/Deps.kt
@@ -75,7 +75,8 @@ object Versions {
     // https://github.com/mockk/mockk
     const val MOCKK = "1.9.3"
 
-    const val COMMON_TEXT = "1.7"
+    //https://commons.apache.org/proper/commons-text/
+    const val COMMON_TEXT = "1.8"
 }
 
 object Libs {

diff --git a/test_runner/should_exists.txt b/test_runner/should_exists.txt
diff --git a/test_runner/src/main/kotlin/ftl/reports/xml/preprocesor/XmlPreprocessor.kt b/test_runner/src/main/kotlin/ftl/reports/xml/preprocesor/XmlPreprocessor.kt
@@ -2,16 +2,10 @@ package ftl.reports.xml.preprocesor
 
 import org.apache.commons.text.StringEscapeUtils
 
-fun fixHtmlCodes(data: String): String {
-    val isoHtmlCodesToReplace =
-        listOf(UtfControlCharRanges.CONTROL_TOP_START.charValue..UtfControlCharRanges.CONTROL_TOP_END.charValue).union(
-            listOf(UtfControlCharRanges.CONTROL_BOTTOM_START.charValue..UtfControlCharRanges.CONTROL_BOTTOM_END.charValue)
-        ).flatten()
-            .map { StringEscapeUtils.escapeXml11(it.toChar().toString()) }.filter { it.startsWith("&#") }
-
-    var fixedStr = data
-    for (isoControlCode in isoHtmlCodesToReplace) {
-        fixedStr = fixedStr.replace(isoControlCode, "")
-    }
-    return fixedStr
-}
+fun fixHtmlCodes(data: String): String = listOf(
+    UtfControlCharRanges.CONTROL_TOP_START.charValue..UtfControlCharRanges.CONTROL_TOP_END.charValue,
+    UtfControlCharRanges.CONTROL_BOTTOM_START.charValue..UtfControlCharRanges.CONTROL_BOTTOM_END.charValue
+).flatten()
+    .map { StringEscapeUtils.escapeXml11(it.toChar().toString()) }
+    .filter { it.startsWith("&#") }
+    .fold(data) { fixedStr: String, isoControlCode: String -> fixedStr.replace(isoControlCode, "") }
diff --git a/test_runner/src/test/kotlin/ftl/reports/xml/JUnitXmlTest.kt b/test_runner/src/test/kotlin/ftl/reports/xml/JUnitXmlTest.kt
@@ -500,6 +500,5 @@ junit.framework.Assert.fail(Assert.java:50)</failure>
         """.trimIndent()
         val oneSuiteXml = parseOneSuiteXml(crashingOneSuiteMessage).xmlToString().trimIndent()
         Assert.assertEquals("One Suite Messages should be the same!", expectedOneSuiteMessage, oneSuiteXml)
-
     }
 }