Also consider line moves

Author: oowekyala

lib/pmdtester/parsers/pmd_report_document.rb

@@ -31,9 +31,9 @@ def start_element(name, attrs = [])
       when 'file'
         remove_work_dir!(attrs['name'])
         @current_violations = []
-        @current_filename = attrs['name']
+        @current_filename = attrs['name'].freeze
       when 'violation'
-        @current_violation = PmdViolation.new(attrs, @branch_name)
+        @current_violation = PmdViolation.new(attrs, @branch_name, @current_filename)
       when 'error'
         remove_work_dir!(attrs['filename'])
         remove_work_dir!(attrs['msg'])

lib/pmdtester/pmd_violation.rb

@@ -47,40 +47,58 @@ class PmdViolation
     # </xs:complexType>
 
     attr_reader :attrs
+    attr_reader :fname
     attr_accessor :text
 
     # means it was in both branches but changed messages
     attr_accessor :changed
 
-    def initialize(attrs, branch)
+    def initialize(attrs, branch, fname)
       @attrs = attrs
       @branch = branch
       @changed = false
+      @fname = fname
       @text = ''
     end
 
-    def same_modulo_message?(other)
-      @attrs['beginline'].eql?(other.attrs['beginline']) &&
-        @attrs['rule'].eql?(other.attrs['rule'])
+    def line_move?(other)
+      message.eql?(other.message) && (line - other.line).abs == 1
     end
 
     def try_merge?(other)
-      if branch != BASE && @branch != other.branch && same_modulo_message?(other)
+      if branch != BASE && branch != other.branch && rule_name == other.rule_name &&
+         (line == other.line || line_move?(other))
         @changed = true
         @attrs['oldMessage'] = other.text
+        @attrs['oldLine'] = other.line
+        puts "Merged #{self} into #{other}"
         true
       else
         false
       end
     end
 
+    def line
+      @attrs['beginline']
+    end
+
+    def rule_name
+      @attrs['rule']
+    end
+
+    def message
+      @text
+    end
+
     def eql?(other)
-      same_modulo_message?(other) &&
-        @text.eql?(other.text)
+      rule_name.eql?(other.rule_name) &&
+        line.eql?(other.line) &&
+        fname.eql?(other.fname) &&
+        message.eql?(other.message)
     end
 
     def hash
-      [@attrs['beginline'], @attrs['rule'], @text].hash
+      [line, rule_name, message].hash
     end
   end
 end

lib/pmdtester/report_diff.rb

@@ -151,6 +151,7 @@ def build_diffs(base_hash, patch_hash)
     # @param diff_violations a hash { filename => list[violation]}, containing those that changed
     def merge_changed_violations(diff_violations)
       diff_violations.each do |fname, different|
+        different.sort_by!(&:line)
         diff_violations[fname] = different.dup.delete_if do |v|
           v.branch == BASE &&
             # try_merge will set v2.changed = true if it succeeds

pmdtester.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.metadata = { "bug_tracker_uri" => "https://github.com/pmd/pmd-regression-tester/issues", "homepage_uri" => "https://pmd.github.io", "source_code_uri" => "https://github.com/pmd/pmd-regression-tester" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andreas Dangel".freeze, "Binguo Bao".freeze]
-  s.date = "2020-10-28"
+  s.date = "2020-11-04"
   s.description = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze]
   s.executables = ["pmdtester".freeze]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.licenses = ["BSD-2-Clause".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.7".freeze)
-  s.rubygems_version = "3.1.4".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
 
   if s.respond_to? :specification_version then