From b607fa95d0892286d6c3d15088f3f1988afda1eb Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 18 Jun 2020 19:53:08 +0200 Subject: [PATCH] Don't use \\R yet... --- .../net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt index 23ef27fbd4..9d968fc3c7 100644 --- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt +++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt @@ -114,7 +114,7 @@ abstract class CpdTextComparisonTest( .replace("\\", "\\\\") // escape backslashes .replace("\r\n", "\\r\\n") // CRLF (treated specially because it has a different length) .replace("\t", "\\t") // TAB - .replace(Regex("\\R"), "\\\\n") // escape other newlines (normalizing) + .replace(Regex("\\u000D\\u000A|[\\u000A\\u000B\\u000C\\u000D\\u0085\\u2028\\u2029]"), "\\\\n") // escape other newlines (normalizing), use \\R with java8+ .replace(Regex("[]\\[]"), "\\\\$0") // escape [] var truncated = StringUtils.truncate(escaped, ImageSize)