From d66d8828ab7348ac36604198f682ff341cd57468 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Mon, 29 Nov 2021 09:45:19 +0100
Subject: [PATCH] [java] Update rule DoNotThrowExceptionInFinally

---
 .ci/files/all-java.xml                                          | 2 +-
 pmd-java/src/main/resources/category/java/errorprone.xml        | 2 +-
 .../java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java  | 1 -
 .../java/rule/errorprone/xml/DoNotThrowExceptionInFinally.xml   | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/files/all-java.xml b/.ci/files/all-java.xml
index 4934c62336..13e816df1f 100644
--- a/.ci/files/all-java.xml
+++ b/.ci/files/all-java.xml
@@ -207,7 +207,7 @@
     <rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
     <!-- <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/> -->
     <!-- <rule ref="category/java/errorprone.xml/DoNotHardCodeSDCard"/> -->
-    <!-- <rule ref="category/java/errorprone.xml/DoNotThrowExceptionInFinally"/> -->
+    <rule ref="category/java/errorprone.xml/DoNotThrowExceptionInFinally"/>
     <rule ref="category/java/errorprone.xml/DontImportSun"/>
     <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
     <rule ref="category/java/errorprone.xml/EmptyCatchBlock"/>
diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml
index 5fe1013003..020b1b4f9c 100644
--- a/pmd-java/src/main/resources/category/java/errorprone.xml
+++ b/pmd-java/src/main/resources/category/java/errorprone.xml
@@ -1362,7 +1362,7 @@ Note: This is a PMD implementation of the Lint4j rule "A throw in a finally bloc
         <priority>4</priority>
         <properties>
             <property name="xpath">
-                <value>//FinallyStatement[descendant::ThrowStatement]</value>
+                <value>//FinallyClause[descendant::ThrowStatement]</value>
             </property>
         </properties>
         <example>
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java
index ffc395f8de..1fdda55c42 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java
@@ -6,7 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-@org.junit.Ignore("Rule has not been updated yet")
 public class DoNotThrowExceptionInFinallyTest extends PmdRuleTst {
     // no additional unit tests
 }
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/DoNotThrowExceptionInFinally.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/DoNotThrowExceptionInFinally.xml
index 21893f434f..b8c872108e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/DoNotThrowExceptionInFinally.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/DoNotThrowExceptionInFinally.xml
@@ -7,6 +7,7 @@
     <test-code>
         <description>classic failure case</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>8</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     public void bar() {