SONAR-4094 Display tests in a select box

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 87f6f5a535d704746c2bcfed04eb240ef334a78e..d92f8379b2818b4d4d18c0f1c4b779cc622e88b2 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1131,6 +1131,7 @@ overall_coverage_viewer.by=by all tests
 coverage_viewer.unit_tests=Unit Tests
 coverage_viewer.integration_tests=Integration Tests
 coverage_viewer.overall_tests=All Tests
+lines_covered_per_test=Lines covered per test
 
 
 #------------------------------------------------------------------------------

diff --git a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
index b602e725a2c7e7aed3c97858723ad873510f8d6e..1856135585a8a0ef1ddd5e61dd75ac57290505e5 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
+++ b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
@@ -19,9 +19,12 @@
  */
 package org.sonar.core.test;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.blueprints.Edge;
 import com.tinkerpop.blueprints.Vertex;
+import org.sonar.api.test.Cover;
 import org.sonar.api.test.MutableTestCase;
 import org.sonar.api.test.TestPlan;
 import org.sonar.api.test.Testable;
@@ -120,4 +123,14 @@ public class DefaultTestCase extends BeanVertex implements MutableTestCase {
   public Iterable covers() {
     return getEdges(DefaultCover.class, Direction.OUT, "covers");
   }
+
+  public Cover coverOfTestable(final Testable testable) {
+    return Iterables.find(getEdges(DefaultCover.class, Direction.OUT, "covers"), new Predicate<Cover>() {
+      public boolean apply(Cover input) {
+        return input.testable().component().key().equals(testable.component().key());
+      }
+    }, null);
+  }
+
+
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestable.java b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestable.java
index ca5244ad7af19185dbd70d623b55cbcfcc3d8332..c1cd1ee24e3a753bedd3e6884cddf66236acfbc2 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestable.java
+++ b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestable.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.core.test;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
@@ -51,6 +52,14 @@ public class DefaultTestable extends BeanVertex implements MutableTestable {
     return cases.build();
   }
 
+  public TestCase testCaseByKey(final String key) {
+    return Iterables.find(testCases(), new Predicate<TestCase>() {
+      public boolean apply(TestCase input) {
+        return input.key().equals(key);
+      }
+    }, null);
+  }
+
   public int countTestCasesOfLine(int line) {
     int number = 0;
     // TODO filter on edge

diff --git a/sonar-core/src/test/java/org/sonar/core/test/DefaultTestCaseTest.java b/sonar-core/src/test/java/org/sonar/core/test/DefaultTestCaseTest.java
index d6bf3168e10d343734521f410b67c52a76ee0630..212216dcf5d0c737ced56c27d0c47b018b850f30 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/test/DefaultTestCaseTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/test/DefaultTestCaseTest.java
@@ -23,9 +23,12 @@ import com.google.common.collect.Iterables;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.sonar.api.component.mock.MockSourceFile;
 import org.sonar.api.test.Cover;
 import org.sonar.api.test.TestCase;
 import org.sonar.api.test.exception.IllegalDurationException;
+import org.sonar.core.component.ComponentVertex;
+import org.sonar.core.component.ScanGraph;
 import org.sonar.core.graph.BeanGraph;
 
 import java.util.Arrays;
@@ -79,6 +82,25 @@ public class DefaultTestCaseTest {
     assertThat(testCase.covers()).hasSize(2);
   }
 
+  @Test
+  public void should_return_cover_of_testable(){
+    BeanGraph beanGraph = BeanGraph.createInMemory();
+
+    ScanGraph graph = ScanGraph.create();
+    ComponentVertex file1 = graph.addComponent(MockSourceFile.createMain("org.foo.Bar"));
+    DefaultTestable testable1 = beanGraph.createAdjacentVertex(file1, DefaultTestable.class, "testable");
+
+    ComponentVertex file2 = graph.addComponent(MockSourceFile.createMain("org.foo.File"));
+    DefaultTestable testable2 = beanGraph.createAdjacentVertex(file2, DefaultTestable.class, "testable");
+
+    DefaultTestCase testCase = beanGraph.createVertex(DefaultTestCase.class);
+    testCase.setCover(testable1, Arrays.asList(10, 11, 12));
+
+    assertThat(testCase.coverOfTestable(testable1).testable()).isEqualTo(testable1);
+    assertThat(testCase.coverOfTestable(testable1).testCase()).isEqualTo(testCase);
+    assertThat(testCase.coverOfTestable(testable2)).isNull();
+  }
+
   @Test
   public void should_set_metadata() {
     BeanGraph beanGraph = BeanGraph.createInMemory();

diff --git a/sonar-core/src/test/java/org/sonar/core/test/DefaultTestableTest.java b/sonar-core/src/test/java/org/sonar/core/test/DefaultTestableTest.java
index 962902be5b7c80d103d402141fb3ff02160ecff3..1d020084041796831fb7d2825bbacfae8c5b2658 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/test/DefaultTestableTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/test/DefaultTestableTest.java
@@ -19,7 +19,9 @@
  */
 package org.sonar.core.test;
 
+import com.google.common.collect.Iterables;
 import org.junit.Test;
+import org.sonar.api.test.MutableTestCase;
 import org.sonar.core.graph.BeanGraph;
 
 import java.util.Arrays;
@@ -66,4 +68,23 @@ public class DefaultTestableTest {
     assertThat(testable.testCasesOfLine(10)).containsExactly(testCase1);
     assertThat(testable.testCasesOfLine(12)).contains(testCase1, testCase2);
   }
+
+  @Test
+  public void should_get_test_case_by_key() {
+    BeanGraph beanGraph = BeanGraph.createInMemory();
+
+    DefaultTestPlan plan = beanGraph.createVertex(DefaultTestPlan.class);
+    plan.addTestCase("T1");
+    plan.addTestCase("T2");
+
+    DefaultTestable testable = beanGraph.createVertex(DefaultTestable.class);
+    MutableTestCase testCase1 = Iterables.get(plan.testCases(), 0);
+    testCase1.setCover(testable, Arrays.asList(10, 11, 12));
+    MutableTestCase testCase2 = Iterables.get(plan.testCases(), 1);
+    testCase2.setCover(testable, Arrays.asList(12, 48, 49));
+
+    assertThat(testable.testCaseByKey("T1")).isEqualTo(testCase1);
+    assertThat(testable.testCaseByKey("T2")).isEqualTo(testCase2);
+    assertThat(testable.testCaseByKey("Unknown")).isNull();
+  }
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/test/TestCase.java b/sonar-plugin-api/src/main/java/org/sonar/api/test/TestCase.java
index 75ad3fb7073f2148c33cade2d79584d720c84916..168b07ad189251eed79babe46cf072b5bb7e2bb5 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/test/TestCase.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/test/TestCase.java
@@ -49,4 +49,6 @@ public interface TestCase {
   int countCoveredLines();
 
   Iterable<Cover> covers();
+
+  Cover coverOfTestable(Testable testable);
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/test/Testable.java b/sonar-plugin-api/src/main/java/org/sonar/api/test/Testable.java
index a4eb95306aab85469d6a83327d8cdc5f1797e072..3c33dafec8e9bac7fd1c276c67dccfce6000f4d1 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/test/Testable.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/test/Testable.java
@@ -28,6 +28,8 @@ public interface Testable extends Perspective {
 
   List<TestCase> testCases();
 
+  TestCase testCaseByKey(String key);
+
   int countTestCasesOfLine(int line);
 
   List<TestCase> testCasesOfLine(int line);

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 d8608ee50c34369c2aae9ea1dce0507e29b2a654..8899163c3b690cea726371c7da19adf5c363767d 100644 (file)
--- 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,12 +191,12 @@ 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)
+      @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 = 0
-          line.covered_lines = testable.countTestCasesOfLine(line_id) if testable
+          line.covered_lines = @testable.countTestCasesOfLine(line_id) if @testable
           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
@@ -248,6 +248,12 @@ class ResourceController < ApplicationController
       end
     end
 
+    @test_case_filter = params[:test_case_filter]
+    if @test_case_filter && @testable
+      #lines = @testable.coverOfTestable(@testable.testCaseByKey(@test_case_filter)).lines
+      #filter_lines { |line| lines.include? line }
+    end
+
     render :action => 'index', :layout => !request.xhr?
   end
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/test_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/test_controller.rb
index 8ba64c9299653dbc41b7c5d92b7f3a6ad70a290d..16a109bbdfa5eeb078e6c0ab1dfbedf0ecfeaf56 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/test_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/test_controller.rb
@@ -20,7 +20,7 @@
 class TestController < ApplicationController
 
   def working_view
-    #verify_ajax_request
+    verify_ajax_request
     require_parameters :sid, :value, :type
     type = params[:type].to_s
     snapshot_id = params[:sid].to_i

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 34d774f440cac74fd7e5b7bcf1ef648819d89be8..ffef6a7b759d377effcc309afc9725cf3a68b865 100644 (file)
--- 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
@@ -91,6 +91,18 @@
                 <% end %>
               </select>
             </td>
+
+            <% if @testable && !@testable.testCases.empty? %>
+              <td class="<%= 'first' if first -%>">
+                <select id="test_case_filter" name="test_case_filter" onchange="applyOptions()">
+                  <option value=""><%= message('lines_covered_per_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>
+                  <% end %>
+                </select>
+              </td>
+            <% end %>
+
           <% first=false
              end %>
         </tr>