From f6a92aaee1e89499e18aae942a672dc420b26b35 Mon Sep 17 00:00:00 2001 From: Michal Kabaj Date: Tue, 28 May 2019 14:45:08 +0200 Subject: AaiController unit tests - unit tests for getAicZones - fixed encapsulation and immutability issues in AicZones and Zone objects Change-Id: I3f71d45bb3c4e2238966e245f0ab77031c4dcb60 Issue-ID: VID-478 Signed-off-by: Michal Kabaj --- .../org/onap/vid/controller/AaiControllerTest.java | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'vid-app-common/src/test/java') diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java index bd6e0f986..2f0d1cd0c 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java @@ -27,6 +27,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; @@ -42,6 +43,8 @@ import org.onap.vid.aai.AaiResponse; import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigData; import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataError; import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataOk; +import org.onap.vid.aai.model.AaiGetAicZone.AicZones; +import org.onap.vid.aai.model.AaiGetAicZone.Zone; import org.onap.vid.aai.model.PortDetailsTranslator.PortDetails; import org.onap.vid.aai.model.PortDetailsTranslator.PortDetailsError; import org.onap.vid.aai.model.PortDetailsTranslator.PortDetailsOk; @@ -59,6 +62,7 @@ public class AaiControllerTest { private static final String ID_1 = "id1"; private static final String ID_2 = "id2"; + private final ObjectMapper objectMapper = new ObjectMapper(); @Mock private AaiService aaiService; @Mock @@ -67,7 +71,6 @@ public class AaiControllerTest { private RoleProvider roleProvider; @Mock private SystemPropertiesWrapper systemPropertiesWrapper; - private MockMvc mockMvc; private AaiController aaiController; @@ -93,7 +96,7 @@ public class AaiControllerTest { .contentType(MediaType.APPLICATION_JSON) .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(content().json(new ObjectMapper().writeValueAsString(expectedJson))); + .andExpect(content().json(objectMapper.writeValueAsString(expectedJson))); } @Test @@ -112,7 +115,7 @@ public class AaiControllerTest { .contentType(MediaType.APPLICATION_JSON) .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(content().json(new ObjectMapper().writeValueAsString(expectedJson.asMap()))); + .andExpect(content().json(objectMapper.writeValueAsString(expectedJson.asMap()))); } @Test @@ -136,5 +139,30 @@ public class AaiControllerTest { .andExpect(status().isOk()) .andExpect(content().string(expectedResponseBody)); } + + @Test + public void getAicZones_shouldReturnAaiZones_whenAaiHttpStatusIsOK() throws Exception { + AicZones aicZones = new AicZones(ImmutableList.of(new Zone("TEST_ZONE_ID", "TEST_ZONE_NAME"))); + given(aaiService.getAaiZones()).willReturn(new AaiResponse(aicZones, "", HttpStatus.OK.value())); + + mockMvc.perform(get("/aai_get_aic_zones") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().json(objectMapper.writeValueAsString(aicZones))); + } + + @Test + public void getAicZones_shouldReturnErrorResponse_whenAaiHttpStatusOtherThanOK() throws Exception { + String expectedErrorMessage = "Calling AAI Failed"; + given(aaiService.getAaiZones()) + .willReturn(new AaiResponse(null, expectedErrorMessage, HttpStatus.INTERNAL_SERVER_ERROR.value())); + + mockMvc.perform(get("/aai_get_aic_zones") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isInternalServerError()) + .andExpect(content().string(expectedErrorMessage)); + } } -- cgit 1.2.3-korg