From 556cc6da90522b56da23b5076c3092f3d7007446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Fri, 23 Jun 2017 15:45:58 -0300
Subject: [PATCH 1/2] [java] Fix NPE in JUnitTestsShouldIncludeAssertRule

 - Don't assume all anotations are marker annotations
 - Fixes #465
---
 .../JUnitTestsShouldIncludeAssertRule.java    |  3 +--
 .../xml/JUnitTestsShouldIncludeAssert.xml     | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
index eb20a28299..fd9678d0ac 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMarkerAnnotation;
@@ -81,7 +80,7 @@ public class JUnitTestsShouldIncludeAssertRule extends AbstractJUnitRule {
 
         for (NameDeclaration decl : decls.keySet()) {
             Node parent = decl.getNode().jjtGetParent().jjtGetParent().jjtGetParent();
-            if (parent.hasDescendantOfType(ASTAnnotation.class)
+            if (parent.hasDescendantOfType(ASTMarkerAnnotation.class)
                     && parent.getFirstChildOfType(ASTFieldDeclaration.class) != null) {
                 String annot = parent.getFirstDescendantOfType(ASTMarkerAnnotation.class).jjtGetChild(0).getImage();
                 if (!"Rule".equals(annot) && !"org.junit.Rule".equals(annot)) {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
index 61f5047edc..9014686439 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
@@ -392,6 +392,26 @@ public class FooTest {
 
         Mockito.verify(bar, Mockito.times(1)).actuallyDoTask();
     }
+}]]></code>
+    </test-code>
+    <test-code>
+        <description>#465 NullPointerException when dealing with @SuppressWarnings</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class FooTest {
+
+  @SuppressWarnings("deprecation")
+  private static Foo foo = new Foo();
+
+  @Test
+  public void testFoo() {
+    assertEquals("doesn't matter", "doesn't matter");
+  }
+
 }]]></code>
     </test-code>
 </test-data>

From 85092dba04c5588b78a0b911f216202cc267f347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Fri, 23 Jun 2017 15:48:39 -0300
Subject: [PATCH 2/2] Update changelog

---
 src/site/markdown/overview/changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index fe4c977dcd..1a9f281b10 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -71,6 +71,7 @@ Fields using generics are still Work in Progress, but we expect to fully support
     *   [#348](https://github.com/pmd/pmd/issues/348): \[java] imports/UnusedImport rule not considering static inner classes of imports
 *   java-junit
     *   [#428](https://github.com/pmd/pmd/issues/428): \[java] PMD requires public modifier on JUnit 5 test
+    *   [#465](https://github.com/pmd/pmd/issues/465): \[java] NullPointerException in JUnitTestsShouldIncludeAssertRule
 *   java-logging:
     *   [#365](https://github.com/pmd/pmd/issues/365): \[java] InvalidSlf4jMessageFormat does not handle inline incrementation of arguments
 *   java-strictexceptions