From 351e53866ccb82e3aa848c503983f3d8e76a0477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 15 Feb 2020 13:20:22 +0100
Subject: [PATCH] Fix tests

---
 .../pmd/lang/rule/internal/LatticeRelation.java            | 7 -------
 .../test/resources/net/sourceforge/pmd/TestRuleset1.xml    | 3 ++-
 .../net/sourceforge/pmd/test/lang/DummyLanguageModule.java | 2 +-
 .../net/sourceforge/pmd/testframework/RuleTstTest.java     | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelation.java
index 302c6d8f6e..4cf31ee041 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelation.java
@@ -202,13 +202,6 @@ class LatticeRelation<T, @NonNull U> {
             node.resetFrozenData();
         }
 
-        /*
-            We need to do all this because there may be diamonds
-            in the lattice, in which case some nodes are reachable through
-            several paths and we would risk combining their proper values
-            several times.
-         */
-
         int n = nodes.size();
 
         // topological sort
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml
index 628f1b0761..8055258242 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml
@@ -42,6 +42,7 @@ Just for test
         <properties>
             <property name="test2" type="String" description="test 2" value="foo"/>
             <property name="test3" type="String" description="test 3" value="bar"/>
+            <property name="xpath" value="//dummyNode" />
         </properties>
         <example>
             <![CDATA[
@@ -52,4 +53,4 @@ Just for test
 
     <rule name="TestRuleRef" ref="net/sourceforge/pmd/TestRuleset2.xml/TestRule"/>
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
index 57b2611d6e..8a8a25793d 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
@@ -63,7 +63,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
         }
     }
 
-    private static class DummyRootNode extends DummyNode implements RootNode {
+    public static class DummyRootNode extends DummyNode implements RootNode {
 
     }
 
diff --git a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
index 60f22d953b..1047c2bc60 100644
--- a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
+++ b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
@@ -49,7 +49,7 @@ public class RuleTstTest {
         verify(rule).start(any(RuleContext.class));
         verify(rule).end(any(RuleContext.class));
         verify(rule).getLanguage();
-        verify(rule).getTargetingStrategy();
+        verify(rule, times(2)).getTargetingStrategy();
         verify(rule).getMinimumLanguageVersion();
         verify(rule).getMaximumLanguageVersion();
         verify(rule).apply(any(Node.class), any(RuleContext.class));