From 3cf085c966a8af3471ce5c4f805c87db46ac8cac Mon Sep 17 00:00:00 2001 From: Shashwat Jaiswal Date: Thu, 3 Sep 2020 14:51:10 +0530 Subject: [PATCH] Issue #7872: fixes Resolve Pitest Issues - ImportOrderCheck (1) --- .ci/pitest.sh | 1 - config/checkstyle_input_suppressions.xml | 1 + .../checks/imports/ImportOrderCheckTest.java | 10 ++++++++++ .../InputImportOrderSimilarGroupPattern.java | 8 ++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java diff --git a/.ci/pitest.sh b/.ci/pitest.sh index d93842678f22..637d55fd0729 100755 --- a/.ci/pitest.sh +++ b/.ci/pitest.sh @@ -72,7 +72,6 @@ pitest-imports) declare -a ignoredItems=( "IllegalImportCheck.java.html:
        if (!result) {
" "ImportControlLoader.java.html:
        else if (ALLOW_ELEMENT_NAME.equals(qName) || "disallow".equals(qName)) {
" - "ImportOrderCheck.java.html:
                else if (matcher.start() == bestPos && matcher.end() > bestEnd) {
" "ImportOrderCheck.java.html:
                if (!CommonUtil.endsWithChar(pkg, '.')) {
" "ImportOrderCheck.java.html:
        return !beforeFirstImport && line - lastImportLine > 1;
" "ImportOrderCheck.java.html:
            staticImportSeparator = isStatic && separated;
" diff --git a/config/checkstyle_input_suppressions.xml b/config/checkstyle_input_suppressions.xml index 4e3d7583e457..b64b004d309e 100644 --- a/config/checkstyle_input_suppressions.xml +++ b/config/checkstyle_input_suppressions.xml @@ -432,6 +432,7 @@ + diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java index b074d69bee22..cd084d0d5b0b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java @@ -223,6 +223,16 @@ public void testContainerCaseInsensitive() throws Exception { expected); } + @Test + public void testSimilarGroupPattern() throws Exception { + final DefaultConfiguration checkConfig = createModuleConfig(ImportOrderCheck.class); + checkConfig.addAttribute("groups", "/java.util/,/java.io/"); + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + + verify(checkConfig, getNonCompilablePath("InputImportOrderSimilarGroupPattern.java"), + expected); + } + @Test public void testInvalidOption() throws Exception { final DefaultConfiguration checkConfig = diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java new file mode 100644 index 000000000000..0dfaed0037d1 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java @@ -0,0 +1,8 @@ +package com.puppycrawl.tools.checkstyle.checks.imports.importorder; + +import java.util.java.io.File; +import java.io.File; + +public class InputImportOrderSimilarGroupPattern { + +}