diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-01-29 15:56:43 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-01-29 15:56:43 +0100 |
| commit | ddf176b98ea07bf1fe530c25141caa8be22916d1 (patch) | |
| tree | 33ee69cfcda3745c5fea1c9d5034c2effa2aff42 /sonar-server | |
| parent | 16dee1a8ef024b31bf04e699e4ff166dec4a352b (diff) | |
| download | sonarqube-ddf176b98ea07bf1fe530c25141caa8be22916d1.tar.gz sonarqube-ddf176b98ea07bf1fe530c25141caa8be22916d1.zip | |
SONAR-4093 Display number of tests covering a line
Diffstat (limited to 'sonar-server')
3 files changed, 10 insertions, 2 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 99edfc505a1..5127fe218a8 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -37,7 +37,9 @@ import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rules.RulePriority; import org.sonar.api.rules.RuleRepository; import org.sonar.api.test.MutableTestPlan; +import org.sonar.api.test.MutableTestable; import org.sonar.api.test.TestPlan; +import org.sonar.api.test.Testable; import org.sonar.api.utils.ValidationMessages; import org.sonar.api.web.Footer; import org.sonar.api.web.NavigationSection; @@ -546,4 +548,8 @@ public final class JRubyFacade { return get(SnapshotPerspectives.class).as(MutableTestPlan.class, snapshotId); } + public Testable getTestable(long snapshotId) { + return get(SnapshotPerspectives.class).as(MutableTestable.class, snapshotId); + } + } diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb index 6a78bb2c828..3d5b5e2ee1f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb @@ -191,9 +191,11 @@ class ResourceController < ApplicationController @conditions_by_line = load_distribution("#{it_prefix}conditions_by_line") @covered_conditions_by_line = load_distribution("#{it_prefix}covered_conditions_by_line") + testable = java_facade.getTestable(@snapshot.id) @hits_by_line.each_pair do |line_id, hits| line = @lines[line_id-1] if line + line.covered_lines = testable.testCasesCoveringLine(line_id).size if testable && testable.testCasesCoveringLine(line_id).size > 0 line.hits = hits.to_i line.conditions = @conditions_by_line[line_id].to_i line.covered_conditions = @covered_conditions_by_line[line_id].to_i @@ -431,7 +433,7 @@ class ResourceController < ApplicationController end class Line - attr_accessor :source, :revision, :author, :datetime, :violations, :hits, :conditions, :covered_conditions, :hidden, :highlighted, :deprecated_conditions_label + attr_accessor :source, :revision, :author, :datetime, :violations, :hits, :conditions, :covered_conditions, :hidden, :highlighted, :deprecated_conditions_label, :covered_lines def initialize(source) @source=source diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb index 1f452a265e9..c4366994cb4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb @@ -99,7 +99,7 @@ <% if @display_coverage %> <% if line.highlighted? %> - <td class="ind <%= hits_status -%>"><%= line.hits -%></td> + <td class="ind <%= hits_status -%>"><%= line.covered_lines if line.covered_lines -%></td> <td class="ind <%= conditions_status -%>"> <% if line.deprecated_conditions_label -%> <%= line.deprecated_conditions_label -%> |