SONAR-5285 Replace number of hits by a boolean

diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
index 44897f913d7d3cf08bcf52b128bae07d19523b63..ff2f4c93eb9ee2a9812d75a76e416398fd51d358 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java
@@ -102,7 +102,7 @@ public class CoverageShowAction implements RequestHandler {
         Integer hits = entry.getValue();
         json.beginArray();
         json.value(line);
-        json.value(hits);
+        json.value(hits > 0);
         json.endArray();
       }
     }

diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java
index f49d25758c5b2839d3df0b531402d8f8a5caf6c3..3ac301e3f77e99a64478fa3d1200099d5c0d8587 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java
@@ -46,7 +46,7 @@ public class CoverageShowActionTest {
   @Test
   public void show_coverage() throws Exception {
     String fileKey = "src/Foo.java";
-    when(coverageService.getHitsData(fileKey)).thenReturn("1=8;2=2;3=5;4=1;5=1");
+    when(coverageService.getHitsData(fileKey)).thenReturn("1=1;2=1;3=0;4=1;5=1");
 
     WsTester.TestRequest request = tester.newGetRequest("api/coverage", "show").setParam("key", fileKey);
 
@@ -56,7 +56,7 @@ public class CoverageShowActionTest {
   @Test
   public void show_coverage_with_from_and_to() throws Exception {
     String fileKey = "src/Foo.java";
-    when(coverageService.getHitsData(fileKey)).thenReturn("1=8;2=2;3=5;4=1;5=1");
+    when(coverageService.getHitsData(fileKey)).thenReturn("1=1;2=1;3=0;4=1;5=1");
 
     WsTester.TestRequest request = tester.newGetRequest("api/coverage", "show").setParam("key", fileKey).setParam("from", "3").setParam("to", "4");
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json
index 77d58b6da299da1d657da9f7828fa7d0bab6191c..fb7da2f35627cead6c2de46b2ae8257dd62aa5d8 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json
+++ b/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json
@@ -1,9 +1,9 @@
 {
   "coverage": [
-    [1, 8],
-    [2, 2],
-    [3, 5],
-    [4, 1],
-    [5, 1]
+    [1, true],
+    [2, true],
+    [3, false],
+    [4, true],
+    [5, true]
   ]
 }

diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json
index c6a09463bbb35bad8a53f787fa6fcecba9c8a9af..e99285e7bc2594e4c4f05c2eda8678cbf5a0f7f1 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json
+++ b/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json
@@ -1,6 +1,6 @@
 {
   "coverage": [
-    [3, 5],
-    [4, 1]
+    [3, false],
+    [4, true]
   ]
 }