diff options
Diffstat (limited to 'vid-app-common/src/test')
5 files changed, 128 insertions, 28 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientTest.java b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientTest.java index 5eaaf9335..13fe761c6 100644 --- a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientTest.java @@ -21,6 +21,7 @@ package org.onap.vid.asdc.rest; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,6 +34,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.matches; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.onap.vid.testUtils.TestUtils.mockGetRawBodyWithStringBody; import static org.testng.AssertJUnit.fail; import io.joshworks.restclient.http.HttpResponse; @@ -178,10 +180,10 @@ public class SdcRestClientTest { public void whenJavaxClientThrowException_then_getServiceToscaModelRethrowException(Class<? extends Throwable> expectedType, Consumer<SyncRestClient> setupMocks) throws Exception { /* Call chain is like: - this test -> RestfulAsdcClient -> javax's Client + this test -> SdcRestClient -> SdcRestClient -> joshworks client which return joshworks HttpResponse - In this test, *RestfulAsdcClient* is under test (actual implementation is used), while javax's Client is - mocked to return pseudo-responses or - better - throw exceptions. + In this test, *SdcRestClient* is under test (actual implementation is used), while SdcRestClient is + mocked to return pseudo joshworks HttpResponse or - better - throw exceptions. */ /// TEST: @@ -198,4 +200,55 @@ public class SdcRestClientTest { fail("exception shall rethrown by getServiceToscaModel once javax client throw exception "); } + @DataProvider + public static Object[][] badResponses() { + return new Object[][] { + {(Consumer<HttpResponse>) response -> { + when(response.getStatus()).thenReturn(404); + mockGetRawBodyWithStringBody(response,"");}, + "" + }, + {(Consumer<HttpResponse>) response -> { + when(response.getStatus()).thenReturn(405); + when(response.getRawBody()).thenThrow(ClassCastException.class);}, + "" + }, + {(Consumer<HttpResponse>) response -> { + when(response.getStatus()).thenReturn(500); + mockGetRawBodyWithStringBody(response,"some message");}, + "some message" + }, + }; + } + + @Test(dataProvider = "badResponses") + public void whenJavaxClientReturnBadCode_then_getServiceToscaModelThrowException(Consumer<HttpResponse> setupMocks, String exceptedBody) throws Exception { + /* + Call chain is like: + this test -> SdcRestClient -> SdcRestClient -> joshworks client which return joshworks HttpResponse + + In this test, *SdcRestClient* is under test (actual implementation is used), while SdcRestClient is + mocked to return pseudo joshworks HttpResponse + */ + + HttpResponse<InputStream> mockResponse = mock(HttpResponse.class); + SyncRestClient syncRestClient = mock(SyncRestClient.class); + when(syncRestClient.getStream(anyString(), anyMap(), anyMap())).thenReturn(mockResponse); + + // prepare real RestfulAsdcClient (Under test) + + setupMocks.accept(mockResponse); + + try { + new SdcRestClient(SAMPLE_BASE_URL, SAMPLE_AUTH, syncRestClient).getServiceToscaModel(UUID.randomUUID()); + } catch (AsdcCatalogException e) { + assertThat(e.getMessage(), containsString(String.valueOf(mockResponse.getStatus()))); + assertThat(e.getMessage(), containsString(exceptedBody)); + return; //OK + } + + fail("exception shall be thrown by getServiceToscaModel once response contains error code "); + } + + } diff --git a/vid-app-common/src/test/java/org/onap/vid/client/UnirestPatchKtTest.kt b/vid-app-common/src/test/java/org/onap/vid/client/UnirestPatchKtTest.kt new file mode 100644 index 000000000..8948ee22c --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/client/UnirestPatchKtTest.kt @@ -0,0 +1,36 @@ +package org.onap.vid.client + +import org.onap.vid.testUtils.TestUtils +import org.testng.Assert.assertEquals +import org.testng.annotations.Test + +class UnirestPatchKtTest { + + @Test + fun givenHttpResponseIsNull_whenExtractRawAsString_emptyStringIsReturn() { + val result = extractRawAsString(null) + assertEquals(result, "") + } + + @Test + fun givenHttpResponseBodyIsNull_whenExtractRawAsString_emptyStringIsReturn() { + val result = extractRawAsString(TestUtils.createTestHttpResponse(200, null)) + assertEquals(result, "") + } + + @Test + fun givenHttpResponseBodyIsString_whenExtractRawAsString_sameStringIsReturn() { + val body = "someBody" + val result = extractRawAsString(TestUtils.createTestHttpResponse(200, body)) + assertEquals(result, body) + } + + @Test + fun givenHttpResponseBodyIsString_whenReadBodyAndExtractRawAsString_sameStringIsReturn() { + val body = "someBody" + val httpResponse = TestUtils.createTestHttpResponse(200, body); + assertEquals(httpResponse.body, body) //read body once + val result = extractRawAsString(httpResponse) + assertEquals(result, body) + } +} diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java index ffabc18a2..c0683425b 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java @@ -55,7 +55,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.joshworks.restclient.http.HttpResponse; import java.io.IOException; import java.net.URL; -import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -97,6 +96,7 @@ import org.onap.vid.mso.rest.Request; import org.onap.vid.mso.rest.RequestDetails; import org.onap.vid.mso.rest.RequestDetailsWrapper; import org.onap.vid.mso.rest.Task; +import org.onap.vid.testUtils.TestUtils; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.test.context.ContextConfiguration; @@ -1442,11 +1442,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { HttpResponse<String> httpResponse = mockForGetOrchestrationRequest(); when(httpResponse.getStatus()).thenReturn(statusCode); when(httpResponse.getBody()).thenReturn(body); - try { - when(httpResponse.getRawBody()).thenReturn(IOUtils.toInputStream(body, StandardCharsets.UTF_8.name())); - } catch (IOException e) { - throw new RuntimeException(e); - } + TestUtils.mockGetRawBodyWithStringBody(httpResponse, body); return httpResponse; } diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java index 650bda13b..10456bebf 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java @@ -21,17 +21,13 @@ package org.onap.vid.mso; -import io.joshworks.restclient.http.HttpResponse; -import org.apache.http.HttpResponseFactory; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.message.BasicStatusLine; -import org.testng.annotations.Test; - import static org.apache.http.HttpStatus.SC_OK; -import static org.apache.http.HttpVersion.HTTP_1_1; import static org.assertj.core.api.Assertions.assertThat; +import io.joshworks.restclient.http.HttpResponse; +import org.onap.vid.testUtils.TestUtils; +import org.testng.annotations.Test; + public class MsoUtilTest { @Test @@ -51,7 +47,7 @@ public class MsoUtilTest { @Test public void shouldWrapHttpResponse() throws Exception { // given - HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, null); + HttpResponse<String> httpResponse = TestUtils.createTestHttpResponse(SC_OK, null); // when MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse); // then @@ -63,7 +59,7 @@ public class MsoUtilTest { public void shouldWrapHttpResponseWithEntity() throws Exception { // given String entity = "entity"; - HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, entity); + HttpResponse<String> httpResponse = TestUtils.createTestHttpResponse(SC_OK, entity); // when MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse); // then @@ -71,12 +67,4 @@ public class MsoUtilTest { assertThat(result.getStatus()).isEqualTo(SC_OK); } - private HttpResponse<String> createTestHttpResponse(int statusCode, String entity) throws Exception { - HttpResponseFactory factory = new DefaultHttpResponseFactory(); - org.apache.http.HttpResponse response = factory.newHttpResponse(new BasicStatusLine(HTTP_1_1, statusCode, null), null); - if (entity != null) { - response.setEntity(new StringEntity(entity)); - } - return new HttpResponse<>(response, String.class, null); - } } diff --git a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java index 58ee2d38d..399274d69 100644 --- a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java +++ b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java @@ -28,7 +28,8 @@ import static org.apache.commons.beanutils.PropertyUtils.getPropertyDescriptors; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.text.CharacterPredicates.DIGITS; import static org.apache.commons.text.CharacterPredicates.LETTERS; -import static org.mockito.Matchers.any; +import static org.apache.http.HttpVersion.HTTP_1_1; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,12 +40,14 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.code.beanmatchers.BeanMatchers; import com.google.common.collect.ImmutableList; +import io.joshworks.restclient.http.HttpResponse; import java.beans.PropertyDescriptor; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -56,8 +59,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.commons.text.RandomStringGenerator; +import org.apache.http.HttpResponseFactory; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.DefaultHttpResponseFactory; +import org.apache.http.message.BasicStatusLine; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.json.JSONArray; @@ -67,6 +75,7 @@ import org.mockito.MockSettings; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.mockito.stubbing.OngoingStubbing; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.asdc.AsdcCatalogException; import org.onap.vid.asdc.beans.Service; @@ -193,6 +202,24 @@ public class TestUtils { ), CloudConfiguration.class); } + public static OngoingStubbing<InputStream> mockGetRawBodyWithStringBody(HttpResponse<String> httpResponse, String body) { + try { + return when(httpResponse.getRawBody()).thenReturn(IOUtils.toInputStream(body, StandardCharsets.UTF_8.name())); + } catch (IOException e) { + ExceptionUtils.rethrow(e); + } + return null; //never shall get here + } + + public static HttpResponse<String> createTestHttpResponse(int statusCode, String entity) throws Exception { + HttpResponseFactory factory = new DefaultHttpResponseFactory(); + org.apache.http.HttpResponse response = factory.newHttpResponse(new BasicStatusLine(HTTP_1_1, statusCode, null), null); + if (entity != null) { + response.setEntity(new StringEntity(entity)); + } + return new HttpResponse<>(response, String.class, null); + } + public static class JavaxRsClientMocks { private final javax.ws.rs.client.Client fakeClient; |