3 files changed, 59 insertions, 32 deletions
diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index abe3d055a55..d81ba6c1ee3 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -47,6 +47,8 @@ define [
 
   DUPLICATIONS_METRIC_LIST = 'duplicated_lines_density,duplicated_blocks,duplicated_files,duplicated_lines'
 
+  TESTS_METRIC_LIST = 'tests'
+
 
 
   class ComponentViewer extends Marionette.Layout
@@ -112,7 +114,10 @@ define [
 
 
     requestMeasures: (key) ->
-      metrics = [SOURCE_METRIC_LIST, COVERAGE_METRIC_LIST, ISSUES_METRIC_LIST, DUPLICATIONS_METRIC_LIST].join ','
+      unless @component.get('q') == 'UTS'
+        metrics = [SOURCE_METRIC_LIST, COVERAGE_METRIC_LIST, ISSUES_METRIC_LIST, DUPLICATIONS_METRIC_LIST].join ','
+      else
+        metrics = [ISSUES_METRIC_LIST, TESTS_METRIC_LIST]
       $.get API_MEASURES, resource: key, metrics: metrics, (data) =>
         measuresList = data[0].msr || []
         measures = {}
diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index 44174771cf2..31829c78d35 100644
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -25,16 +25,18 @@
   </div>
 
   <div class="component-viewer-header-measures">
-    <div class="component-viewer-header-measures-scope">
-      <span data-scope="basic" class="js-toggle-coverage component-viewer-header-measures-toggle-scope inactive"></span>
-      <a data-scope="basic" class="component-viewer-header-measures-expand">
-        <div class="component-viewer-header-measure">
-          <span class="component-viewer-header-measure-value">{{component.measures.fNcloc}}</span>
-          <span class="component-viewer-header-measure-label">{{t 'metric.ncloc.name'}}</span>
-        </div>
-        <i class="icon-dropdown"></i>
-      </a>
-    </div>
+    {{#notEq component.q 'UTS'}}
+      <div class="component-viewer-header-measures-scope">
+        <span data-scope="basic" class="js-toggle-coverage component-viewer-header-measures-toggle-scope inactive"></span>
+        <a data-scope="basic" class="component-viewer-header-measures-expand">
+          <div class="component-viewer-header-measure">
+            <span class="component-viewer-header-measure-value">{{component.measures.fNcloc}}</span>
+            <span class="component-viewer-header-measure-label">{{t 'metric.ncloc.name'}}</span>
+          </div>
+          <i class="icon-dropdown"></i>
+        </a>
+      </div>
+    {{/notEq}}
 
     <div class="component-viewer-header-measures-scope">
       <a data-scope="issues" class="component-viewer-header-measures-expand">
@@ -70,33 +72,47 @@
          class="js-toggle-issues component-viewer-header-measures-toggle-scope {{#if settings.issues}}active{{/if}}"></a>
     </div>
 
-    {{#if component.measures.fCoverage}}
-      <div class="component-viewer-header-measures-scope">
-        <a data-scope="coverage" class="component-viewer-header-measures-expand">
-            <div class="component-viewer-header-measure">
-              <span class="component-viewer-header-measure-value">{{component.measures.fCoverage}}</span>
-              <span class="component-viewer-header-measure-label">{{t 'metric.coverage.name'}}</span>
-            </div>
-          <i class="icon-dropdown"></i>
-        </a>
-        <a data-scope="coverage" title="{{t 'component_viewer.header.toggle_coverage'}}"
-           class="js-toggle-coverage component-viewer-header-measures-toggle-scope {{#if settings.coverage}}active{{/if}}"></a>
-      </div>
-    {{/if}}
+    {{#notEq component.q 'UTS'}}
+      {{#if component.measures.fCoverage}}
+        <div class="component-viewer-header-measures-scope">
+          <a data-scope="coverage" class="component-viewer-header-measures-expand">
+              <div class="component-viewer-header-measure">
+                <span class="component-viewer-header-measure-value">{{component.measures.fCoverage}}</span>
+                <span class="component-viewer-header-measure-label">{{t 'metric.coverage.name'}}</span>
+              </div>
+            <i class="icon-dropdown"></i>
+          </a>
+          <a data-scope="coverage" title="{{t 'component_viewer.header.toggle_coverage'}}"
+             class="js-toggle-coverage component-viewer-header-measures-toggle-scope {{#if settings.coverage}}active{{/if}}"></a>
+        </div>
+      {{/if}}
+
+      {{#if component.measures.fDuplicationDensity}}
+        <div class="component-viewer-header-measures-scope">
+          <a data-scope="duplications" class="component-viewer-header-measures-expand">
+              <div class="component-viewer-header-measure">
+                <span class="component-viewer-header-measure-value">{{component.measures.fDuplicationDensity}}</span>
+                <span class="component-viewer-header-measure-label">{{t 'metric.duplicated_lines_density.name'}}</span>
+              </div>
+            <i class="icon-dropdown"></i>
+          </a>
+          <a data-scope="duplications" title="{{t 'component_viewer.header.toggle_duplications'}}"
+             class="js-toggle-duplications component-viewer-header-measures-toggle-scope {{#if settings.duplications}}active{{/if}}"></a>
+        </div>
+      {{/if}}
+    {{/notEq}}
 
-    {{#if component.measures.fDuplicationDensity}}
+    {{#eq component.q 'UTS'}}
       <div class="component-viewer-header-measures-scope">
         <a data-scope="duplications" class="component-viewer-header-measures-expand">
-            <div class="component-viewer-header-measure">
-              <span class="component-viewer-header-measure-value">{{component.measures.fDuplicationDensity}}</span>
-              <span class="component-viewer-header-measure-label">{{t 'metric.duplicated_lines_density.name'}}</span>
-            </div>
+          <div class="component-viewer-header-measure">
+            <span class="component-viewer-header-measure-value">{{component.measures.tests}}</span>
+            <span class="component-viewer-header-measure-label">{{t 'metric.tests.name'}}</span>
+          </div>
           <i class="icon-dropdown"></i>
         </a>
-        <a data-scope="duplications" title="{{t 'component_viewer.header.toggle_duplications'}}"
-           class="js-toggle-duplications component-viewer-header-measures-toggle-scope {{#if settings.duplications}}active{{/if}}"></a>
       </div>
-    {{/if}}
+    {{/eq}}
 
     <div class="component-viewer-header-measures-scope">
       <span data-scope="scm" class="component-viewer-header-measures-expand">
@@ -129,6 +145,12 @@
   {{> '_duplications-header'}}
 </div>
 
+{{#eq component.q 'UTS'}}
+  <div data-scope="tests" class="component-viewer-header-expanded-bar">
+    {{> '_tests-header'}}
+  </div>
+{{/eq}}
+
 
 
 <div class="component-viewer-header-decoration" style="display: none;">
diff --git a/sonar-server/src/main/hbs/component-viewer/header/_tests-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_tests-header.hbs
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sonar-server/src/main/hbs/component-viewer/header/_tests-header.hbs