From eb746f5ac62d701c15dc44a737b5da68232be86c Mon Sep 17 00:00:00 2001 From: sachin29aug Date: Tue, 5 Jun 2018 23:05:43 +0530 Subject: [PATCH] BAEL-6839: Updated pmd unit tests rule - Allow tests ending with "jmhTest" and disallow ones ending with "Tests" (#4411) * BAEL-6839: Updated the unit tests convention pmd rule - Don't allow unit tests ending with "Tests" and allow the ones ending with "jmhTest" ("*jmhTest" are autogenerated) * fixed formatting issue - Replaced tabs with spaces --- custom-pmd-0.0.1.jar | Bin 3288 -> 3311 bytes .../pmd/UnitTestNamingConventionRule.java | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/custom-pmd-0.0.1.jar b/custom-pmd-0.0.1.jar index 4ad69338657fa4a0da39a243e8bc151987b9cd19..5038a704752743a87999b917976d11c78b322af1 100644 GIT binary patch literal 3311 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 diff --git a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java b/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java index 4136165b6f..9a2795b581 100644 --- a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java +++ b/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java @@ -14,17 +14,16 @@ public class UnitTestNamingConventionRule extends AbstractJavaRule { "ManualTest", "JdbcTest", "LiveTest", - "UnitTest"); + "UnitTest", + "jmhTest"); public Object visit(ASTClassOrInterfaceDeclaration node, Object data) { String className = node.getImage(); Objects.requireNonNull(className); - if (className.endsWith("Test") || className.endsWith("Tests")) { - if (allowedEndings.stream() - .noneMatch(className::endsWith)) { - addViolation(data, node); - } + if (className.endsWith("Tests") + || (className.endsWith("Test") && allowedEndings.stream().noneMatch(className::endsWith))) { + addViolation(data, node); } return data;