Merge branch 'pr-22'

Author: adangel

History.md

@@ -26,3 +26,4 @@
 *   [#19](https://github.com/pmd/pmd-regression-tester/pull/19): Add online mode for PmdTester - [BBG](https://github.com/djydewang)
 *   [#20](https://github.com/pmd/pmd-regression-tester/pull/20): Change the way of parsing xml file from DOM to SAX - [BBG](https://github.com/djydewang)
 *   [#21](https://github.com/pmd/pmd-regression-tester/pull/21): Add auto-gen-config option for PmdTester - [BBG](https://github.com/djydewang)
+*   [#22](https://github.com/pmd/pmd-regression-tester/pull/22): Add 'introduce new errors' table head for html summary report - [BBG](https://github.com/djydewang)

lib/pmdtester/builders/summary_report_builder.rb

@@ -125,6 +125,7 @@ def build_projects_table_head(doc)
           doc.th 'project name'
           doc.th 'project branch/tag'
           doc.th 'diff exist?'
+          doc.th 'introduce new errors?'
         end
       end
     end
@@ -136,8 +137,9 @@ def build_projects_table_body(doc)
             doc.td do
               doc.a(href: project.diff_report_index_ref_path) { doc.text project.name }
             end
-            doc.td project.tag.nil? ? 'master' : project.tag
-            doc.td project.report_diff.diffs_exist? ? 'Yes' : 'No'
+            doc.td project.tag
+            doc.td project.diffs_exist? ? 'Yes' : 'No'
+            doc.td project.introduce_new_errors? ? 'Yes' : 'No'
           end
         end
       end

lib/pmdtester/project.rb

@@ -33,6 +33,8 @@ def initialize(project)
       project.xpath('exclude-pattern').each do |ep|
         @exclude_pattern.push(ep.text)
       end
+
+      @report_diff = nil
     end
 
     # Generate the default webview url for the projects
@@ -98,5 +100,13 @@ def diff_report_index_path
     def diff_report_index_ref_path
       "./#{name}/index.html"
     end
+
+    def diffs_exist?
+      @report_diff.diffs_exist?
+    end
+
+    def introduce_new_errors?
+      @report_diff.introduce_new_errors?
+    end
   end
 end

lib/pmdtester/report_diff.rb

@@ -96,5 +96,15 @@ def get_diffs_size(diffs_hash)
       end
       size
     end
+
+    def introduce_new_errors?
+      @error_diffs.values.each do |pmd_errors|
+        pmd_errors.each do |pmd_error|
+          return true if pmd_error.branch.eql?('patch')
+        end
+      end
+
+      false
+    end
   end
 end

test/resources/summary_report_builder/expected_index.html

@@ -48,22 +48,26 @@ <h2>Projects:</h2>
 <th>project name</th>
 <th>project branch/tag</th>
 <th>diff exist?</th>
+<th>introduce new errors?</th>
 </tr></thead>
 <tbody>
 <tr>
 <td><a href="./checkstyle/index.html">checkstyle</a></td>
 <td>master</td>
 <td>Yes</td>
+<td>Yes</td>
 </tr>
 <tr>
 <td><a href="./openjdk10/index.html">openjdk10</a></td>
 <td>master</td>
 <td>No</td>
+<td>No</td>
 </tr>
 <tr>
 <td><a href="./spring-framework/index.html">spring-framework</a></td>
 <td>v5.0.6.RELEASE</td>
 <td>No</td>
+<td>No</td>
 </tr>
 </tbody>
 </table>

test/test_diff_builder.rb

@@ -36,6 +36,7 @@ def test_violation_diffs
     assert_equal('Patch3.java', keys[4])
 
     assert_equal('00:00:56', diffs_report.diff_execution_time)
+    assert_equal(false, diffs_report.introduce_new_errors?)
   end
 
   def test_error_diffs
@@ -58,6 +59,7 @@ def test_error_diffs
     assert_equal('Both2.java', keys[1])
     assert_equal(2, error_diffs['Both2.java'].size)
     assert_equal('Patch1.java', keys[2])
+    assert_equal(true, diffs_report.introduce_new_errors?)
   end
 
   def test_diff_exist

test/test_summary_report_builder.rb

@@ -15,7 +15,9 @@ def test_summary_report_builder
     projects = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')
     report_diff = mock
     report_diff.expects(:diffs_exist?).returns(false).twice
+    report_diff.expects(:introduce_new_errors?).returns(false).twice
     report_diff.expects(:diffs_exist?).returns(true).once
+    report_diff.expects(:introduce_new_errors?).returns(true).once
     projects[0].report_diff = report_diff
     projects[1].report_diff = report_diff
     projects[2].report_diff = report_diff