SONAR-5209 Display coverage per test information

diff --git a/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee b/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
index 645c54a31bf8b03faa01b27e00d7f377a329a2b0..feffcd6905415c84e959e93d5ba712d6c123e0eb 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
@@ -22,7 +22,9 @@ define [
 
 
     goToFile: (e) ->
-      key = $(e.currentTarget).data 'key'
+      el = $(e.currentTarget)
+      key = el.data 'key'
+      method = el.data 'method'
       files = @model.get 'files'
       @options.main.addTransition 'coverage', _.map files, (file) ->
         x = utils.splitLongName file.longName
@@ -30,6 +32,8 @@ define [
         name: x.name
         subname: x.dir
         active: file.key == key
+      if method?
+        @options.main.component.set 'selectedTest', method
       @options.main._open key
 
 

diff --git a/sonar-server/src/main/coffee/component-viewer/header.coffee b/sonar-server/src/main/coffee/component-viewer/header.coffee
index c0797d46226715a839a1a71d873485f16ac3591d..2bbf23899410d37dae13b389e00fe5f0b8404178 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header.coffee
@@ -22,6 +22,7 @@ define [
     ui:
       expandLinks: '.component-viewer-header-measures-expand'
       expandedBars: '.component-viewer-header-expanded-bar'
+      unitTests: '.js-unit-test'
 
 
     events:
@@ -63,7 +64,7 @@ define [
 
       'click .js-filter-duplications': 'filterByDuplications'
 
-      'click .js-unit-test': 'showCoveredFiles'
+      'click @ui.unitTests': 'showCoveredFiles'
 
 
     initialize: (options) ->
@@ -72,6 +73,8 @@ define [
 
     onRender: ->
       @delegateEvents()
+      if @options.main.component.get('q') == 'UTS'
+        @ui.expandLinks.filter("[data-scope=tests]").click()
 
 
     toggleFavorite: ->
@@ -96,26 +99,28 @@ define [
 
     showExpandedBar: (e) ->
       el = $(e.currentTarget)
-      if el.is '.active'
-        @ui.expandLinks.removeClass 'active'
-        @ui.expandedBars.hide()
-      else
-        @ui.expandLinks.removeClass 'active'
+      active = el.is '.active'
+      @ui.expandLinks.removeClass 'active'
+      @ui.expandedBars.hide()
+      unless active
         el.addClass 'active'
         scope = el.data 'scope'
-        @ui.expandedBars.hide()
-        if scope
-          unless @options.main.component.has 'msr'
-            req = @options.main.requestMeasures(@options.main.key)
-            if @options.main.component.get('q') == 'UTS'
-              req = $.when req, @options.main.requestTests(@options.main.key)
-            req.done =>
-              @render()
-              @ui.expandLinks.filter("[data-scope=#{scope}]").addClass 'active'
-              @ui.expandedBars.filter("[data-scope=#{scope}]").show()
-          else
+        unless @options.main.component.has 'msr'
+          req = @options.main.requestMeasures(@options.main.key)
+          if @options.main.component.get('q') == 'UTS'
+            req = $.when req, @options.main.requestTests(@options.main.key)
+          req.done =>
+            @render()
+            @ui.expandLinks.filter("[data-scope=#{scope}]").addClass 'active'
             @ui.expandedBars.filter("[data-scope=#{scope}]").show()
 
+            method = @options.main.component.get 'selectedTest'
+            if method?
+              @options.main.component.unset 'selectedTest'
+              @ui.unitTests.filter("[data-name=#{method}]").click().addClass('active')
+        else
+          @ui.expandedBars.filter("[data-scope=#{scope}]").show()
+
 
     changeSettings: ->
       @$('.js-toggle-issues').toggleClass 'active', @options.main.settings.get 'issues'
@@ -193,6 +198,7 @@ define [
     showCoveredFiles: (e) ->
       e.stopPropagation()
       $('body').click()
+      @$('.component-viewer-header-expanded-bar-section-list .active').removeClass 'active'
       testName = $(e.currentTarget).data 'name'
       test = _.findWhere @options.main.component.get('tests'), name: testName
       key = @options.main.component.get('key')

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 407a97b09f1540099fcf46f74c211be97966b9a6..de602df1de202802eba9485e27af051e729046ea 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -280,7 +280,6 @@ define [
 
 
     showAllLines: ->
-      console.log 1
       @sourceView.resetShowBlocks()
       @sourceView.showBlocks.push from: 0, to: _.size @source.get 'source'
       @sourceView.render()