From 31c73c2ac979a8321b8c9aac6a8577453f119039 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 14 May 2014 11:02:53 +0200 Subject: [PATCH] SONAR-5285 Replace number of hits by a boolean --- .../org/sonar/server/test/ws/CoverageShowAction.java | 2 +- .../sonar/server/test/ws/CoverageShowActionTest.java | 4 ++-- .../test/ws/CoverageShowActionTest/show_coverage.json | 10 +++++----- .../show_coverage_with_from_and_to.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) 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 44897f913d7..ff2f4c93eb9 100644 --- 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 f49d25758c5..3ac301e3f77 100644 --- 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 77d58b6da29..fb7da2f3562 100644 --- 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 c6a09463bbb..e99285e7bc2 100644 --- 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] ] } -- 2.39.5