From 778c23f48631479a95477cbd3cbba8f7daedc1ce Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Fri, 1 Feb 2013 14:36:49 +0100
Subject: [PATCH] SONAR-4093 Display test by test plan

---
 .../WEB-INF/app/controllers/resource_controller.rb       | 9 +++++++++
 .../webapp/WEB-INF/app/views/resource/_options.html.erb  | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

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 651b2f1b588..cd0fed3d6b7 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
@@ -250,6 +250,15 @@ class ResourceController < ApplicationController
         filter_lines { |line| line.conditions && line.covered_conditions && line.covered_conditions<line.conditions && line.after(to) }
 
       elsif @coverage_filter == 'lines_covered_per_test'
+        @test_case_by_test_plan = {}
+        @testable.testCases.each do |test_case|
+          test_plan = test_case.testPlan
+          test_cases = @test_case_by_test_plan[test_plan]
+          test_cases = [] unless test_cases
+          test_cases << test_case
+          @test_case_by_test_plan[test_plan] = test_cases
+        end
+
         if @test_case_filter
           test_case = @testable.testCaseByKey(@test_case_filter)
           lines = @testable.coverOfTestCase(test_case).lines
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb
index f96ca310f91..db6bc1934c8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb
@@ -101,8 +101,12 @@
               <td class="<%= 'first' if first -%>">
                 <select id="test_case_filter" name="test_case_filter" onchange="applyOptions()">
                   <option value=""><%= message('coverage_viewer.select_test') -%></option>
-                  <% @testable.testCases.each do |test_case| %>
-                    <option value="<%= test_case.key -%>" <%= 'selected' if @test_case_filter==test_case.key -%>><%= test_case.name -%></option>
+                  <% @test_case_by_test_plan.sort_by{|test_plan, test_cases| test_plan.component.longName}.each do |test_plan, test_cases| %>
+                    <optgroup label="<%= test_plan.component.longName %>">
+                      <% test_cases.sort_by{|test_case| test_case.name}.each do |test_case| %>
+                        <option value="<%= test_case.key -%>" <%= 'selected' if @test_case_filter==test_case.key -%>><%= test_case.name -%></option>
+                      <% end %>
+                    </optgroup>
                   <% end %>
                 </select>
               </td>
-- 
2.39.5