diff options
Diffstat (limited to 'app/src/test/java/org/onap/portalng/bff/preferences')
4 files changed, 55 insertions, 55 deletions
diff --git a/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java index 65a6f19..3b16664 100644 --- a/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java +++ b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java @@ -25,8 +25,8 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import io.restassured.http.Header; import org.junit.jupiter.api.Test; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto; +import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto; +import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto; import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto; import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto; import org.onap.portalng.bff.openapi.server.model.ProblemApiDto; @@ -36,8 +36,8 @@ import org.springframework.http.MediaType; class CreatePreferencesIntegrationTest extends PreferencesMocks { @Test void thatPreferencesCanBeCreated() throws Exception { - PreferencesPortalPrefsDto preferencesPortalPrefsDto = new PreferencesPortalPrefsDto(); - preferencesPortalPrefsDto.setProperties( + PreferencesPreferencesDto preferencesPreferencesDto = new PreferencesPreferencesDto(); + preferencesPreferencesDto.setProperties( "{\n" + "\"properties\": {\n" + "\"appStarter\": \"value1\",\n" @@ -45,7 +45,7 @@ class CreatePreferencesIntegrationTest extends PreferencesMocks { + "}\n" + "\n" + "}"); - mockCreatePreferences(preferencesPortalPrefsDto); + mockCreatePreferences(preferencesPreferencesDto); final CreatePreferencesRequestApiDto request = new CreatePreferencesRequestApiDto() @@ -59,18 +59,18 @@ class CreatePreferencesIntegrationTest extends PreferencesMocks { + "}"); final PreferencesResponseApiDto response = createPreferences(request); assertThat(response).isNotNull(); - assertThat(response.getProperties()).isEqualTo(preferencesPortalPrefsDto.getProperties()); + assertThat(response.getProperties()).isEqualTo(preferencesPreferencesDto.getProperties()); } @Test void thatPreferencesCanNotBeCreated() throws Exception { - final var problemPortalPrefsDto = new ProblemPortalPrefsDto(); - problemPortalPrefsDto.setStatus(HttpStatus.BAD_REQUEST.value()); - problemPortalPrefsDto.setTitle(HttpStatus.BAD_REQUEST.toString()); - problemPortalPrefsDto.setDetail("Some details"); + final var problemPreferencesDto = new ProblemPreferencesDto(); + problemPreferencesDto.setStatus(HttpStatus.BAD_REQUEST.value()); + problemPreferencesDto.setTitle(HttpStatus.BAD_REQUEST.toString()); + problemPreferencesDto.setDetail("Some details"); - final PreferencesPortalPrefsDto preferencesPortalPrefsDto = - new PreferencesPortalPrefsDto() + final PreferencesPreferencesDto preferencesPreferencesDto = + new PreferencesPreferencesDto() .properties( "{\n" + "\"properties\": {\n" @@ -79,7 +79,7 @@ class CreatePreferencesIntegrationTest extends PreferencesMocks { + "}\n" + "\n" + "}"); - mockCreatePreferencesError(preferencesPortalPrefsDto, problemPortalPrefsDto); + mockCreatePreferencesError(preferencesPreferencesDto, problemPreferencesDto); CreatePreferencesRequestApiDto responseBody = new CreatePreferencesRequestApiDto() @@ -107,9 +107,9 @@ class CreatePreferencesIntegrationTest extends PreferencesMocks { .as(ProblemApiDto.class); assertThat(response.getStatus()).isEqualTo(HttpStatus.BAD_GATEWAY.value()); - assertThat(response.getDetail()).isEqualTo(problemPortalPrefsDto.getDetail()); + assertThat(response.getDetail()).isEqualTo(problemPreferencesDto.getDetail()); assertThat(response.getDownstreamSystem()) - .isEqualTo(ProblemApiDto.DownstreamSystemEnum.PORTAL_PREFS); + .isEqualTo(ProblemApiDto.DownstreamSystemEnum.PREFERENCES); assertThat(response.getDownstreamStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value()); } } diff --git a/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java index 06329d4..a88a0cd 100644 --- a/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java +++ b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java @@ -25,8 +25,8 @@ import static org.assertj.core.api.Assertions.assertThat; import io.restassured.http.Header; import org.junit.jupiter.api.Test; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto; +import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto; +import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto; import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto; import org.onap.portalng.bff.openapi.server.model.ProblemApiDto; import org.springframework.http.HttpStatus; @@ -36,9 +36,9 @@ class GetPreferencesIntegrationTest extends PreferencesMocks { @Test void thatPreferencesCanBeRetrieved() throws Exception { - PreferencesPortalPrefsDto preferencesPortalPrefsDto = new PreferencesPortalPrefsDto(); - preferencesPortalPrefsDto.setProperties(getFixture(PREF_PROPERTIES_FILE, Object.class)); - mockGetPreferences(preferencesPortalPrefsDto); + PreferencesPreferencesDto preferencesPreferencesDto = new PreferencesPreferencesDto(); + preferencesPreferencesDto.setProperties(getFixture(PREF_PROPERTIES_FILE, Object.class)); + mockGetPreferences(preferencesPreferencesDto); final PreferencesResponseApiDto response = getPreferences(); assertThat(response).isNotNull(); @@ -46,8 +46,8 @@ class GetPreferencesIntegrationTest extends PreferencesMocks { @Test void thatPreferencesCanNotBeRetrieved() throws Exception { - final ProblemPortalPrefsDto problemResponse = - new ProblemPortalPrefsDto() + final ProblemPreferencesDto problemResponse = + new ProblemPreferencesDto() .title("Unauthorized") .status(HttpStatus.UNAUTHORIZED.value()) .detail("Unauthorized error detail") diff --git a/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java index 0d5b69a..9c5be75 100644 --- a/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java +++ b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java @@ -30,8 +30,8 @@ import java.io.File; import java.io.IOException; import org.apache.http.HttpHeaders; import org.onap.portalng.bff.BaseIntegrationTest; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto; +import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto; +import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto; import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto; import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto; import org.springframework.http.HttpStatus; @@ -65,7 +65,7 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockGetPreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockGetPreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.get(WireMock.urlEqualTo("/v1/preferences")) @@ -73,10 +73,10 @@ public class PreferencesMocks extends BaseIntegrationTest { .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } - protected void mockGetPreferencesError(ProblemPortalPrefsDto problem) throws Exception { + protected void mockGetPreferencesError(ProblemPreferencesDto problem) throws Exception { WireMock.stubFor( WireMock.get(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) @@ -104,35 +104,35 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockCreatePreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockCreatePreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.post(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } protected void mockCreatePreferencesError( - PreferencesPortalPrefsDto preferencesPortalPrefsDto, - ProblemPortalPrefsDto problemPortalPrefsDto) + PreferencesPreferencesDto preferencesPreferencesDto, + ProblemPreferencesDto problemPreferencesDto) throws Exception { WireMock.stubFor( WireMock.post(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .withStatus(HttpStatus.BAD_REQUEST.value()) - .withBody(objectMapper.writeValueAsString(problemPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(problemPreferencesDto)))); } protected PreferencesResponseApiDto updatePreferences(CreatePreferencesRequestApiDto request) { @@ -150,33 +150,33 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockUpdatePreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockUpdatePreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.put(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } protected void mockUpdatePreferencesError( - PreferencesPortalPrefsDto preferencesPortalPrefsDto, - ProblemPortalPrefsDto problemPortalPrefsDto) + PreferencesPreferencesDto preferencesPreferencesDto, + ProblemPreferencesDto problemPreferencesDto) throws Exception { WireMock.stubFor( WireMock.put(WireMock.urlEqualTo("/v1/preferences")) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .withStatus(HttpStatus.BAD_REQUEST.value()) - .withBody(objectMapper.writeValueAsString(problemPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(problemPreferencesDto)))); } } diff --git a/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java index 031726e..1cd9a70 100644 --- a/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java +++ b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java @@ -25,8 +25,8 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import io.restassured.http.Header; import org.junit.jupiter.api.Test; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto; +import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto; +import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto; import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto; import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto; import org.onap.portalng.bff.openapi.server.model.ProblemApiDto; @@ -36,8 +36,8 @@ import org.springframework.http.MediaType; class UpdatePreferencesIntegrationTest extends PreferencesMocks { @Test void thatPreferencesCanBeUpdated() throws Exception { - PreferencesPortalPrefsDto preferencesPortalPrefsDto = new PreferencesPortalPrefsDto(); - preferencesPortalPrefsDto.setProperties( + PreferencesPreferencesDto preferencesPreferencesDto = new PreferencesPreferencesDto(); + preferencesPreferencesDto.setProperties( "{\n" + "\"properties\": {\n" + "\"appStarter\": \"value1\",\n" @@ -45,7 +45,7 @@ class UpdatePreferencesIntegrationTest extends PreferencesMocks { + "}\n" + "\n" + "}"); - mockUpdatePreferences(preferencesPortalPrefsDto); + mockUpdatePreferences(preferencesPreferencesDto); final CreatePreferencesRequestApiDto requestApiDto = new CreatePreferencesRequestApiDto() @@ -59,18 +59,18 @@ class UpdatePreferencesIntegrationTest extends PreferencesMocks { + "}"); final PreferencesResponseApiDto response = updatePreferences(requestApiDto); assertThat(response).isNotNull(); - assertThat(response.getProperties()).isEqualTo(preferencesPortalPrefsDto.getProperties()); + assertThat(response.getProperties()).isEqualTo(preferencesPreferencesDto.getProperties()); } @Test void thatPreferencesCanNotBeUpdated() throws Exception { - final var problemPortalPrefsDto = new ProblemPortalPrefsDto(); - problemPortalPrefsDto.setStatus(HttpStatus.BAD_REQUEST.value()); - problemPortalPrefsDto.setTitle(HttpStatus.BAD_REQUEST.toString()); - problemPortalPrefsDto.setDetail("Some details"); + final var problemPreferencesDto = new ProblemPreferencesDto(); + problemPreferencesDto.setStatus(HttpStatus.BAD_REQUEST.value()); + problemPreferencesDto.setTitle(HttpStatus.BAD_REQUEST.toString()); + problemPreferencesDto.setDetail("Some details"); - final PreferencesPortalPrefsDto preferencesPortalPrefsDto = - new PreferencesPortalPrefsDto() + final PreferencesPreferencesDto preferencesPreferencesDto = + new PreferencesPreferencesDto() .properties( "{\n" + "\"properties\": {\n" @@ -79,7 +79,7 @@ class UpdatePreferencesIntegrationTest extends PreferencesMocks { + "}\n" + "\n" + "}"); - mockUpdatePreferencesError(preferencesPortalPrefsDto, problemPortalPrefsDto); + mockUpdatePreferencesError(preferencesPreferencesDto, problemPreferencesDto); CreatePreferencesRequestApiDto requestApiDto = new CreatePreferencesRequestApiDto() @@ -108,7 +108,7 @@ class UpdatePreferencesIntegrationTest extends PreferencesMocks { assertThat(response.getStatus()).isEqualTo(HttpStatus.BAD_GATEWAY.value()); assertThat(response.getDownstreamSystem()) - .isEqualTo(ProblemApiDto.DownstreamSystemEnum.PORTAL_PREFS); + .isEqualTo(ProblemApiDto.DownstreamSystemEnum.PREFERENCES); assertThat(response.getDownstreamStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value()); } } |