From a1c1945309280d05e2b55bb38c0ed27c857b0d77 Mon Sep 17 00:00:00 2001 From: Andrei Paikin Date: Thu, 17 Dec 2020 17:48:26 +0300 Subject: [PATCH] Issue #7875: resolve pitest issue for ImportOrderCheck --- .ci/pitest.sh | 1 - .../checks/imports/ImportOrderCheckTest.java | 10 ++++++---- .../importorder/InputImportOrder_DotPackageName.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java diff --git a/.ci/pitest.sh b/.ci/pitest.sh index be0a940d2f7..c21d5e0ddb8 100755 --- a/.ci/pitest.sh +++ b/.ci/pitest.sh @@ -64,7 +64,6 @@ pitest-imports) mvn -e -P$1 clean test org.pitest:pitest-maven:mutationCoverage; declare -a ignoredItems=( "ImportControlLoader.java.html:
        else if (ALLOW_ELEMENT_NAME.equals(qName) || "disallow".equals(qName)) {
" - "ImportOrderCheck.java.html:
                if (!CommonUtil.endsWithChar(pkg, '.')) {
" "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 cd084d0d5b0..daf9f04b1e9 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 @@ -657,10 +657,12 @@ public void testGroupWithSlashes() throws Exception { @Test public void testGroupWithDot() throws Exception { final DefaultConfiguration checkConfig = createModuleConfig(ImportOrderCheck.class); - checkConfig.addAttribute("groups", "java.awt."); - final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - - verify(checkConfig, getPath("InputImportOrder_NoFailureForRedundantImports.java"), + checkConfig.addAttribute("groups", "javax.swing.,java.awt."); + final String[] expected = { + "5:1: " + getCheckMessage(MSG_ORDERING, "java.awt.Dialog"), + "7:1: " + getCheckMessage(MSG_ORDERING, "javax.swing.JComponent"), + }; + verify(checkConfig, getPath("InputImportOrder_DotPackageName.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java new file mode 100644 index 00000000000..320b20d3094 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java @@ -0,0 +1,12 @@ +package com.puppycrawl.tools.checkstyle.checks.imports.importorder; + +import java.awt.Button; +import java.awt.Frame; +import java.awt.Dialog; +import java.awt.event.ActionEvent; +import javax.swing.JComponent; +import javax.swing.JTable; + +public class InputImportOrder_DotPackageName { +} +