phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-466'

Browse Source
This commit is contained in:
Andreas Dangel
2017-06-24 11:08:26 +02:00
parent 0289fef501 85092dba04
commit 556d845a34
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
View File

@ -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)) {

20
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
View File

@ -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>