From 256a7cd565b09aed48adde35f9bee34b501a8899 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 3 Apr 2020 19:47:48 +0200
Subject: [PATCH] [java] Fix annotation check for unit test rules

---
 pmd-java/src/main/resources/category/java/bestpractices.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
index 4031c2e79c..5edddd354e 100644
--- a/pmd-java/src/main/resources/category/java/bestpractices.xml
+++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -641,7 +641,7 @@ JUnit 5 introduced @AfterEach and @AfterAll annotations to execute methods after
 <![CDATA[
 //ClassOrInterfaceBodyDeclaration
     [MethodDeclaration[@Name='tearDown']]
-    [not(Annotation/MarkerAnnotation/Name[
+    [not(Annotation/*/Name[
            pmd-java:typeIs('org.junit.After')
         or pmd-java:typeIs('org.junit.jupiter.api.AfterEach')
         or pmd-java:typeIs('org.junit.jupiter.api.AfterAll')
@@ -686,7 +686,7 @@ JUnit 5 introduced @BeforeEach and @BeforeAll annotations to execute methods bef
 <![CDATA[
 //ClassOrInterfaceBodyDeclaration
     [MethodDeclaration[@Name='setUp']]
-    [not(Annotation/MarkerAnnotation/Name[
+    [not(Annotation/*/Name[
            pmd-java:typeIs('org.junit.Before')
         or pmd-java:typeIs('org.junit.jupiter.api.BeforeEach')
         or pmd-java:typeIs('org.junit.jupiter.api.BeforeAll')