From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 15 May 2015 13:11:37 +0000 (+0200)
Subject: SONAR-6416 migrate web to new tests WS
X-Git-Tag: 5.2-RC1~1945
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b1e4e5a1e9192105158a4f309e731247ee040bb;p=sonarqube.git

SONAR-6416 migrate web to new tests WS
---

diff --git a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs
index ba32f569ff2..3c53b6c1867 100644
--- a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs
+++ b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs
@@ -14,6 +14,7 @@
   </div>
 
   {{#each testFiles}}
+    {{log this}}
     <div class="bubble-popup-section">
       <a class="component-viewer-popup-test-file link-action" data-uuid="{{file.uuid}}" title="{{file.longName}}">
         <span>{{collapsedDirFromPath file.longName}}</span><span class="component-name-file">{{fileFromPath file.longName}}</span>
diff --git a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
index 34f080e9655..b421ad5d17b 100644
--- a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
+++ b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
@@ -47,11 +47,14 @@ define([
 
     serializeData: function () {
       var row = this.options.row || {},
-          files = this.model.get('files'),
-          tests = _.groupBy(this.model.get('tests'), '_ref'),
+          tests = _.groupBy(this.collection.toJSON(), 'fileUuid'),
           testFiles = _.map(tests, function (testSet, fileRef) {
+            var test = testSet[0];
             return {
-              file: files[fileRef],
+              file: {
+                uuid: test.fileUuid,
+                longName: test.fileLongName
+              },
               tests: testSet
             };
           });
diff --git a/server/sonar-web/src/main/js/source-viewer/viewer.js b/server/sonar-web/src/main/js/source-viewer/viewer.js
index 8fab3b00d25..128e2f077dd 100644
--- a/server/sonar-web/src/main/js/source-viewer/viewer.js
+++ b/server/sonar-web/src/main/js/source-viewer/viewer.js
@@ -388,14 +388,15 @@ define([
           this.clearTooltips();
           var line = $(e.currentTarget).data('line-number'),
               row = _.findWhere(this.model.get('source'), { line: line }),
-              url = baseUrl + '/api/tests/test_cases',
+              url = baseUrl + '/api/tests/list',
               options = {
-                uuid: this.model.id,
-                line: line
+                sourceFileUuid: this.model.id,
+                sourceFileLineNumber: line,
+                ps: 1000
               };
           return $.get(url, options).done(function (data) {
             var popup = new CoveragePopupView({
-              model: new Backbone.Model(data),
+              collection: new Backbone.Collection(data.tests),
               row: row,
               tests: $(e.currentTarget).data('tests'),
               triggerEl: $(e.currentTarget)
diff --git a/server/sonar-web/src/test/js/source-viewer-coverage.js b/server/sonar-web/src/test/js/source-viewer-coverage.js
index f0b85014390..264dfae6a5a 100644
--- a/server/sonar-web/src/test/js/source-viewer-coverage.js
+++ b/server/sonar-web/src/test/js/source-viewer-coverage.js
@@ -37,7 +37,8 @@ casper.test.begin(testName(), 12, function (test) {
         lib.mockRequestFromFile('/api/components/app', 'app.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/sources/lines', 'lines.json', { data: { uuid: 'uuid' } });
         lib.mockRequestFromFile('/api/issues/search', 'issues.json', { data: { componentUuids: 'uuid' } });
-        lib.mockRequestFromFile('/api/tests/test_cases', 'test-cases.json', { data: { uuid: 'uuid', line: '11' } });
+        lib.mockRequestFromFile('/api/tests/list', 'test-cases.json',
+            { data: { sourceFileUuid: 'uuid', sourceFileLineNumber: '11' } });
       })
 
       .then(function () {
diff --git a/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json b/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json
index 92b9644fcbf..093ac8bd5f0 100644
--- a/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json
+++ b/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json
@@ -1,17 +1,15 @@
 {
+  "p": 1,
+  "ps": 1000,
+  "total": 1,
   "tests": [
     {
       "name": "sampleTest",
       "status": "OK",
       "durationInMs": 2,
-      "_ref": "1"
+      "fileKey": "test:sample",
+      "fileUuid": "uuid",
+      "fileLongName": "SampleTest"
     }
-  ],
-  "files": {
-    "1": {
-      "uuid": "uuid",
-      "key": "test:sample",
-      "longName": "SampleTest"
-    }
-  }
+  ]
 }