Issue checkstyle#7855: Resolve Pitest Issues - IllegalImportCheck (2)

harsh-kukreja · Mar 27, 2020 · 80977b8 · 80977b8
1 parent dabbeba
commit 80977b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.ci/pitest.sh b/.ci/pitest.sh
@@ -72,7 +72,11 @@ pitest-imports)
   mvn -e -P$1 clean test org.pitest:pitest-maven:mutationCoverage;
   declare -a ignoredItems=(
   "CustomImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)) {</span></pre></td></tr>"
+<<<<<<< HEAD
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (!result &#38;&#38; illegalClasses != null) {</span></pre></td></tr>"
+=======
+  "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (regexp) {</span></pre></td></tr>"
+>>>>>>> aed53d1a9... Issue #7855: Resolve Pitest Issues - IllegalImportCheck (2)
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (!result) {</span></pre></td></tr>"
   "ImportControlLoader.java.html:<td class='covered'><pre><span  class='survived'>        else if (ALLOW_ELEMENT_NAME.equals(qName) || &#34;disallow&#34;.equals(qName)) {</span></pre></td></tr>"
   "ImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>                else if (matcher.start() == bestPos &#38;&#38; matcher.end() &#62; bestEnd) {</span></pre></td></tr>"

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java
@@ -419,7 +419,7 @@ private boolean isIllegalImportByPackagesAndClassNames(String importText) {
                 break;
             }
         }
-        if (!result && illegalClasses != null) {
+        if (illegalClasses != null) {
             for (String element : illegalClasses) {
                 if (importText.equals(element)) {
                     result = true;