From f5919d8f7cc67d9a6163b4c78813b0951519dc9d Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 7 May 2015 14:36:11 +0200
Subject: [PATCH] SONAR-6416 migrate web to new tests WS

---
 .../_source-viewer-measures-test-cases.hbs        |  2 +-
 .../src/main/js/source-viewer/measures-overlay.js | 13 +++++--------
 .../sonar-web/src/test/js/source-viewer-spec.js   | 11 ++++-------
 .../src/test/json/source-viewer-spec/tests.json   | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-test-cases.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-test-cases.hbs
index 760f92fdd7c..30663571ef6 100644
--- a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-test-cases.hbs
+++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-test-cases.hbs
@@ -28,7 +28,7 @@
               {{#ifTestData this}}
                 <td class="source-viewer-test-status note">{{testStatusIcon status}}</td>
                 <td class="source-viewer-test-duration note">{{durationInMs}}ms</td>
-                <td class="source-viewer-test-name"><a class="js-show-test" data-name="{{name}}">{{name}}</a></td>
+                <td class="source-viewer-test-name"><a class="js-show-test" data-id="{{testUuid}}">{{name}}</a></td>
                 <td class="source-viewer-test-covered-lines note">{{coveredLines}}</td>
               {{else}}
                 <td class="source-viewer-test-status note">{{testStatusIcon status}}</td>
diff --git a/server/sonar-web/src/main/js/source-viewer/measures-overlay.js b/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
index 04fdcc0cf9c..eec15c61f47 100644
--- a/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
+++ b/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
@@ -166,8 +166,8 @@ define([
 
     requestTests: function () {
       var that = this,
-          url = baseUrl + '/api/tests/show',
-          options = { key: this.model.key() };
+          url = baseUrl + '/api/tests/list',
+          options = { testFileUuid: this.model.id };
       return $.get(url, options).done(function (data) {
         that.model.set({ tests: data.tests });
         that.testSorting = 'status';
@@ -221,16 +221,13 @@ define([
 
     showTest: function (e) {
       var that = this,
-          name = $(e.currentTarget).data('name'),
+          testUuid = $(e.currentTarget).data('id'),
           url = baseUrl + '/api/tests/covered_files',
-          options = {
-            key: this.model.key(),
-            test: name
-          };
+          options = { testUuid: testUuid };
       this.testsScroll = $(e.currentTarget).scrollParent().scrollTop();
       return $.get(url, options).done(function (data) {
         that.coveredFiles = data.files;
-        that.selectedTest = _.findWhere(that.model.get('tests'), { name: name });
+        that.selectedTest = _.findWhere(that.model.get('tests'), { testUuid: testUuid });
         that.render();
       });
     },
diff --git a/server/sonar-web/src/test/js/source-viewer-spec.js b/server/sonar-web/src/test/js/source-viewer-spec.js
index 6b3afb95a92..17a361e915c 100644
--- a/server/sonar-web/src/test/js/source-viewer-spec.js
+++ b/server/sonar-web/src/test/js/source-viewer-spec.js
@@ -379,12 +379,9 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) {
         lib.mockRequestFromFile('/api/metrics', 'metrics.json');
         lib.mockRequestFromFile('/api/resources', 'measures-test.json',
             { data: { resource: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } });
-        lib.mockRequestFromFile('/api/tests/show', 'tests.json',
-            { data: { key: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } });
-        lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json', { data: {
-          key: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java',
-          test: 'test1'
-        } });
+        lib.mockRequestFromFile('/api/tests/list', 'tests.json', { data: { testFileUuid: 'uuid' } });
+        lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json',
+            { data: { testUuid: 'test-uuid-1' } });
       })
 
       .then(function () {
@@ -469,7 +466,7 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) {
       })
 
       .then(function () {
-        casper.click('.js-show-test[data-name="test1"]');
+        casper.click('.js-show-test[data-id="test-uuid-1"]');
         casper.waitForText('src/main/java/com/sonar/CoveredFile1.java');
       })
 
diff --git a/server/sonar-web/src/test/json/source-viewer-spec/tests.json b/server/sonar-web/src/test/json/source-viewer-spec/tests.json
index 70720d645e3..af8f8177ac2 100644
--- a/server/sonar-web/src/test/json/source-viewer-spec/tests.json
+++ b/server/sonar-web/src/test/json/source-viewer-spec/tests.json
@@ -4,29 +4,34 @@
       "name": "test1",
       "status": "OK",
       "durationInMs": 15,
-      "coveredLines": 2
+      "coveredLines": 2,
+      "testUuid": "test-uuid-1"
     },
     {
       "name": "test2",
       "status": "OK",
       "durationInMs": 13,
-      "coveredLines": 3
+      "coveredLines": 3,
+      "testUuid": "test-uuid-2"
     },
     {
       "name": "test3",
       "status": "FAILURE",
       "durationInMs": 14,
-      "coveredLines": 1
+      "coveredLines": 1,
+      "testUuid": "test-uuid-3"
     },
     {
       "name": "test4",
       "status": "ERROR",
       "durationInMs": 0,
-      "coveredLines": 0
+      "coveredLines": 0,
+      "testUuid": "test-uuid-4"
     },
     {
       "name": "test5",
-      "status": "SKIPPED"
+      "status": "SKIPPED",
+      "testUuid": "test-uuid-5"
     }
   ]
 }
-- 
2.39.5