From 4fc12f031c569df3e539007c6893d8cbb2aa07f5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 30 Sep 2022 10:21:25 +0200
Subject: [PATCH] [java] Fix rule tests with dysfunctional rule configurations

---
 .../bestpractices/xml/AvoidUsingHardCodedIP.xml     |  7 -------
 .../java/rule/design/xml/LoosePackageCoupling.xml   | 13 +------------
 .../lang/java/rule/design/xml/NPathComplexity.xml   |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml
index 39afc069c1..66ad2f040c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml
@@ -120,13 +120,6 @@ public class Foo {
         <code-ref id="addresses"/>
     </test-code>
 
-    <test-code>
-        <description>Comprehensive, check for nothing</description>
-        <rule-property name="checkAddressTypes"></rule-property>
-        <expected-problems>0</expected-problems>
-        <code-ref id="addresses"/>
-    </test-code>
-
     <test-code>
         <description>Comprehensive, check for IPv4</description>
         <rule-property name="checkAddressTypes">IPv4</rule-property>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml
index 871ad0543e..7a6a9dba22 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml
@@ -25,12 +25,6 @@ public class Foo {
 }
     ]]></code-fragment>
 
-    <test-code>
-        <description>default package: nothing configured, ok</description>
-        <expected-problems>0</expected-problems>
-        <code-ref id="default-package" />
-    </test-code>
-
     <test-code>
         <description>default package: unused package, ok</description>
         <rule-property name="packages">nothing.used</rule-property>
@@ -69,12 +63,6 @@ public class Foo {
         <code-ref id="default-package" />
     </test-code>
 
-    <test-code>
-        <description>some package: nothing configured, ok</description>
-        <expected-problems>0</expected-problems>
-        <code-ref id="some-package" />
-    </test-code>
-
     <test-code>
         <description>some package: unused package, ok</description>
         <rule-property name="packages">nothing.used</rule-property>
@@ -115,6 +103,7 @@ public class Foo {
 
     <test-code>
         <description>bug fix: annotation before package</description>
+        <rule-property name="packages">javax.xml.ws.wsaddressing</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 @javax.xml.bind.annotation.XmlSchema(namespace=W3CEndpointReference.NS, location="http://www.w3.org/2006/03/addressing/ws-addr.xsd")
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NPathComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NPathComplexity.xml
index 349bc22b27..a54d341e7d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NPathComplexity.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NPathComplexity.xml
@@ -62,10 +62,10 @@ public class Foo {
 
     <test-code>
         <description>Test default report level - report 200</description>
-        <rule-property name="reportLevel">0</rule-property>
+        <rule-property name="reportLevel">1</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The method 'bar()' has an NPath complexity of 200, current threshold is 0</message>
+            <message>The method 'bar()' has an NPath complexity of 200, current threshold is 1</message>
         </expected-messages>
         <code><![CDATA[
 public class Foo {