From 1540ec6d9148fc14fc1673f4df1d33030d2ffcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 12 Jun 2020 16:36:04 +0200 Subject: [PATCH] Port remaining dart tests --- pmd-dart/pom.xml | 5 + .../pmd/cpd/DartTokenizerTest.java | 114 ++++++++++-------- .../pmd/cpd/DartTokenizerTest2.java | 50 -------- .../pmd/cpd/{ => testData}/comment.dart | 0 .../pmd/cpd/{ => testData}/comment.txt | 2 +- .../cpd/{ => testData}/escape_sequences.dart | 0 .../pmd/cpd/testData/escape_sequences.txt | 17 +++ .../cpd/{ => testData}/escaped_backslash.dart | 0 .../pmd/cpd/testData/escaped_backslash.txt | 17 +++ .../cpd/{ => testData}/escaped_string.dart | 0 .../pmd/cpd/testData/escaped_string.txt | 22 ++++ .../pmd/cpd/{ => testData}/imports.dart | 0 .../sourceforge/pmd/cpd/testData/imports.txt | 2 + .../pmd/cpd/{ => testData}/increment.dart | 0 .../pmd/cpd/{ => testData}/increment.txt | 2 +- .../pmd/cpd/{ => testData}/regex.dart | 0 .../sourceforge/pmd/cpd/testData/regex.txt | 17 +++ .../pmd/cpd/{ => testData}/regex2.dart | 0 .../sourceforge/pmd/cpd/testData/regex2.txt | 17 +++ .../pmd/cpd/{ => testData}/regex3.dart | 0 .../sourceforge/pmd/cpd/testData/regex3.txt | 17 +++ .../cpd/{ => testData}/string_multiline.dart | 0 .../cpd/{ => testData}/string_multiline.txt | 2 +- .../string_with_backslashes.dart | 0 .../string_with_backslashes.txt | 2 +- .../pmd/cpd/test/CpdTextComparisonTest.kt | 9 +- .../pmd/test/BaseTextComparisonTest.kt | 2 +- .../testframework/AbstractTokenizerTest.java | 2 + 28 files changed, 194 insertions(+), 105 deletions(-) delete mode 100644 pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest2.java rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/comment.dart (100%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/comment.txt (83%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/escape_sequences.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/escaped_backslash.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/escaped_string.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/imports.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/increment.dart (100%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/increment.txt (99%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/regex.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/regex2.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/regex3.dart (100%) create mode 100644 pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.txt rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/string_multiline.dart (100%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/string_multiline.txt (92%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/string_with_backslashes.dart (100%) rename pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/{ => testData}/string_with_backslashes.txt (90%) diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index c18d893086..8c762450ff 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -49,6 +49,11 @@ junit test + + org.junit.vintage + junit-vintage-engine + test + net.sourceforge.pmd pmd-test diff --git a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java index dc1e125322..9c8293a35c 100644 --- a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java +++ b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java @@ -1,65 +1,83 @@ -/** +/* * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ package net.sourceforge.pmd.cpd; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; - -import org.apache.commons.io.IOUtils; -import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import net.sourceforge.pmd.testframework.AbstractTokenizerTest; +import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -@RunWith(Parameterized.class) -public class DartTokenizerTest extends AbstractTokenizerTest { +public class DartTokenizerTest extends CpdTextComparisonTest { - private final String filename; - private final int nExpectedTokens; - - public DartTokenizerTest(String filename, int nExpectedTokens) { - this.filename = filename; - this.nExpectedTokens = nExpectedTokens; - } - - @Parameterized.Parameters - public static Collection data() { - return Arrays.asList( - new Object[] { "comment.dart", 5 }, - new Object[] { "escape_sequences.dart", 13 }, - new Object[] { "escaped_backslash.dart", 14 }, - new Object[] { "escaped_string.dart", 17 }, - new Object[] { "increment.dart", 185 }, - new Object[] { "imports.dart", 1 }, - new Object[] { "regex.dart", 13 }, - new Object[] { "regex2.dart", 13 }, - new Object[] { "regex3.dart", 13 }, - new Object[] { "string_with_backslashes.dart", 9 }, - new Object[] { "string_multiline.dart", 13 } - ); - } - - @Before - @Override - public void buildTokenizer() throws IOException { - this.tokenizer = new DartTokenizer(); - this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), this.filename)); + public DartTokenizerTest() { + super(".dart"); } @Override - public String getSampleCode() throws IOException { - return IOUtils.toString(DartTokenizer.class.getResourceAsStream(this.filename), StandardCharsets.UTF_8); + public Tokenizer newTokenizer() { + return new DartTokenizer(); + } + + + @Test + public void testComment() { + doTest("comment"); } @Test - public void tokenizeTest() throws IOException { - this.expectedTokenCount = nExpectedTokens; - super.tokenizeTest(); + public void testEscapeSequences() { + doTest("escape_sequences"); } + + @Test + public void testEscapedBackslash() { + doTest("escaped_backslash"); + } + + @Test + public void testEscapedString() { + doTest("escaped_string"); + } + + + @Test + public void testIncrement() { + doTest("increment"); + } + + + @Test + public void testImports() { + doTest("imports"); + } + + + + @Test + public void testRegex() { + doTest("regex"); + } + + + @Test + public void testRegex2() { + doTest("regex2"); + } + + @Test + public void testRegex3() { + doTest("regex3"); + } + + @Test + public void testStringWithBackslashes() { + doTest("string_with_backslashes"); + } + + @Test + public void testMultiline() { + doTest("string_multiline"); + } + } diff --git a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest2.java b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest2.java deleted file mode 100644 index 0f6cfbea8e..0000000000 --- a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest2.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.cpd; - -import org.junit.Test; - -import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; - -public class DartTokenizerTest2 extends CpdTextComparisonTest { - - public DartTokenizerTest2() { - super(".dart"); - } - - @Override - protected String getResourcePrefix() { - return ""; - } - - @Override - public Tokenizer newTokenizer() { - return new DartTokenizer(); - } - - @Test - public void testComment() { - doTest("comment"); - } - - - @Test - public void testMultiline() { - doTest("string_multiline"); - } - - @Test - public void testStringWithBackslashes() { - doTest("string_with_backslashes"); - } - - @Test - public void testIncrement() { - doTest("increment"); - } - - - -} diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/comment.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/comment.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/comment.txt similarity index 83% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.txt rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/comment.txt index 6a7b4ca2c1..d13247bcc2 100644 --- a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.txt +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/comment.txt @@ -4,4 +4,4 @@ L3 [x] 5 5 [=] 7 7 [0] 9 9 - [EOF] -1 -1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escape_sequences.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escape_sequences.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.txt new file mode 100644 index 0000000000..12c378a8a6 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escape_sequences.txt @@ -0,0 +1,17 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [var] 1 3 + [newline] 5 11 + [=] 13 13 + ['\\n'] 15 18 +L2 + [var] 1 3 + [dollar] 5 10 + [=] 12 12 + ['$'] 14 16 +L3 + [var] 1 3 + [escaped_dollar] 5 18 + [=] 20 20 + ["\\$"] 22 25 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_backslash.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_backslash.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.txt new file mode 100644 index 0000000000..7fdcc0719b --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_backslash.txt @@ -0,0 +1,17 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [var] 1 3 + [separator] 5 13 + [=] 15 15 + ['\\\\'] 17 20 +L2 + [var] 1 3 + [separators] 5 14 + [=] 16 16 + [const] 18 22 + [\[] 24 24 + ['/'] 25 27 + [,] 28 28 + ['\\\\'] 30 33 + [\]] 34 34 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_string.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_string.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.txt new file mode 100644 index 0000000000..682993bda9 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/escaped_string.txt @@ -0,0 +1,22 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [var] 1 3 + [a] 5 5 + [=] 7 7 + ["a"] 9 11 +L2 + [var] 1 3 + [b] 5 5 + [=] 7 7 + ["b"] 9 11 +L3 + [var] 1 3 + [c] 5 5 + [=] 7 7 + ["c"] 9 11 +L4 + [var] 1 3 + [x] 5 5 + [=] 7 7 + ["$a(b: $b, c: \\"$c\\")"] 9 30 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/imports.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/imports.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.txt new file mode 100644 index 0000000000..49ab402048 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/imports.txt @@ -0,0 +1,2 @@ + [Image] or [Truncated image[ Bcol Ecol +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/increment.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/increment.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/increment.txt similarity index 99% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.txt rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/increment.txt index e2eaf416a6..5aa6366209 100644 --- a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.txt +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/increment.txt @@ -204,4 +204,4 @@ L24 [+=] 24 25 [1] 27 27 [}] 30 30 - [EOF] -1 -1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.txt new file mode 100644 index 0000000000..9d99c268e2 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex.txt @@ -0,0 +1,17 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [class] 1 5 + [MyClass] 7 13 + [{] 15 15 +L2 + [final] 3 7 + [regex] 9 13 + [=] 15 15 + [new] 17 19 + [RegExp] 21 26 + [(] 27 27 + [r'^--(\[a-zA-Z\\-_0-9\]+)(=(.*))?$[ 28 59 + [)] 60 60 +L3 + [}] 1 1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex2.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex2.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.txt new file mode 100644 index 0000000000..b9f0713719 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex2.txt @@ -0,0 +1,17 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [class] 1 5 + [MyClass] 7 13 + [{] 15 15 +L2 + [final] 3 7 + [regex] 9 13 + [=] 15 15 + [new] 17 19 + [RegExp] 21 26 + [(] 27 27 + [r"(^\[a-zA-Z\]\[-+.a-zA-Z\\d\]*://[ 28 64 + [)] 65 65 +L3 + [}] 1 1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex3.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex3.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.txt new file mode 100644 index 0000000000..1ea0c5a4d6 --- /dev/null +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/regex3.txt @@ -0,0 +1,17 @@ + [Image] or [Truncated image[ Bcol Ecol +L1 + [class] 1 5 + [MyClass] 7 13 + [{] 15 15 +L2 + [final] 3 7 + [regex] 9 13 + [=] 15 15 + [new] 17 19 + [RegExp] 21 26 + [(] 27 27 + [r'''\[ \\t\\r\\n"'\\\\/\]'''] 28 48 + [)] 49 49 +L3 + [}] 1 1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_multiline.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_multiline.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_multiline.txt similarity index 92% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.txt rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_multiline.txt index 5d6530a0c5..e122347bb1 100644 --- a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.txt +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_multiline.txt @@ -15,4 +15,4 @@ L7 ["""This is also a\nmulti-line stri[ 14 52 L9 [}] 1 1 - [EOF] -1 -1 +EOF diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_with_backslashes.dart similarity index 100% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.dart rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_with_backslashes.dart diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_with_backslashes.txt similarity index 90% rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.txt rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_with_backslashes.txt index fdaa1d6491..15d933b050 100644 --- a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.txt +++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testData/string_with_backslashes.txt @@ -10,4 +10,4 @@ L2 ["Escaping\\ spaces\\ should work"] 33 63 L3 [}] 1 1 - [EOF] -1 -1 +EOF 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 bfdcbc7047..51fac2dc06 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 @@ -28,7 +28,7 @@ abstract class CpdTextComparisonTest( get() = javaClass override val resourcePrefix: String - get() = "cpdData" + get() = "testData" override fun transformTextContent(sourceText: String): String { val sourceCode = SourceCode(SourceCode.StringCodeLoader(sourceText)) @@ -45,7 +45,12 @@ abstract class CpdTextComparisonTest( for (token in tokens.iterator()) { - if (curLine != token.beginLine && token !== TokenEntry.EOF) { + if (token === TokenEntry.EOF) { + append("EOF").appendln() + continue + } + + if (curLine != token.beginLine) { curLine = token.beginLine append('L').append(curLine).appendln() } diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/test/BaseTextComparisonTest.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/test/BaseTextComparisonTest.kt index 2c08a24590..0de187a5cc 100644 --- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/test/BaseTextComparisonTest.kt +++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/test/BaseTextComparisonTest.kt @@ -45,7 +45,7 @@ abstract class BaseTextComparisonTest { val expected = expectedFile.readText() - assertEquals(expected.normalize(), actual.normalize(), "Tree dump comparison failed, see the reference: $expectedFile") + assertEquals(expected.normalize(), actual.normalize(), "File comparison failed, see the reference: $expectedFile") } // Outputting a path makes for better error messages diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/AbstractTokenizerTest.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/AbstractTokenizerTest.java index d5046a6469..ba9f3d3ab5 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/AbstractTokenizerTest.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/AbstractTokenizerTest.java @@ -17,7 +17,9 @@ import net.sourceforge.pmd.cpd.Tokens; /** * @author Romain PELISSE, belaran@gmail.com * + * @deprecated Use CpdTextComparisonTest in module pmd-lang-test */ +@Deprecated public abstract class AbstractTokenizerTest { protected int expectedTokenCount;