SONAR-5285 Fix wrong name of method to return test cases by lines

diff --git a/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java b/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java
index ef24e83abd73312aaae33bb03ede438a06e05d1b..24a917f734bd502ab09d68dfae2c2d392728c069 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java
+++ b/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java
@@ -76,7 +76,7 @@ public class CoverageService implements ServerComponent {
    * Warning - does not check permission
    */
   @CheckForNull
-  public Map<Integer, Integer> getCoveredLines(String fileKey) {
+  public Map<Integer, Integer> getTestCasesByLines(String fileKey) {
     Testable testable = snapshotPerspectives.as(MutableTestable.class, fileKey);
     if (testable != null) {
       return testable.testCasesByLines();

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 dbb1d3d0a1b547c814cbeef213337ebb6892ee67..ef268d9c4b31472f8b362178acd7c7533bb6ff3f 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
@@ -88,16 +88,16 @@ public class CoverageShowAction implements RequestHandler {
     JsonWriter json = response.newJsonWriter().beginObject();
 
     String hits = coverageService.getHitsData(fileKey);
-    Map<Integer, Integer> coveredLines = coverageService.getCoveredLines(fileKey);
+    Map<Integer, Integer> testCasesByLines = coverageService.getTestCasesByLines(fileKey);
     if (hits != null) {
       Map<Integer, Integer> hitsByLine = KeyValueFormat.parseIntInt(hits);
-      writeCoverage(fileKey, hitsByLine, coveredLines, from, to, json);
+      writeCoverage(fileKey, hitsByLine, testCasesByLines, from, to, json);
     }
 
     json.endObject().close();
   }
 
-  private void writeCoverage(String fileKey, Map<Integer, Integer> hitsByLine, @Nullable Map<Integer, Integer> coveredLines, int from, int to, JsonWriter json) {
+  private void writeCoverage(String fileKey, Map<Integer, Integer> hitsByLine, @Nullable Map<Integer, Integer> testCasesByLines, int from, int to, JsonWriter json) {
     json.name("coverage").beginArray();
     for (Map.Entry<Integer, Integer> entry : hitsByLine.entrySet()) {
       Integer line = entry.getKey();
@@ -106,7 +106,7 @@ public class CoverageShowAction implements RequestHandler {
         json.beginArray();
         json.value(line);
         json.value(hits > 0);
-        json.value(coveredLines != null ? coveredLines.get(line) : null);
+        json.value(testCasesByLines != null ? testCasesByLines.get(line) : null);
         json.endArray();
       }
     }

diff --git a/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java b/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java
index 95a61a9965949d3d6245ad0da0525c39a6a5d1be..3a28e1282fb209650b332b43915034cb6d89cb11 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java
@@ -93,19 +93,19 @@ public class CoverageServiceTest {
   }
 
   @Test
-  public void get_coverered_lines() throws Exception {
+  public void get_test_cases_by_lines() throws Exception {
     MutableTestable testable = mock(MutableTestable.class);
     when(snapshotPerspectives.as(MutableTestable.class, COMPONENT_KEY)).thenReturn(testable);
 
-    service.getCoveredLines(COMPONENT_KEY);
+    service.getTestCasesByLines(COMPONENT_KEY);
     verify(testable).testCasesByLines();
   }
 
   @Test
-  public void not_get_coverered_lines_if_no_testable() throws Exception {
+  public void not_get_test_cases_by_lines_if_no_testable() throws Exception {
     when(snapshotPerspectives.as(MutableTestable.class, COMPONENT_KEY)).thenReturn(null);
 
-    assertThat(service.getCoveredLines(COMPONENT_KEY)).isNull();
+    assertThat(service.getTestCasesByLines(COMPONENT_KEY)).isNull();
   }
 
 }

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 dd16d3e694e627ce08b518861211b43750885dc2..a346ac952bd5d9dc987138b3d97fd8fdfd42a000 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
@@ -48,7 +48,7 @@ public class CoverageShowActionTest {
   public void show_coverage() throws Exception {
     String fileKey = "src/Foo.java";
     when(coverageService.getHitsData(fileKey)).thenReturn("1=1;2=1;3=0;4=1;5=1");
-    when(coverageService.getCoveredLines(fileKey)).thenReturn(ImmutableMap.of(4, 8, 1, 2));
+    when(coverageService.getTestCasesByLines(fileKey)).thenReturn(ImmutableMap.of(4, 8, 1, 2));
 
     WsTester.TestRequest request = tester.newGetRequest("api/coverage", "show").setParam("key", fileKey);
 
@@ -59,7 +59,7 @@ public class CoverageShowActionTest {
   public void show_coverage_with_from_and_to() throws Exception {
     String fileKey = "src/Foo.java";
     when(coverageService.getHitsData(fileKey)).thenReturn("1=1;2=1;3=0;4=1;5=1");
-    when(coverageService.getCoveredLines(fileKey)).thenReturn(ImmutableMap.of(4, 8, 1, 2));
+    when(coverageService.getTestCasesByLines(fileKey)).thenReturn(ImmutableMap.of(4, 8, 1, 2));
 
     WsTester.TestRequest request = tester.newGetRequest("api/coverage", "show").setParam("key", fileKey).setParam("from", "3").setParam("to", "4");