diff --git a/.ci/pitest.sh b/.ci/pitest.sh index a5633723ae6..3a297f92bc1 100755 --- a/.ci/pitest.sh +++ b/.ci/pitest.sh @@ -73,7 +73,6 @@ pitest-imports) "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:
        if (isStatic) {
" "ImportOrderCheck.java.html:
        return !beforeFirstImport && line - lastImportLine > 1;
" "ImportOrderCheck.java.html:
            staticImportSeparator = isStatic && separated;
" "PkgImportControl.java.html:
        if (alreadyRegex) {
" 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 9644eaaf4a7..72f64d55167 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 @@ -71,6 +71,23 @@ public void testDefault() throws Exception { verify(checkConfig, getNonCompilablePath("InputImportOrder.java"), expected); } + @Test + public void testWrongSequenceInNonStaticImports() throws Exception { + final DefaultConfiguration checkConfig = + createModuleConfig(ImportOrderCheck.class); + checkConfig.addAttribute("useContainerOrderingForStatic", "false"); + checkConfig.addAttribute("sortStaticImportsAlphabetically", "false"); + checkConfig.addAttribute("option", "bottom"); + + final String[] expected = { + "4:1: " + getCheckMessage(MSG_ORDERING, + "java.util.HashMap"), + }; + + verify(checkConfig, + getNonCompilablePath("InputImportOrderNonStaticWrongSequence.java"), expected); + } + @Test public void testMultilineImport() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(ImportOrderCheck.class); diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java new file mode 100644 index 00000000000..25ae1d817c0 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java @@ -0,0 +1,9 @@ +package com.puppycrawl.tools.checkstyle.checks.imports.importorder; + +import java.util.LinkedList; +import java.util.HashMap; + +class InputImportOrderNonStaticWrongSequence { +} + +