Issue #428: suppress violations fix

src/main/java/com/puppycrawl/tools/checkstyle/filters/LoadPatchFileUtils.java

@@ -69,12 +69,10 @@ public String getFileName() {
      */
     public List<List<Integer>> getLineRangeList() {
         final List<List<Integer>> lineRangeList = new ArrayList<>();
-        if (!"RENAME".equals(fileHeader.getChangeType().name())) {
-            for (HunkHeader hunkHeader : fileHeader.getHunks()) {
-                final EditList edits = hunkHeader.toEditList();
-                for (Edit edit : edits) {
-                    addSingleLineRange(lineRangeList, edit);
-                }
+        for (HunkHeader hunkHeader : fileHeader.getHunks()) {
+            final EditList edits = hunkHeader.toEditList();
+            for (Edit edit : edits) {
+                addSingleLineRange(lineRangeList, edit);
             }
         }
         return lineRangeList;

src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterTest.java

@@ -51,6 +51,12 @@ public void testDefaultStrategy() throws Exception {
         testByConfig("DefaultStrategy/defaultContextConfig.xml");
     }
 
+    @Test
+    public void testRenameWithModification() throws Exception {
+        testByConfig("RenameWithModification/newline/defaultContextConfig.xml");
+        testByConfig("RenameWithModification/patchedline/defaultContextConfig.xml");
+    }
+
     @Test
     public void testFileLength() throws Exception {
         testByConfig("FileLength/newline/defaultContextConfig.xml");

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/newline/Bar.java

@@ -0,0 +1,9 @@
+package Checker;
+
+public class Foo {
+    public static void main(String[] args) {
+        System.out.println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
+        System.out.println();
+        System.out.println();
+    }
+}

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/newline/defaultContext.patch

@@ -0,0 +1,16 @@
+diff --git a/Foo.java b/Bar.java
+similarity index 55%
+rename from Foo.java
+rename to Bar.java
+index d188913..400ac79 100644
+--- a/Foo.java
++++ b/Bar.java
+@@ -2,7 +2,7 @@ package Checker;
+
+ public class Foo {
+     public static void main(String[] args) {
+-        System.out.println("short");
++        System.out.println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
+         System.out.println();
+         System.out.println();
+     }

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/newline/defaultContextConfig.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <module name="LineLength">
+    <property name="max" value="80"/>
+  </module>
+  <module name="com.puppycrawl.tools.checkstyle.filters.SuppressionPatchFilter">
+    <property name="file" value="${tp}/defaultContext.patch" />
+    <property name="strategy" value="newline" />
+  </module>
+</module>

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/patchedline/Bar.java

@@ -0,0 +1,9 @@
+package Checker;
+
+public class Foo {
+    public static void main(String[] args) {
+        System.out.println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
+        System.out.println();
+        System.out.println();
+    }
+}

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/patchedline/defaultContext.patch

@@ -0,0 +1,16 @@
+diff --git a/Foo.java b/Bar.java
+similarity index 55%
+rename from Foo.java
+rename to Bar.java
+index d188913..400ac79 100644
+--- a/Foo.java
++++ b/Bar.java
+@@ -2,7 +2,7 @@ package Checker;
+
+ public class Foo {
+     public static void main(String[] args) {
+-        System.out.println("short");
++        System.out.println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
+         System.out.println();
+         System.out.println();
+     }

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/patchedline/defaultContextConfig.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <module name="LineLength">
+    <property name="max" value="80"/>
+  </module>
+  <module name="com.puppycrawl.tools.checkstyle.filters.SuppressionPatchFilter">
+    <property name="file" value="${tp}/defaultContext.patch" />
+    <property name="strategy" value="patchedline" />
+  </module>
+</module>

src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionpatchfilter/RenameWithModification/patchedline/expected.txt

@@ -0,0 +1 @@
+Bar.java:5: Line is longer than 80 characters (found 117).