Fix merge

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

@@ -252,5 +252,12 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
     }
 
     fun executeRuleOnResource(rule: Rule, resourcePath: String): Report =
-            executeRule(rule, readResource(resourcePath))
+        executeRule(rule, code = readResource(resourcePath))
+
+    fun executeRuleOnFile(rule: Rule, path: Path): Report =
+        executeRule(
+            rule,
+            code = Files.newBufferedReader(path).readText(),
+            fileName = path.toString()
+        )
 }