diff --git a/.ci/pitest.sh b/.ci/pitest.sh
index 1ef1c66f490e..09b522d8467a 100755
--- a/.ci/pitest.sh
+++ b/.ci/pitest.sh
@@ -76,7 +76,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: final boolean separatorBetween = isStatic != lastImportStatic | "
- "ImportOrderCheck.java.html: if (caseSensitive) { | "
"ImportOrderCheck.java.html: if (!CommonUtil.endsWithChar(pkg, '.')) { | "
"ImportOrderCheck.java.html: if (isStatic) { | "
"ImportOrderCheck.java.html: return !beforeFirstImport && line - lastImportLine > 1; | "
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 50968889723b..122b2d785f37 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
@@ -794,6 +794,22 @@ public void testUseContainerOrderingForStaticTrueCaseSensitive() throws Exceptio
verify(checkConfig, getNonCompilablePath("InputImportOrderEclipseStatic.java"), expected);
}
+ @Test
+ public void testUseContainerOrderingForStatic() throws Exception {
+ final DefaultConfiguration checkConfig = createModuleConfig(ImportOrderCheck.class);
+ checkConfig.addAttribute("ordered", "true");
+ checkConfig.addAttribute("sortStaticImportsAlphabetically", "true");
+ checkConfig.addAttribute("useContainerOrderingForStatic", "true");
+ final String[] expected = {
+ "6:1: " + getCheckMessage(MSG_ORDERING,
+ "io.netty.handler.Codec.HTTP.HttpHeaders.elvis.same"),
+ "7:1: " + getCheckMessage(MSG_ORDERING,
+ "io.netty.handler.Codec.HTTP.HttpHeaders.TPARK.same"),
+ };
+ verify(checkConfig, getNonCompilablePath("InputImportOrderContainerOrdering.java"),
+ expected);
+ }
+
@Test
public void testImportGroupsRedundantSeparatedInternally() throws Exception {
final DefaultConfiguration checkConfig = createModuleConfig(ImportOrderCheck.class);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java
new file mode 100644
index 000000000000..2f284577208d
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java
@@ -0,0 +1,11 @@
+//non-compiled with javac: contains specially crafted set of imports for testing
+package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
+import static io.netty.handler.Codec.HTTP.HttpHeaders.elvis.same;
+import static io.netty.handler.Codec.HTTP.HttpHeaders.TPARK.same;
+
+public class InputImportOrderContainerOrdering {
+
+}