Update patch files against pmd 7

Author: adangel

test/manual_integration_tests.rb

@@ -115,7 +115,7 @@ def test_case_2_single_xpath_rule_changed
 
   def test_case_3_change_in_core
     checkout_pmd_branch
-    prepare_patch_branch('patch_test_case_3_modify_PMD.patch', 'test-case-3')
+    prepare_patch_branch('patch_test_case_3_modify_pmd-core.patch', 'test-case-3')
 
     run_pmd_tester
 

test/resources/manual_integration_tests/patch_test_case_1_disable_AbstractClassWithoutAbstractMethod.patch

@@ -1,7 +1,7 @@
-From df7e43732794442b7c787493a2189b0c4a0e3f85 Mon Sep 17 00:00:00 2001
+From ab94c0fed1813eb5e8376be51a7c93164652e26b Mon Sep 17 00:00:00 2001
 From: Andreas Dangel <[email protected]>
-Date: Thu, 14 Jan 2021 11:25:58 +0100
-Subject: [PATCH] pmd-regression-test: test case 1 - single java rule changed
+Date: Thu, 4 May 2023 19:44:31 +0200
+Subject: [PATCH] test case 1 - single java rule changed
 
 A single rule (java class) is changed. Only this rule should be executed
 and only this rule should be compared (ruleset is filtered).
@@ -15,34 +15,33 @@ exactly this rule.
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodRule.java
-index 3f20b559d5..4ef489c23b 100644
+index 0d0d8c33e4..972e1bd62a 100644
 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodRule.java
 +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodRule.java
-@@ -35,7 +35,7 @@ public class AbstractClassWithoutAbstractMethodRule extends AbstractJavaRule {
-             }
+@@ -22,7 +22,7 @@ public class AbstractClassWithoutAbstractMethodRule extends AbstractJavaRulechai
          }
-         if (countOfAbstractMethods == 0) {
+ 
+         if (node.getDeclarations(ASTMethodDeclaration.class).none(ASTMethodDeclaration::isAbstract)) {
 -            addViolation(data, node);
 +            //addViolation(data, node);
          }
          return data;
      }
 diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java
-index a7ff179f29..ac4d852e26 100644
+index b319c5e9f1..77698edb60 100644
 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java
 +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java
 @@ -4,8 +4,11 @@
 
  package net.sourceforge.pmd.lang.java.rule.bestpractices;
 
-+import org.junit.Ignore;
++import org.junit.jupiter.api.Disabled;
 +
  import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-+@Ignore
- public class AbstractClassWithoutAbstractMethodTest extends PmdRuleTst {
++@Disabled
+ class AbstractClassWithoutAbstractMethodTest extends PmdRuleTst {
      // no additional unit tests
  }
 -- 
-2.29.2
-
+2.39.2

test/resources/manual_integration_tests/patch_test_case_2_disable_AvoidMessageDigestField.patch

@@ -1,6 +1,6 @@
-From 8db783f7f0bdb7b4c9dd7a7bd19f6c7bf0bc4f06 Mon Sep 17 00:00:00 2001
+From 1614ba4af8a0869f7bbc7b8dca60f1d7802218cc Mon Sep 17 00:00:00 2001
 From: Andreas Dangel <[email protected]>
-Date: Thu, 14 Jan 2021 18:59:31 +0100
+Date: Thu, 4 May 2023 19:54:59 +0200
 Subject: [PATCH] test case 2 - single xpath rule changed
 
 The rule AvoidMessageDigestField is disabled
@@ -15,34 +15,33 @@ the baseline.
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
-index 59e5e56c72..c29a13748e 100644
+index 728ab98c9b..836428d33e 100644
 --- a/pmd-java/src/main/resources/category/java/bestpractices.xml
 +++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
-@@ -140,7 +140,7 @@ public class Foo {
+@@ -147,7 +147,7 @@ public class Foo {
              <property name="xpath">
                  <value>
                      <![CDATA[
--//FieldDeclaration[pmd-java:typeIs('java.security.MessageDigest')]
-+//FieldDeclaration[pmd-java:typeIs('java.security.MessageDigestFoo')]
+-//FieldDeclaration/ClassOrInterfaceType[pmd-java:typeIs('java.security.MessageDigest')]
++//FieldDeclaration/ClassOrInterfaceType[pmd-java:typeIs('java.security.MessageDigestFoo')]
  ]]>
                  </value>
              </property>
 diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java
-index 37d37625e7..ef3c8aa5c6 100644
+index df4543674d..f5c87e6705 100644
 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java
 +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java
 @@ -4,8 +4,11 @@
 
  package net.sourceforge.pmd.lang.java.rule.bestpractices;
 
-+import org.junit.Ignore;
++import org.junit.jupiter.api.Disabled;
 +
  import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-+@Ignore
- public class AvoidMessageDigestFieldTest extends PmdRuleTst {
++@Disabled
+ class AvoidMessageDigestFieldTest extends PmdRuleTst {
      // no additional unit tests
  }
 -- 
-2.29.2
-
+2.39.2

test/resources/manual_integration_tests/patch_test_case_3_modify_PMD.patch

@@ -0,0 +1,25 @@
+From 478d9f3767a449aefa8fb211e4e11debd9d7a6b6 Mon Sep 17 00:00:00 2001
+From: Andreas Dangel <[email protected]>
+Date: Thu, 4 May 2023 19:58:47 +0200
+Subject: [PATCH] test case 3 - change in pmd-core
+
+This changes the class PMDVersion which will trigger a
+complete reevaluation of all rules by the regression tester.
+---
+ pmd-core/src/main/java/net/sourceforge/pmd/PMDVersion.java | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDVersion.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDVersion.java
+index 96565eca93..a9b134b4ff 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDVersion.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDVersion.java
+@@ -2,6 +2,7 @@
+  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+  */
+ 
++
+ package net.sourceforge.pmd;
+ 
+ import java.io.IOException;
+-- 
+2.39.2

test/resources/manual_integration_tests/patch_test_case_3_modify_pmd-core.patch

@@ -1,27 +1,27 @@
-From a3787300903ed6f721525e342f921e733c8a633f Mon Sep 17 00:00:00 2001
+From e1138cff3fff770e1b74688882e5bf09269b3a06 Mon Sep 17 00:00:00 2001
 From: Andreas Dangel <[email protected]>
-Date: Thu, 14 Jan 2021 19:53:13 +0100
+Date: Thu, 4 May 2023 20:00:52 +0200
 Subject: [PATCH] test case 4 - unrelated change
 
 This commit changes a file in /docs. This definitely doesn't
 change any code, so the regression tester should skip the
 execution.
 ---
- docs/index.md | 1 +
- 1 file changed, 1 insertion(+)
+ docs/index.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/docs/index.md b/docs/index.md
-index 55e9c9e5cd..0fa51ba7fd 100644
+index be951ab7f8..eb030aa757 100644
 --- a/docs/index.md
 +++ b/docs/index.md
-@@ -14,6 +14,7 @@ author: Jeff Jensen <[email protected]>, Andreas Dangel <andreas.dangel@adangel
+@@ -17,7 +17,7 @@ additional_js:
+  - js/shuffle.js
+ ---
 
+-
++<!-- some change in docs -->
 
+ ## 💡 Overview
 
-+
- {% unless site.output == "pdf" %}
- <script src="js/jquery.shuffle.min.js"></script>
- <script src="js/jquery.ba-throttle-debounce.min.js"></script>
 -- 
-2.29.2
-
+2.39.2