test: update objects names

Author: Rosario Trischitta

src/test/java/org/heigit/ohsome/ohsomeapi/controller/GetControllerTest.java

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import java.io.IOException;
@@ -230,7 +229,7 @@ public void getElementsCountRatioTest() {
             + "addr:housenumber=*",
         JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -246,10 +245,10 @@ public void getElementsCountRatioGroupByBoundaryTest() {
     assertEquals(expectedValue, StreamSupport
         .stream(
             Spliterators.spliteratorUnknownSize(
-                response.getBody().get("groupByBoundaryResult").iterator(), Spliterator.ORDERED),
+                response.getBody().get("groupByResult").iterator(), Spliterator.ORDERED),
             false)
         .filter(jsonNode -> jsonNode.get("groupByObject").asText().equalsIgnoreCase("boundary1"))
-        .findFirst().get().get("ratioResult").get(0).get("ratio").asDouble(),
+        .findFirst().get().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -438,7 +437,7 @@ public void getElementsLengthRatioTest() {
             + "&time=2011-12-13&&filter=type:way and highway=*&filter2=railway=*",
         JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -454,10 +453,10 @@ public void getElementsLengthRatioGroupByBoundaryTest() {
     assertEquals(expectedValue, StreamSupport
         .stream(
             Spliterators.spliteratorUnknownSize(
-                response.getBody().get("groupByBoundaryResult").iterator(), Spliterator.ORDERED),
+                response.getBody().get("groupByResult").iterator(), Spliterator.ORDERED),
             false)
         .filter(jsonNode -> jsonNode.get("groupByObject").asText().equalsIgnoreCase("boundary1"))
-        .findFirst().get().get("ratioResult").get(0).get("ratio").asDouble(),
+        .findFirst().get().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -1086,7 +1085,7 @@ public void areaRatioFilterTest() {
             + "2018-01-01&filter=building=* and type:way&filter2=building=* and type:relation",
         JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -1102,10 +1101,10 @@ public void ratioGroupByBoundaryFilterTest() {
     assertEquals(expectedValue, StreamSupport
         .stream(
             Spliterators.spliteratorUnknownSize(
-                response.getBody().get("groupByBoundaryResult").iterator(), Spliterator.ORDERED),
+                response.getBody().get("groupByResult").iterator(), Spliterator.ORDERED),
             false)
         .filter(jsonNode -> jsonNode.get("groupByObject").asText().equalsIgnoreCase("b2"))
-        .findFirst().get().get("ratioResult").get(0).get("ratio").asDouble(),
+        .findFirst().get().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -1118,7 +1117,7 @@ public void getElementsCountRatioEmptyFilterTest() {
             + "filter2=highway=*&time=2019-01-01",
         JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 

src/test/java/org/heigit/ohsome/ohsomeapi/controller/PostControllerTest.java

@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeTrue;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import java.io.IOException;
 import java.util.Arrays;
@@ -385,7 +384,7 @@ public void elementsPerimeterRatioTest() {
     ResponseEntity<JsonNode> response = restTemplate
         .postForEntity(server + port + "/elements/perimeter/ratio", map, JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -404,10 +403,10 @@ public void elementsPerimeterRatioGroupByBoundaryTest() {
     assertEquals(expectedValue, StreamSupport
         .stream(
             Spliterators.spliteratorUnknownSize(
-                response.getBody().get("groupByBoundaryResult").iterator(), Spliterator.ORDERED),
+                response.getBody().get("groupByResult").iterator(), Spliterator.ORDERED),
             false)
         .filter(jsonNode -> jsonNode.get("groupByObject").asText().equalsIgnoreCase("Neuenheim"))
-        .findFirst().get().get("ratioResult").get(0).get("ratio").asDouble(),
+        .findFirst().get().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -655,7 +654,7 @@ public void elementsAreaRatioTest() {
     ResponseEntity<JsonNode> response =
         restTemplate.postForEntity(server + port + "/elements/area/ratio", map, JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }
 
@@ -671,8 +670,8 @@ public void elementsAreaRatioGroupByBoundaryTest() {
     map.add("filter2", "type:relation and building=*");
     ResponseEntity<JsonNode> response = restTemplate.postForEntity(
         server + port + "/elements/area/ratio/groupBy/boundary", map, JsonNode.class);
-    assertEquals(expectedValue, response.getBody().get("groupByBoundaryResult").get(1)
-        .get("ratioResult").get(0).get("ratio").asDouble(), expectedValue * deltaPercentage);
+    assertEquals(expectedValue, response.getBody().get("groupByResult").get(1)
+        .get("result").get(0).get("ratio").asDouble(), expectedValue * deltaPercentage);
   }
 
   @Test
@@ -790,7 +789,7 @@ public void elementsAreaRatioSimpleFeaturePolygonTest() {
     ResponseEntity<JsonNode> response =
         restTemplate.postForEntity(server + port + "/elements/area/ratio", map, JsonNode.class);
     assertEquals(expectedValue,
-        response.getBody().get("ratioResult").get(0).get("ratio").asDouble(),
+        response.getBody().get("result").get(0).get("ratio").asDouble(),
         expectedValue * deltaPercentage);
   }