Fix last tests

pmd-core/src/main/java/net/sourceforge/pmd/SourceCodeProcessor.java

@@ -149,8 +149,8 @@ public class SourceCodeProcessor {
             SemanticErrorReporter.noop() // TODO
         );
 
+        // todo following 2 lines should be deleted
         languageVersion.getLanguageVersionHandler().declareParserTaskProperties(task.getProperties());
-
         task.getProperties().setProperty(ParserTask.COMMENT_MARKER, configuration.getSuppressMarker());
 
         Parser parser = languageVersion.getLanguageVersionHandler().getParser();

pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java

@@ -9,7 +9,6 @@ import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed;
 
 import org.junit.Test;
 
-import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 import net.sourceforge.pmd.lang.java.symboltable.BaseNonParserTest;
@@ -38,7 +37,7 @@ public class ExcludeLinesTest extends BaseNonParserTest {
 
     @Test
     public void testAlternateMarker() {
-        Report rpt = java.withParserConfig(p -> p.setProperty(ParserTask.COMMENT_MARKER, "FOOBAR")).executeRule(getRule(), TEST3);
+        Report rpt = java.withSuppressMarker("FOOBAR").executeRule(getRule(), TEST3);
         assertSize(rpt, 0);
         assertSuppressed(rpt, 1);
     }

pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java

@@ -17,7 +17,6 @@ import org.mozilla.javascript.ast.AstRoot;
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
 
 public class EcmascriptParserTest extends EcmascriptParserTestBase {
@@ -150,7 +149,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
         assertEquals(" I know what I'm doing", root.getAstInfo().getSuppressionComments().get(2));
         assertEquals(1, root.getAstInfo().getSuppressionComments().size());
 
-        root = js.withParserConfig(p -> p.setProperty(ParserTask.COMMENT_MARKER, "FOOOO"))
+        root = js.withSuppressMarker("FOOOO")
                  .parse("function(x) {\n" + "y = y; //NOPMD xyz\n" + "x = x; //FOOOO I know what I'm doing\n" + "}\n");
         assertEquals(" I know what I'm doing", root.getAstInfo().getSuppressionComments().get(3));
         assertEquals(1, root.getAstInfo().getSuppressionComments().size());

pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt

@@ -4,9 +4,11 @@
 package net.sourceforge.pmd.lang.ast.test
 
 import net.sourceforge.pmd.*
-import net.sourceforge.pmd.lang.*
+import net.sourceforge.pmd.lang.Language
+import net.sourceforge.pmd.lang.LanguageRegistry
+import net.sourceforge.pmd.lang.LanguageVersion
+import net.sourceforge.pmd.lang.LanguageVersionHandler
 import net.sourceforge.pmd.lang.ast.*
-import net.sourceforge.pmd.properties.PropertySource
 import net.sourceforge.pmd.util.datasource.DataSource
 import org.apache.commons.io.IOUtils
 import java.io.File
@@ -15,7 +17,6 @@ import java.io.StringReader
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.function.Consumer
 
 /**
  * Language-independent base for a parser utils class.
@@ -32,7 +33,7 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
             val defaultVerString: String?,
             val resourceLoader: Class<*>?,
             val resourcePrefix: String,
-            val configureParser: (PropertySource) -> Unit = {},
+            val suppressMarker: String = PMD.SUPPRESS_MARKER,
     ) {
         companion object {
 
@@ -94,13 +95,8 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
             clone(params.copy(resourceLoader = contextClass, resourcePrefix = resourcePrefix))
 
 
-    /**
+    fun withSuppressMarker(marker: String): Self =
-     * Returns an instance of [Self] which configures the parser task with the
+            clone(params.copy(suppressMarker = marker))
-     * given closure.
-     */
-    fun withParserConfig(configFun: Consumer<PropertySource>): Self =
-            clone(params.copy(configureParser = { configFun.accept(it) }))
-
 
     fun getHandler(version: String): LanguageVersionHandler {
         return getVersion(version).languageVersionHandler
@@ -125,11 +121,11 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
         val handler = lversion.languageVersionHandler
         val parser = handler.parser
         val source = DataSource.forString(sourceCode, filename)
-        val toString = DataSource.readToString(source, StandardCharsets.UTF_8)
+        val toString = DataSource.readToString(source, StandardCharsets.UTF_8) // this removed the BOM
         val task = Parser.ParserTask(lversion, filename, toString, SemanticErrorReporter.noop())
         task.properties.also {
             handler.declareParserTaskProperties(it)
-            params.configureParser(it)
+            it.setProperty(Parser.ParserTask.COMMENT_MARKER, params.suppressMarker)
         }
         val rootNode = rootClass.cast(parser.parse(task))
         if (params.doProcess) {
@@ -226,12 +222,13 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
     @JvmOverloads
     fun executeRule(rule: Rule, code: String, filename: String = "testfile.${language.extensions[0]}"): Report {
         val p = PMD()
-        // p.configuration.suppressMarker = this.params.parserOptions?.suppressMarker ?: PMD.SUPPRESS_MARKER
+        p.configuration.suppressMarker = this.params.suppressMarker
         val ctx = RuleContext()
         val report = Report()
         ctx.report = report
         ctx.sourceCodeFile = File(filename)
         ctx.isIgnoreExceptions = false
+
         val rules = RuleSet.forSingleRule(rule)
         try {
             p.sourceCodeProcessor.processSourceCode(StringReader(code), RuleSets(rules), ctx)