diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java index 52807c1119..34fc09ef57 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java @@ -162,7 +162,8 @@ public class JUnitTestsShouldIncludeAssertRule extends AbstractJUnitRule { private boolean isAssertOrFailStatement(ASTStatementExpression expression) { String img = getMethodCallNameOrNull(expression); return img != null && (img.startsWith("assert") || img.startsWith("fail") - || img.startsWith("Assert.assert") || img.startsWith("Assert.fail")); + || img.startsWith("Assert.assert") || img.startsWith("Assert.fail") + || img.startsWith("Assertions.assert") || img.startsWith("Assertions.fail")); } /** diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/JUnitTestsShouldIncludeAssert.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/JUnitTestsShouldIncludeAssert.xml index d94456d6e0..f388d81e00 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/JUnitTestsShouldIncludeAssert.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/JUnitTestsShouldIncludeAssert.xml @@ -529,6 +529,23 @@ public class FooTest extends TestCase { public void test2() { assertThat("doesn't matter", null, Matchers.nullValue()); } +} + ]]> + + + + AssertJ and JUnit5 ? + 0 +