diff options
Diffstat (limited to 'src/test/java/org/onap/aai/modelloader/entity')
-rw-r--r-- | src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java | 49 | ||||
-rw-r--r-- | src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java | 62 |
2 files changed, 44 insertions, 67 deletions
diff --git a/src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java b/src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java index 8145599..3da25b0 100644 --- a/src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java +++ b/src/test/java/org/onap/aai/modelloader/entity/catalog/TestVnfCatalogArtifactHandler.java @@ -23,6 +23,7 @@ package org.onap.aai.modelloader.entity.catalog; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,9 +36,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; @@ -45,7 +43,9 @@ import org.onap.aai.modelloader.config.ModelLoaderConfig; import org.onap.aai.modelloader.entity.Artifact; import org.onap.aai.modelloader.entity.ArtifactType; import org.onap.aai.modelloader.restclient.AaiRestClient; -import org.onap.aai.restclient.client.OperationResult; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; public class TestVnfCatalogArtifactHandler { @@ -61,24 +61,23 @@ public class TestVnfCatalogArtifactHandler { @Test public void testUpdateVnfImages() throws Exception { // GET operation - OperationResult mockGetResp = mock(OperationResult.class); + ResponseEntity mockGetResp = mock(ResponseEntity.class); // @formatter:off - when(mockGetResp.getResultCode()) - .thenReturn(Response.Status.OK.getStatusCode()) - .thenReturn(Response.Status.NOT_FOUND.getStatusCode()) - .thenReturn(Response.Status.NOT_FOUND.getStatusCode()) - .thenReturn(Response.Status.OK.getStatusCode()); + when(mockGetResp.getStatusCodeValue()) + .thenReturn(HttpStatus.OK.value()) + .thenReturn(HttpStatus.NOT_FOUND.value()) + .thenReturn(HttpStatus.NOT_FOUND.value()) + .thenReturn(HttpStatus.OK.value()); // @formatter:on - when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class))) + when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any())) .thenReturn(mockGetResp); mockPutOperations(); // Example VNF Catalog XML VnfCatalogArtifactHandler handler = new VnfCatalogArtifactHandler(createConfig()); - assertThat(handler.pushArtifacts(createVnfCatalogArtifact(), "test", new ArrayList<Artifact>(), mockRestClient), - is(true)); + assertTrue(handler.pushArtifacts(createVnfCatalogArtifact(), "test", new ArrayList<Artifact>(), mockRestClient)); assertPutOperationsSucceeded(); } @@ -86,17 +85,17 @@ public class TestVnfCatalogArtifactHandler { @Test public void testUpdateVnfImagesFromXml() throws Exception { // GET operation - OperationResult mockGetResp = mock(OperationResult.class); + ResponseEntity mockGetResp = mock(ResponseEntity.class); // @formatter:off - when(mockGetResp.getResultCode()) - .thenReturn(Response.Status.OK.getStatusCode()) - .thenReturn(Response.Status.NOT_FOUND.getStatusCode()) - .thenReturn(Response.Status.NOT_FOUND.getStatusCode()) - .thenReturn(Response.Status.OK.getStatusCode()); + when(mockGetResp.getStatusCodeValue()) + .thenReturn(HttpStatus.OK.value()) + .thenReturn(HttpStatus.NOT_FOUND.value()) + .thenReturn(HttpStatus.NOT_FOUND.value()) + .thenReturn(HttpStatus.OK.value()); // @formatter:on - when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class))) + when(mockRestClient.getResource(Mockito.anyString(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any())) .thenReturn(mockGetResp); mockPutOperations(); @@ -109,7 +108,7 @@ public class TestVnfCatalogArtifactHandler { // Only two of the VNF images should be pushed ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class); AaiRestClient client = Mockito.verify(mockRestClient, Mockito.times(2)); - client.putResource(Mockito.anyString(), argument.capture(), Mockito.anyString(), Mockito.any(MediaType.class)); + client.putResource(Mockito.anyString(), argument.capture(), Mockito.anyString(), Mockito.any(MediaType.class), Mockito.any()); assertThat(argument.getAllValues().size(), is(2)); assertThat(argument.getAllValues().get(0), containsString("5.2.5")); assertThat(argument.getAllValues().get(0), containsString("VM00")); @@ -161,10 +160,10 @@ public class TestVnfCatalogArtifactHandler { * Always return CREATED (success) for a PUT operation. */ private void mockPutOperations() { - OperationResult mockPutResp = mock(OperationResult.class); - when(mockPutResp.getResultCode()).thenReturn(Response.Status.CREATED.getStatusCode()); + ResponseEntity mockPutResp = mock(ResponseEntity.class); + when(mockPutResp.getStatusCode()).thenReturn(HttpStatus.CREATED); when(mockRestClient.putResource(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), - Mockito.any(MediaType.class))).thenReturn(mockPutResp); + Mockito.any(MediaType.class), Mockito.any())).thenReturn(mockPutResp); } private void assertPutOperationsSucceeded() { @@ -172,7 +171,7 @@ public class TestVnfCatalogArtifactHandler { ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class); AaiRestClient mockedClient = Mockito.verify(mockRestClient, Mockito.times(2)); mockedClient.putResource(Mockito.anyString(), argument.capture(), Mockito.anyString(), - Mockito.any(MediaType.class)); + Mockito.any(MediaType.class), Mockito.any()); assertThat(argument.getAllValues().get(0), containsString("3.16.9")); assertThat(argument.getAllValues().get(0), containsString("VM00")); assertThat(argument.getAllValues().get(1), containsString("3.16.1")); diff --git a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java index 177a8d2..b16c8a0 100644 --- a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java @@ -32,8 +32,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -41,7 +39,8 @@ import org.mockito.MockitoAnnotations; import org.onap.aai.modelloader.config.ModelLoaderConfig; import org.onap.aai.modelloader.entity.Artifact; import org.onap.aai.modelloader.restclient.AaiRestClient; -import org.onap.aai.restclient.client.OperationResult; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; /** * Test the Model Artifact Handler using Mocks @@ -69,25 +68,13 @@ public class TestModelArtifactHandler { } @Test - public void testSingleItemList() { - when(config.getAaiBaseUrl()).thenReturn(""); - when(config.getAaiModelUrl(any())).thenReturn(""); - - ModelArtifactHandler handler = new ModelArtifactHandler(config); - List<Artifact> artifacts = Collections.singletonList(new ModelArtifact()); - handler.pushArtifacts(artifacts, "", Collections.emptyList(), aaiClient); - handler.rollback(Collections.emptyList(), "", aaiClient); - assertThat(artifacts, hasSize(1)); - } - - @Test public void testPushExistingModelsWithRollback() { when(config.getAaiBaseUrl()).thenReturn(""); when(config.getAaiModelUrl(any())).thenReturn(""); - OperationResult operationResult = mock(OperationResult.class); - when(aaiClient.getResource(any(), any(), any())).thenReturn(operationResult); - when(operationResult.getResultCode()).thenReturn(Response.Status.OK.getStatusCode()); + ResponseEntity operationResult = mock(ResponseEntity.class); + when(aaiClient.getResource(any(), any(), any(), any())).thenReturn(operationResult); + when(operationResult.getStatusCode()).thenReturn(HttpStatus.OK); List<Artifact> artifacts = new ArrayList<>(); Artifact artifact = new ModelArtifact(); @@ -105,13 +92,13 @@ public class TestModelArtifactHandler { when(config.getAaiModelUrl(any())).thenReturn(""); when(config.getAaiNamedQueryUrl(any())).thenReturn(""); - OperationResult getResult = mock(OperationResult.class); - when(aaiClient.getResource(any(), any(), any())).thenReturn(getResult); - when(getResult.getResultCode()).thenReturn(Response.Status.NOT_FOUND.getStatusCode()); + ResponseEntity getResult = mock(ResponseEntity.class); + when(aaiClient.getResource(any(), any(), any(), any())).thenReturn(getResult); + when(getResult.getStatusCode()).thenReturn(HttpStatus.NOT_FOUND); - OperationResult putResult = mock(OperationResult.class); - when(aaiClient.putResource(any(), any(), any(), any())).thenReturn(putResult); - when(putResult.getResultCode()).thenReturn(Response.Status.CREATED.getStatusCode()); + ResponseEntity putResult = mock(ResponseEntity.class); + when(aaiClient.putResource(any(), any(), any(), any(), any())).thenReturn(putResult); + when(putResult.getStatusCode()).thenReturn(HttpStatus.CREATED); List<Artifact> artifacts = new ArrayList<>(); artifacts.add(new ModelArtifact()); @@ -133,13 +120,13 @@ public class TestModelArtifactHandler { when(config.getAaiModelUrl(any())).thenReturn(""); when(config.getAaiNamedQueryUrl(any())).thenReturn(""); - OperationResult getResult = mock(OperationResult.class); - when(aaiClient.getResource(any(), any(), any())).thenReturn(getResult); - when(getResult.getResultCode()).thenReturn(Response.Status.NOT_FOUND.getStatusCode()); + ResponseEntity getResult = mock(ResponseEntity.class); + when(aaiClient.getResource(any(), any(), any(), any())).thenReturn(getResult); + when(getResult.getStatusCode()).thenReturn(HttpStatus.NOT_FOUND); - OperationResult putResult = mock(OperationResult.class); - when(aaiClient.putResource(any(), any(), any(), any())).thenReturn(putResult); - when(putResult.getResultCode()).thenReturn(Response.Status.BAD_REQUEST.getStatusCode()); + ResponseEntity putResult = mock(ResponseEntity.class); + when(aaiClient.putResource(any(), any(), any(), any(), any())).thenReturn(putResult); + when(putResult.getStatusCode()).thenReturn(HttpStatus.BAD_REQUEST); checkRollback(Collections.singletonList(new ModelArtifact())); } @@ -149,18 +136,9 @@ public class TestModelArtifactHandler { when(config.getAaiBaseUrl()).thenReturn(""); when(config.getAaiModelUrl(any())).thenReturn(""); - OperationResult operationResult = mock(OperationResult.class); - when(aaiClient.getResource(any(), any(), any())).thenReturn(operationResult); - when(operationResult.getResultCode()).thenReturn(Response.Status.BAD_REQUEST.getStatusCode()); - - checkRollback(Collections.singletonList(new ModelArtifact())); - } - - @Test - public void testNullResourceModelResult() { - when(config.getAaiBaseUrl()).thenReturn(""); - when(config.getAaiModelUrl(any())).thenReturn(""); - when(aaiClient.getResource(any(), any(), any())).thenReturn(null); + ResponseEntity operationResult = mock(ResponseEntity.class); + when(aaiClient.getResource(any(), any(), any(), any())).thenReturn(operationResult); + when(operationResult.getStatusCode()).thenReturn(HttpStatus.BAD_REQUEST); checkRollback(Collections.singletonList(new ModelArtifact())); } |