From 987da9a6c87eeb2673d3d44003bbba7bb947be1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 15 May 2021 20:28:27 +0200
Subject: [PATCH] Fix message

---
 .../resources/category/java/bestpractices.xml |  2 +-
 .../bestpractices/xml/PreserveStackTrace.xml  | 20 +++++++++++++++++++
 2 files changed, 21 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 75f2b86ed8..e47e0dbd8b 100644
--- a/pmd-java/src/main/resources/category/java/bestpractices.xml
+++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -1066,7 +1066,7 @@ String name,
     <rule name="PreserveStackTrace"
           language="java"
           since="3.7"
-          message="Thrown exception does not preserve the stack trace of exception '{0}' on all code paths"
+          message="Thrown exception does not preserve the stack trace of exception ''{0}'' on all code paths"
           class="net.sourceforge.pmd.lang.java.rule.bestpractices.PreserveStackTraceRule"
           externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_bestpractices.html#preservestacktrace">
         <description>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/PreserveStackTrace.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/PreserveStackTrace.xml
index 0079046d7f..469d2fb1f8 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/PreserveStackTrace.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/PreserveStackTrace.xml
@@ -1115,5 +1115,25 @@ public class SomeOtherUserDefinedException extends Exception {
             }
             ]]></code>
     </test-code>
+    <test-code>
+        <description>Test the message</description>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>Thrown exception does not preserve the stack trace of exception 'ex' on all code paths</message>
+        </expected-messages>
+        <code><![CDATA[
+            public abstract class AbstractNamedValueMethodArgumentResolver {
+                protected void setThrowingNameNoCheck(String name) {
+                    try {
+                        // this.discoveredThrowingType = ClassUtils.forName(name, getAspectClassLoader());
+                    } catch (Throwable ex) {
+                        throw new IllegalArgumentException("Throwing name '" + name  +
+                                                                   "' is neither a valid argument name nor the fully-qualified " +
+                                                                   "name of a Java type on the classpath. Root cause: " + ex);
+                    }
+                }
+            }
+            ]]></code>
+    </test-code>
 
 </test-data>