From 7ccd087701d1de5276e148a3b89e9b5e55f3fe46 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 26 Jun 2020 18:36:08 +0200
Subject: [PATCH] Fix compile errors

---
 .../sourceforge/pmd/lang/rule/XPathRuleTest.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
index 47ae891d12..84c5085152 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
@@ -17,8 +17,8 @@ import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyNodeWithDeprecatedAttribute;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.ast.DummyNodeWithListAndEnum;
+import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
@@ -45,26 +45,26 @@ public class XPathRuleTest {
         RuleContext ctx = new RuleContext();
         ctx.setLanguageVersion(LanguageRegistry.getLanguage(DummyLanguageModule.NAME).getDefaultVersion());
         DummyNode firstNode = newNodeWithList();
-        eval(ctx, xpr, firstNode);
+        xpr.apply(firstNode, ctx);
         assertEquals(1, ctx.getReport().size());
 
         String log = loggingRule.getLog();
         assertThat(log, Matchers.containsString("Use of deprecated attribute 'dummyNode/@List' by XPath rule 'TestRuleWithListAccess'"));
 
         loggingRule.clear();
-        eval(ctx, xpr, newNodeWithList()); // with another node
+        xpr.apply(newNodeWithList(), ctx); // with another node
         assertEquals(2, ctx.getReport().size());
         assertEquals("", loggingRule.getLog()); // no addtional warnings
 
         // with another rule forked from the same one (in multithreaded processor)
-        eval(ctx, xpr.deepCopy(), newNodeWithList());
+        xpr.deepCopy().apply(newNodeWithList(), ctx);
         assertEquals(3, ctx.getReport().size());
         assertEquals("", loggingRule.getLog()); // no addtional warnings
 
         // with another rule on the same node, new warnings
         XPathRule otherRule = makeRuleWithList("OtherTestRuleWithListAccess");
         otherRule.setRuleSetName("rset.xml");
-        eval(ctx, otherRule, firstNode);
+        otherRule.apply(firstNode, ctx);
         assertEquals(4, ctx.getReport().size());
         log = loggingRule.getLog();
         assertThat(log, Matchers.containsString("Use of deprecated attribute 'dummyNode/@List' by XPath rule 'OtherTestRuleWithListAccess' (in ruleset 'rset.xml')"));
@@ -80,9 +80,11 @@ public class XPathRuleTest {
 
 
     private DummyNode newNodeWithList() {
+        DummyRoot root = new DummyRoot();
         DummyNode firstNode = new DummyNodeWithListAndEnum(0);
         firstNode.setCoords(1, 1, 1, 2);
-        return firstNode;
+        root.addChild(firstNode, 0);
+        return root;
     }
 
     public void testDeprecation(XPathVersion version) {