fix color scheme of the diff report

Author: djydewang

lib/pmdtester/builders/diff_report_builder.rb

@@ -73,8 +73,8 @@ def build_summary_table_body(doc)
     def build_summary_row(doc, item, base, patch, diff)
       doc.tr do
         doc.td(class: 'c') { doc.text item }
-        doc.td(class: 'a') { doc.text base }
-        doc.td(class: 'b') { doc.text patch }
+        doc.td(class: 'b') { doc.text base }
+        doc.td(class: 'a') { doc.text patch }
         doc.td(class: 'c') { doc.text diff }
       end
     end
@@ -131,7 +131,7 @@ def build_violation_table_body(doc, key, value)
     end
 
     def build_violation_table_row(doc, key, pmd_violation, a_index)
-      doc.tr(class: pmd_violation.branch == 'base' ? 'a' : 'b') do
+      doc.tr(class: pmd_violation.branch == 'base' ? 'b' : 'a') do
         # The anchor
         doc.td do
           doc.a(id: "A#{a_index}", href: "#A#{a_index}") { doc.text '#' }
@@ -204,7 +204,7 @@ def build_errors_table_body(doc, errors)
       doc.tbody do
         b_index = 1
         errors.each do |pmd_error|
-          doc.tr(class: pmd_error.branch == 'base' ? 'a' : 'b') do
+          doc.tr(class: pmd_error.branch == 'base' ? 'b' : 'a') do
             # The anchor
             doc.td do
               doc.a(id: "B#{b_index}", href: "#B#{b_index}") { doc.text '#' }

test/resources/html_report_builder/expected_diff_report_index.html

@@ -17,26 +17,26 @@ <h2>Summary:</h2>
 <tbody>
 <tr>
 <td class="c">number of errors</td>
-<td class="a">0</td>
-<td class="b">1</td>
+<td class="b">0</td>
+<td class="a">1</td>
 <td class="c">1</td>
 </tr>
 <tr>
 <td class="c">number of violations</td>
-<td class="a">5</td>
-<td class="b">8</td>
+<td class="b">5</td>
+<td class="a">8</td>
 <td class="c">7</td>
 </tr>
 <tr>
 <td class="c">execution time</td>
-<td class="a">00:02:01</td>
-<td class="b">00:01:05</td>
+<td class="b">00:02:01</td>
+<td class="a">00:01:05</td>
 <td class="c">00:00:56</td>
 </tr>
 <tr>
 <td class="c">timestamp</td>
-<td class="a">base time stamp</td>
-<td class="b">patch time stamp</td>
+<td class="b">base time stamp</td>
+<td class="a">patch time stamp</td>
 <td class="c"></td>
 </tr>
 </tbody>
@@ -54,7 +54,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Message</th>
 <th>Line</th>
 </tr></thead>
-<tbody><tr class="a">
+<tbody><tr class="b">
 <td><a id="A1" href="#A1">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_codestyle.html#fielddeclarationsshouldbeatstartofclass">FieldDeclarationsShouldBeAtStartOfClass</a></td>
@@ -76,7 +76,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Line</th>
 </tr></thead>
 <tbody>
-<tr class="a">
+<tr class="b">
 <td><a id="A1" href="#A1">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_design.html#godclass">GodClass</a></td>
@@ -85,7 +85,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 </td>
 <td><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.RELEASE/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java#L63">63</a></td>
 </tr>
-<tr class="b">
+<tr class="a">
 <td><a id="A2" href="#A2">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_design.html#godclass">GodClass</a></td>
@@ -94,7 +94,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 </td>
 <td><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.RELEASE/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java#L63">63</a></td>
 </tr>
-<tr class="b">
+<tr class="a">
 <td><a id="A3" href="#A3">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_codestyle.html#fielddeclarationsshouldbeatstartofclass">FieldDeclarationsShouldBeAtStartOfClass</a></td>
@@ -116,7 +116,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Message</th>
 <th>Line</th>
 </tr></thead>
-<tbody><tr class="b">
+<tbody><tr class="a">
 <td><a id="A1" href="#A1">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_codestyle.html#fielddeclarationsshouldbeatstartofclass">FieldDeclarationsShouldBeAtStartOfClass</a></td>
@@ -137,7 +137,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Message</th>
 <th>Line</th>
 </tr></thead>
-<tbody><tr class="b">
+<tbody><tr class="a">
 <td><a id="A1" href="#A1">#</a></td>
 <td>3</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_codestyle.html#fielddeclarationsshouldbeatstartofclass">FieldDeclarationsShouldBeAtStartOfClass</a></td>
@@ -158,7 +158,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Message</th>
 <th>Line</th>
 </tr></thead>
-<tbody><tr class="b">
+<tbody><tr class="a">
 <td><a id="A1" href="#A1">#</a></td>
 <td>1</td>
 <td><a href="http://pmd.sourceforge.net/snapshot/pmd_rules_java_design.html#classwithonlyprivateconstructorsshouldbefinal">ClassWithOnlyPrivateConstructorsShouldBeFinal</a></td>
@@ -180,7 +180,7 @@ <h3><a href="https://github.com/spring-projects/spring-framework/tree/v5.0.6.REL
 <th>Message</th>
 <th>Details</th>
 </tr></thead>
-<tbody><tr class="b">
+<tbody><tr class="a">
 <td><a id="B1" href="#B1">#</a></td>
 <td>This is an artificial error message.</td>
 <td></td>

test/resources/html_report_builder/expected_empty_diff_report.html

@@ -17,26 +17,26 @@ <h2>Summary:</h2>
 <tbody>
 <tr>
 <td class="c">number of errors</td>
-<td class="a">0</td>
 <td class="b">0</td>
+<td class="a">0</td>
 <td class="c">0</td>
 </tr>
 <tr>
 <td class="c">number of violations</td>
-<td class="a">0</td>
 <td class="b">0</td>
+<td class="a">0</td>
 <td class="c">0</td>
 </tr>
 <tr>
 <td class="c">execution time</td>
-<td class="a">0</td>
 <td class="b">0</td>
+<td class="a">0</td>
 <td class="c">0</td>
 </tr>
 <tr>
 <td class="c">timestamp</td>
-<td class="a"></td>
 <td class="b"></td>
+<td class="a"></td>
 <td class="c"></td>
 </tr>
 </tbody>

test/test_runner.rb

@@ -10,6 +10,12 @@ def setup
 
   include PmdTester
 
+  def run_runner(argv)
+    runner = Runner.new(argv)
+    runner.expects(:introduce_new_pmd_error?).returns(true)
+    runner.run
+  end
+
   def test_single_mode
     PmdReportBuilder.any_instance.stubs(:build)
                     .returns(PmdBranchDetail.new('test_branch')).once
@@ -20,7 +26,7 @@ def test_single_mode
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
               -pc config/design.xml -l test/resources/project-test.xml -m single]
-    Runner.new(argv).run
+    run_runner(argv)
   end
 
   def test_local_mode
@@ -31,6 +37,6 @@ def test_local_mode
 
     argv = %w[-r target/repositories/pmd -b master -bc config/design.xml -p pmd_releases/6.1.0
               -pc config/design.xml -l test/resources/project-test.xml]
-    Runner.new(argv).run
+    run_runner(argv)
   end
 end