From ee4257d8fca8d2085d7a63a19eee8728debba072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 20 Mar 2020 02:58:41 +0100 Subject: [PATCH] Fix JSP CPD tests CPD "normalizes" line separators to the platform-specific separator. This should be fixed later when we move to TextDocument --- .../net/sourceforge/pmd/cpd/JSPTokenizerTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java index 4c49ea6198..41b00f4cd7 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java @@ -7,6 +7,7 @@ package net.sourceforge.pmd.cpd; import org.junit.Assert; import org.junit.Test; +import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.lang.jsp.JspParserTest; public class JSPTokenizerTest extends JspParserTest { @@ -21,16 +22,15 @@ public class JSPTokenizerTest extends JspParserTest { String[] expectedTokens = new String[] { "<%--", - "\n" - + "BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n", + PMD.EOL + "BSD-style license; for more info see http://pmd.sourceforge.net/license.html" + PMD.EOL, "--%>", "<%", - "\nString nodeContent = \"<% %>\";\n", + PMD.EOL + "String nodeContent = \"<% %>\";" + PMD.EOL, "%>", "<%", - "\n\";\n" - + "]]>\n", + PMD.EOL + "\";" + PMD.EOL + + "]]>" + PMD.EOL, "%>", "", };