Some cleanups

Integration tests pass locally so I don't
know what the ci is doing differently

Also fix a deprecation warning

Author: oowekyala

lib/pmdtester/builders/pmd_report_builder.rb

@@ -132,12 +132,7 @@ def generate_pmd_reports
         progress_logger.stop
         sum_time += execution_time
 
-        report_details = PmdReportDetail.new(
-          {
-            execution_time: execution_time,
-            timestamp: end_time
-          }
-        )
+        report_details = PmdReportDetail.new(execution_time: execution_time, timestamp: end_time)
         report_details.save(project.get_report_info_path(@pmd_branch_name))
         logger.info "#{project.name}'s PMD report was generated successfully"
       end

lib/pmdtester/pmd_report_detail.rb

@@ -28,7 +28,7 @@ def self.load(report_info_path)
         PmdReportDetail.new(**hash)
       else
         puts "#{report_info_path} doesn't exist"
-        PmdReportDetail.new({})
+        PmdReportDetail.new
       end
     end
 

lib/pmdtester/pmd_tester_utils.rb

@@ -38,11 +38,7 @@ def parse_pmd_report(report_file, branch, report_details, filter_set = nil)
   def compute_project_diffs(projects, base_branch, patch_branch, filter_set = nil)
     projects.each do |project|
       logger.info "Preparing report for #{project.name}"
-      project.report_diff = build_report_diff(project.get_pmd_report_path(base_branch),
-                                              project.get_pmd_report_path(patch_branch),
-                                              project.get_report_info_path(base_branch),
-                                              project.get_report_info_path(patch_branch),
-                                              filter_set)
+      project.compute_report_diff(base_branch, patch_branch, filter_set)
     end
   end
 

lib/pmdtester/project.rb

@@ -3,6 +3,8 @@
 module PmdTester
   # This class represents all the information about the project
   class Project
+    include PmdTester
+
     REPOSITORIES_PATH = 'target/repositories'
 
     attr_reader :name
@@ -101,5 +103,13 @@ def get_project_target_dir(branch_name)
     def local_source_path
       "#{REPOSITORIES_PATH}/#{@name}"
     end
+
+    def compute_report_diff(base_branch, patch_branch, filter_set)
+      self.report_diff = build_report_diff(get_pmd_report_path(base_branch),
+                                           get_pmd_report_path(patch_branch),
+                                           get_report_info_path(base_branch),
+                                           get_report_info_path(patch_branch),
+                                           filter_set)
+    end
   end
 end

lib/pmdtester/report_diff.rb

@@ -16,6 +16,14 @@ def changed_total
       new + removed + changed
     end
 
+    def merge!(other)
+      self.changed += other.changed
+      self.new += other.new
+      self.removed += other.removed
+      self.base_total += other.base_total
+      self.patch_total += other.patch_total
+    end
+
     def to_h
       {
         'changed' => changed,

lib/pmdtester/runner.rb

@@ -118,25 +118,21 @@ def get_projects(file_path)
     end
 
     def summarize_diffs
-      result = {
-        errors: { new: 0, removed: 0, changed: 0 },
-        violations: { new: 0, removed: 0, changed: 0 },
-        configerrors: { new: 0, removed: 0, changed: 0 }
-      }
+      error_total = RunningDiffCounters.new(0)
+      violations_total = RunningDiffCounters.new(0)
 
       @projects.each do |project|
         diff = project.report_diff
-        result[:errors][:new] += diff.error_counts.new
-        result[:errors][:removed] += diff.error_counts.removed
-        result[:errors][:changed] += diff.error_counts.changed
-        result[:violations][:new] += diff.violation_counts.new
-        result[:violations][:removed] += diff.violation_counts.removed
-        result[:violations][:changed] += diff.violation_counts.changed
-        # result[:configerrors][:new] +=
-        # result[:configerrors][:removed] += project.removed_configerrors_size
+
+        error_total.merge!(diff.error_counts)
+        violations_total.merge!(diff.violation_counts)
       end
 
-      result
+      {
+        errors: error_total.to_h,
+        violations: violations_total.to_h,
+        configerrors: RunningDiffCounters.new(0).to_h # note: this is now ignored
+      }
     end
 
     private

test/test_runner.rb

@@ -22,7 +22,7 @@ def test_single_mode
     PmdReportBuilder.any_instance.stubs(:build)
                     .returns(PmdBranchDetail.new('test_branch')).once
     FileUtils.expects(:cp).with(project_list_path, target_project_list_path).once
-    Runner.any_instance.stubs(:build_report_diff).twice
+    Project.any_instance.stubs(:build_report_diff).twice
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
@@ -40,7 +40,7 @@ def test_single_mode_multithreading
                     .once
     report_builder_mock.stubs(:build).returns(PmdBranchDetail.new('test_branch')).once
     FileUtils.expects(:cp).with(anything, anything).once
-    Runner.any_instance.stubs(:build_report_diff).twice
+    Project.any_instance.stubs(:build_report_diff).twice
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
@@ -50,7 +50,7 @@ def test_single_mode_multithreading
 
   def test_local_mode
     PmdReportBuilder.any_instance.stubs(:build).returns(PmdBranchDetail.new('some_branch')).twice
-    Runner.any_instance.stubs(:build_report_diff).twice
+    Project.any_instance.stubs(:build_report_diff).twice
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -b master -bc config/design.xml -p pmd_releases/6.1.0
@@ -67,7 +67,7 @@ def test_local_mode_multithreading
                     .returns(report_builder_mock)
                     .twice
     report_builder_mock.stubs(:build).returns(PmdBranchDetail.new('some_branch')).twice
-    Runner.any_instance.stubs(:build_report_diff).twice
+    Project.any_instance.stubs(:build_report_diff).twice
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -b master -bc config/design.xml -p pmd_releases/6.1.0