From fca93a29c9b3e7c2aa12044f310897155d8e64d6 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 14 Jan 2022 17:00:13 +0100
Subject: [PATCH] [java] Update rule AvoidThrowingRawExceptionTypes

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

diff --git a/.ci/files/all-java.xml b/.ci/files/all-java.xml
index 040fb26ada..bbd7b41d81 100644
--- a/.ci/files/all-java.xml
+++ b/.ci/files/all-java.xml
@@ -124,7 +124,7 @@
     <rule ref="category/java/design.xml/AvoidRethrowingException"/>
     <!-- <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/> -->
     <rule ref="category/java/design.xml/AvoidThrowingNullPointerException"/>
-    <!-- <rule ref="category/java/design.xml/AvoidThrowingRawExceptionTypes"/> -->
+    <rule ref="category/java/design.xml/AvoidThrowingRawExceptionTypes"/>
     <rule ref="category/java/design.xml/AvoidUncheckedExceptionsInSignatures"/>
     <rule ref="category/java/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
     <rule ref="category/java/design.xml/CognitiveComplexity" />
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index ff4d2f590e..4da918181b 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -254,7 +254,7 @@ Exception, or Error, use a subclassed exception or error instead.
             <property name="xpath">
                 <value>
 <![CDATA[
-//ThrowStatement//AllocationExpression
+//ThrowStatement//ConstructorCall
  /ClassOrInterfaceType[
  pmd-java:typeIsExactly('java.lang.Throwable')
 or
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java
index 77d90aefbe..e9370037f6 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java
@@ -6,7 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-@org.junit.Ignore("Rule has not been updated yet")
 public class AvoidThrowingRawExceptionTypesTest extends PmdRuleTst {
     public static class Throwable extends java.lang.Throwable {
         private static final long serialVersionUID = 1798165250043760600L;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidThrowingRawExceptionTypes.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidThrowingRawExceptionTypes.xml
index 6c63094a81..d61ae828a6 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidThrowingRawExceptionTypes.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidThrowingRawExceptionTypes.xml
@@ -7,6 +7,7 @@
     <test-code>
         <description>throwing various types</description>
         <expected-problems>4</expected-problems>
+        <expected-linenumbers>3,4,5,6</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     void bar() {
@@ -57,6 +58,7 @@ public class PmdTest {
     <test-code>
         <description>False negative when importing another exception</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>6</expected-linenumbers>
         <code><![CDATA[
 import java.io.IOException;