From: Fiete Ostkamp Date: Thu, 19 Mar 2026 16:16:27 +0000 (+0100) Subject: Remove shazamcrest dependency X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F143635%2F19;p=so.git Remove shazamcrest dependency - remove shazamcrest [0] - replace it with assertj's usingRecursiveComparison [0] last updated 2015, not compatible with newer versions of gson Issue-ID: SO-4263 Change-Id: Ide07cc72467989fbde1919c376e4647fed3776d0 Signed-off-by: Fiete Ostkamp --- diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java index e7b96987ac..23e0b84afe 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/cloud/authentication/AuthenticationMethodTest.java @@ -21,8 +21,7 @@ package org.onap.so.cloud.authentication; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import java.io.IOException; import java.nio.file.Files; @@ -115,6 +114,6 @@ public class AuthenticationMethodTest { com.woorea.openstack.keystone.v3.model.Authentication actual = authenticationMethodFactory.getAuthenticationForV3(identity, "project-x"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsITTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsITTest.java index e3fc86971b..fb41f0f350 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsITTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsITTest.java @@ -22,11 +22,10 @@ package org.onap.so.openstack.utils; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertNotNull; import java.io.IOException; import java.util.ArrayList; @@ -99,10 +98,9 @@ public class MsoHeatUtilsITTest extends BaseTest { VduInstance actual = heatUtils.instantiateVdu(cloudInfo, instanceName, inputs, vduModel, rollbackOnFailure); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } - @Test public void queryVduTest() throws Exception { VduInstance expected = new VduInstance(); @@ -127,7 +125,7 @@ public class MsoHeatUtilsITTest extends BaseTest { VduInstance actual = heatUtils.queryVdu(cloudInfo, instanceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -156,7 +154,7 @@ public class MsoHeatUtilsITTest extends BaseTest { VduInstance actual = heatUtils.deleteVdu(cloudInfo, instanceId, timeoutInMinutes); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -214,6 +212,4 @@ public class MsoHeatUtilsITTest extends BaseTest { assertNotNull(stackInfo); } - - } diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java index f2a4782161..6955eae1e8 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsWithUpdateTest.java @@ -20,8 +20,7 @@ package org.onap.so.openstack.utils; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; import java.io.File; @@ -100,7 +99,7 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo actualStackInfo = heatUtils.updateStack(cloudSiteId, cloudOwner, tenantId, stackName, heatTemplate, stackInputs, pollForCompletion, timeoutMinutes); - assertThat(actualStackInfo, sameBeanAs(expectedStackInfo)); + assertThat(actualStackInfo).usingRecursiveComparison().isEqualTo(expectedStackInfo); } @Test @@ -124,7 +123,7 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo actualStackInfo = heatUtils.updateStack(cloudSiteId, cloudOwner, tenantId, stackName, heatTemplate, stackInputs, pollForCompletion, timeoutMinutes, environmentString); - assertThat(actualStackInfo, sameBeanAs(expectedStackInfo)); + assertThat(actualStackInfo).usingRecursiveComparison().isEqualTo(expectedStackInfo); } @Test @@ -149,6 +148,6 @@ public class MsoHeatUtilsWithUpdateTest extends TestDataSetup { StackInfo actualStackInfo = heatUtils.updateStack(cloudSiteId, cloudOwner, tenantId, stackName, heatTemplate, stackInputs, pollForCompletion, timeoutMinutes, environmentString, files); - assertThat(actualStackInfo, sameBeanAs(expectedStackInfo)); + assertThat(actualStackInfo).usingRecursiveComparison().isEqualTo(expectedStackInfo); } } diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoYamlEditorWithEnvtTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoYamlEditorWithEnvtTest.java index a7a679b473..e70d1ac0fb 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoYamlEditorWithEnvtTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoYamlEditorWithEnvtTest.java @@ -15,8 +15,7 @@ package org.onap.so.openstack.utils; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNull; import java.io.File; import java.io.IOException; @@ -46,7 +45,7 @@ public class MsoYamlEditorWithEnvtTest extends TestDataSetup { Set heatEnvironmentSet = yaml.getParameterListFromEnvt(); for (MsoHeatEnvironmentParameter heatEnvironment : heatEnvironmentSet) { - assertThat(heatEnvironment, sameBeanAs(expectedHeatParam)); + assertThat(heatEnvironment).usingRecursiveComparison().isEqualTo(expectedHeatParam); } } @@ -59,7 +58,7 @@ public class MsoYamlEditorWithEnvtTest extends TestDataSetup { Set heatResourceSet = yaml.getResourceListFromEnvt(); for (MsoHeatEnvironmentResource heatResource : heatResourceSet) { - assertThat(heatResource, sameBeanAs(expectedHeatResource)); + assertThat(heatResource).usingRecursiveComparison().isEqualTo(expectedHeatResource); } } @@ -82,7 +81,7 @@ public class MsoYamlEditorWithEnvtTest extends TestDataSetup { Set heatParamSet = yaml.getParameterList(); for (HeatTemplateParam heatParam : heatParamSet) { - assertThat(heatParam, sameBeanAs(expectedHeatParam)); + assertThat(heatParam).usingRecursiveComparison().isEqualTo(expectedHeatParam); } } } diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java index a4277fa8b5..f31db117e8 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java @@ -20,6 +20,7 @@ package org.onap.so.adapters.catalogdb.catalogrest; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import javax.transaction.Transactional; import javax.ws.rs.core.MediaType; @@ -37,8 +38,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.web.util.UriComponentsBuilder; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; public class CloudConfigTest extends CatalogDbAdapterBaseTest { @@ -88,11 +87,10 @@ public class CloudConfigTest extends CatalogDbAdapterBaseTest { restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class); System.out.println(cloudSiteString.getBody()); assertEquals(Response.Status.OK.getStatusCode(), actualCloudSite.getStatusCode().value()); - assertThat(actualCloudSite.getBody(), sameBeanAs(cloudSite).ignoring("created").ignoring("updated") - .ignoring("identityService.created").ignoring("identityService.updated")); + assertThat(actualCloudSite.getBody()).usingRecursiveComparison() + .ignoringFields("created", "updated", "identityService.created", "identityService.updated") + .isEqualTo(cloudSite); } - - } diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java index 581c79372b..06056719f0 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/ServiceMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.adapters.catalogdb.catalogrest; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -46,7 +45,7 @@ public class ServiceMapperTest { @Test public void service_map_test() throws JsonParseException, JsonMappingException, IOException { Service actual = serviceMapper.mapService(getTestService(), 2); - assertThat(actual, sameBeanAs(getExpectedService())); + assertThat(actual).usingRecursiveComparison().isEqualTo(getExpectedService()); } private Service getExpectedService() throws JsonParseException, JsonMappingException, IOException { @@ -54,7 +53,6 @@ public class ServiceMapperTest { return mapper.readValue(getJson("ExpectedService.json"), Service.class); } - private org.onap.so.db.catalog.beans.Service getTestService() { org.onap.so.db.catalog.beans.Service testService = new org.onap.so.db.catalog.beans.Service(); testService.setCategory("category"); diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/cloudregion/CloudRegionRestImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/cloudregion/CloudRegionRestImplTest.java index 9d5a4c62b9..1f97dbddcc 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/cloudregion/CloudRegionRestImplTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/cloudregion/CloudRegionRestImplTest.java @@ -1,7 +1,6 @@ package org.onap.so.adapters.cloudregion; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ import org.onap.so.db.catalog.beans.CloudSite; import org.onap.so.db.catalog.client.CatalogDbClient; import org.onap.so.db.catalog.data.repository.NetworkTechnologyReferenceRepository; - @RunWith(MockitoJUnitRunner.class) public class CloudRegionRestImplTest { @@ -66,10 +64,9 @@ public class CloudRegionRestImplTest { @Test public void mapCloudRegionTest() { CloudRegion mappedRegion = cloudRestImpl.mapCloudRegion(cloudSite); - assertThat(mappedRegion, sameBeanAs(testCloudRegion)); + assertThat(mappedRegion).usingRecursiveComparison().isEqualTo(testCloudRegion); } - @Test public void mapCloudRegionVersionGreaterThan3Test() { CloudSite cloudSite2 = new CloudSite(); @@ -87,7 +84,7 @@ public class CloudRegionRestImplTest { testRegion2.setOwnerDefinedType("cLCP"); testRegion2.setCloudType("openstack"); testRegion2.setCloudZone("region"); - assertThat(mappedRegion, sameBeanAs(testRegion2)); + assertThat(mappedRegion).usingRecursiveComparison().isEqualTo(testRegion2); } @Test @@ -103,7 +100,8 @@ public class CloudRegionRestImplTest { verify(catalogDbClientMock, times(1)).postCloudSite(cloudSite); verify(aaiResClientMock, times(1)).createIfNotExists(Mockito.eq(uri), Mockito.any()); verify(aaiResClientMock, times(1)).createIfNotExists(actualURI.capture(), actualCloudRegion.capture()); - assertThat((CloudRegion) actualCloudRegion.getValue().get(), sameBeanAs(testCloudRegion)); + assertThat((CloudRegion) actualCloudRegion.getValue().get()).usingRecursiveComparison() + .isEqualTo(testCloudRegion); } @Test diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java index 0ec4a03401..1319e2980a 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java @@ -32,8 +32,7 @@ */ package org.onap.so.heatbridge; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -164,14 +163,11 @@ public class HeatBridgeImplTest { private HeatBridgeImpl heatbridge = new HeatBridgeImpl(resourcesClient, cloudIdentity, CLOUD_OWNER, REGION_ID, REGION_ID, TENANT_ID, NodeType.GREENFIELD); - @Before public void setUp() { when(resourcesClient.beginSingleTransaction()).thenReturn(transaction); } - - @Test public void testExtractStackResourceIdsByResourceType() { // Arrange @@ -187,7 +183,6 @@ public class HeatBridgeImplTest { assertEquals(expectedServerIds, serverIds); } - @Test @Ignore public void testUpdateVserversToAai() throws HeatBridgeException, JsonProcessingException { @@ -241,7 +236,6 @@ public class HeatBridgeImplTest { when(server2.getFlavor()).thenReturn(flavor); when(flavor.getId()).thenReturn("test-flavor-id"); - // Act heatbridge.buildAddVserversToAaiAction("test-genericVnf-id", "test-vfModule-id", servers); @@ -380,7 +374,6 @@ public class HeatBridgeImplTest { assertEquals(2, relList3.getRelationship().size()); } - @Test public void testUpdateImagesToAai() throws HeatBridgeException { // Arrange @@ -662,7 +655,7 @@ public class HeatBridgeImplTest { assertTrue(argument.getValue().isPresent()); - assertThat((L3InterfaceIpv6AddressList) argument.getValue().get(), sameBeanAs(ipv6)); + assertThat((L3InterfaceIpv6AddressList) argument.getValue().get()).usingRecursiveComparison().isEqualTo(ipv6); } @Test @@ -794,7 +787,6 @@ public class HeatBridgeImplTest { List images = heatbridge.extractOpenstackImagesFromServers(serverList); - // Assert assertEquals(1, images.size()); } @@ -833,7 +825,6 @@ public class HeatBridgeImplTest { return stackResources; } - private String readTestResourceFile(String filePath) { String content = null; String pathname = Objects.requireNonNull(getClass().getClassLoader().getResource(filePath)).getFile(); @@ -850,6 +841,4 @@ public class HeatBridgeImplTest { return new String(Files.readAllBytes(Paths.get("src/test/resources/__files/" + filename))); } - - } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java index 630d290b28..eacf997066 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java @@ -21,8 +21,7 @@ package org.onap.so.adapters.requestsdb; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.sql.Timestamp; @@ -330,7 +329,8 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA for (InfraActiveRequests result : responseList) { if (result.getRequestId().equals(request.getRequestId())) { - assertThat(request, sameBeanAs(result).ignoring("modifyTime")); + assertThat(request).usingRecursiveComparison().ignoringFields("modifyTime", "startTime") + .isEqualTo(result); expectedReturned = true; } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java index 2c0b87c064..3896842fe5 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.adapters.requestsdb.adapters; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.util.ArrayList; @@ -133,8 +132,8 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { fail("Null infraRequest"); // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") - .ignoring("startTime").ignoring("modifyTime")); + assertThat(infraRequest).usingRecursiveComparison() + .ignoringFields("requestBody", "endTime", "startTime", "modifyTime").isEqualTo(testRequest); } @@ -199,8 +198,8 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { serviceInstanceName, configurationId, configurationName, vfModuleName); InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId); // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") - .ignoring("startTime").ignoring("modifyTime")); + assertThat(infraRequest).usingRecursiveComparison() + .ignoringFields("requestBody", "endTime", "startTime", "modifyTime").isEqualTo(testRequest); } @@ -231,8 +230,8 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { null, null, null, null, null, null, null, null, null, null, null); InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId); // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") - .ignoring("startTime").ignoring("modifyTime")); + assertThat(infraRequest).usingRecursiveComparison() + .ignoringFields("requestBody", "endTime", "startTime", "modifyTime").isEqualTo(testRequest); } @Test @@ -280,7 +279,7 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { dbAdapter.setInstanceNfvoMappingRepository(instanceId, nfvoName, endpoint, username, password, apiRoot); InstanceNfvoMapping dbInstNfvoMap = dbAdapter.getInstanceNfvoMapping(instanceId); - assertThat(dbInstNfvoMap, sameBeanAs(instanceNfvoMapping)); + assertThat(dbInstNfvoMap).usingRecursiveComparison().isEqualTo(instanceNfvoMapping); } @@ -313,7 +312,8 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, result, operationContent, progress, reason); OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId); - assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); + assertThat(dbOpStatus).usingRecursiveComparison().ignoringFields("operateAt", "finishedAt") + .isEqualTo(updatedOperationStatus); } @@ -345,7 +345,8 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, result, operationContent, progress, reason); OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId); - assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); + assertThat(dbOpStatus).usingRecursiveComparison().ignoringFields("operateAt", "finishedAt") + .isEqualTo(updatedOperationStatus); } @Test @@ -387,7 +388,7 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { dbAdapter.initResourceOperationStatus(serviceId, operationId, operationType, resourceTemplateUUIDs); List testList = resourceOperationStatusRepo.findByServiceIdAndOperationId(serviceId, operationId); - assertThat(testList, sameBeanAs(expectedResult)); + assertThat(testList).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -410,7 +411,7 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { ResourceOperationStatus actualResource = dbAdapter.getResourceOperationStatus(serviceId, operationId, "template1"); - assertThat(actualResource, sameBeanAs(resource1)); + assertThat(actualResource).usingRecursiveComparison().isEqualTo(resource1); } @Test @@ -446,6 +447,6 @@ public class MSORequestDBImplTest extends RequestsAdapterBase { ResourceOperationStatus actualResource = dbAdapter.getResourceOperationStatus(serviceId, operationId, "template1"); - assertThat(actualResource, sameBeanAs(expectedResource)); + assertThat(actualResource).usingRecursiveComparison().isEqualTo(expectedResource); } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java index 59919c67f2..d6e6104e14 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java @@ -21,8 +21,7 @@ package org.onap.so.adapters.requestsdb.client; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -127,13 +126,13 @@ public class RequestsDbClientTest extends RequestsAdapterBase { } private void verifyOperationStatus(OperationStatus request, OperationStatus response) { - assertThat(request, sameBeanAs(response).ignoring("operateAt").ignoring("finishedAt")); + assertThat(request).usingRecursiveComparison().ignoringFields("operateAt", "finishedAt").isEqualTo(response); } private void verifyInfraActiveRequests(InfraActiveRequests infraActiveRequestsResponse) { - assertThat(infraActiveRequestsResponse, sameBeanAs(infraActiveRequests).ignoring("modifyTime").ignoring("log") - .ignoring("cloudApiRequests.created").ignoring("cloudApiRequests.id")); + assertThat(infraActiveRequestsResponse).usingRecursiveComparison() + .ignoringFields("modifyTime", "startTime", "log", "cloudApiRequests").isEqualTo(infraActiveRequests); } @Test @@ -330,7 +329,8 @@ public class RequestsDbClientTest extends RequestsAdapterBase { requestsDbClient.save(request); List infraActiveRequests = requestsDbClient.getInProgressVolumeGroupsAndVfModules(); - assertThat(request, sameBeanAs(infraActiveRequests.get(0)).ignoring("modifyTime")); + assertThat(request).usingRecursiveComparison().ignoringFields("modifyTime", "startTime") + .isEqualTo(infraActiveRequests.get(0)); } @Test @@ -343,4 +343,3 @@ public class RequestsDbClientTest extends RequestsAdapterBase { assertEquals("assign", requestProcessingData.get(0).getValue()); } } - diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/MapRequestTunablesTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/MapRequestTunablesTest.java index cab2e27252..acc67ae345 100644 --- a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/MapRequestTunablesTest.java +++ b/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/MapRequestTunablesTest.java @@ -20,8 +20,7 @@ package org.onap.so.adapters.sdnc.impl; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; import org.onap.so.adapters.sdnc.SDNCAdapterApplication; @@ -52,7 +51,7 @@ public class MapRequestTunablesTest { RequestTunables mappedTunable = tunableMapper.setTunables(testMapper); - assertThat(mappedTunable, sameBeanAs(expectedResult)); + assertThat(mappedTunable).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -69,7 +68,7 @@ public class MapRequestTunablesTest { RequestTunables mappedTunable = tunableMapper.setTunables(testMapper); - assertThat(mappedTunable, sameBeanAs(expectedResult)); + assertThat(mappedTunable).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -86,7 +85,7 @@ public class MapRequestTunablesTest { RequestTunables mappedTunable = tunableMapper.setTunables(testMapper); - assertThat(mappedTunable, sameBeanAs(expectedResult)); + assertThat(mappedTunable).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -103,10 +102,9 @@ public class MapRequestTunablesTest { RequestTunables mappedTunable = tunableMapper.setTunables(testMapper); - assertThat(mappedTunable, sameBeanAs(expectedResult)); + assertThat(mappedTunable).usingRecursiveComparison().isEqualTo(expectedResult); } - @Test public void test_setTunables_EmptyOperation_EmptyMSOActionRESTDELETE() { RequestTunables expectedResult = new RequestTunables("testReqId", "", "", "restdelete"); @@ -121,7 +119,7 @@ public class MapRequestTunablesTest { RequestTunables mappedTunable = tunableMapper.setTunables(testMapper); - assertThat(mappedTunable, sameBeanAs(expectedResult)); + assertThat(mappedTunable).usingRecursiveComparison().isEqualTo(expectedResult); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/activity/DeployActivitySpecsTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/activity/DeployActivitySpecsTest.java index e2e2b9a221..dc7421c25b 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/activity/DeployActivitySpecsTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/activity/DeployActivitySpecsTest.java @@ -19,9 +19,8 @@ */ package org.onap.so.asdc.activity; +import static org.assertj.core.api.Assertions.assertThat; import java.nio.file.Files; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -86,6 +85,6 @@ public class DeployActivitySpecsTest { ActivitySpec activitySpec = deployActivitySpecs.mapActivitySpecFromCatalogToSdc(catalogActivitySpec); ActivitySpec expected = mapper.readValue( new String(Files.readAllBytes(Paths.get("src/test/resources/ActivitySpec.json"))), ActivitySpec.class); - assertThat(expected, sameBeanAs(activitySpec)); + assertThat(expected).usingRecursiveComparison().isEqualTo(activitySpec); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCControllerExceptionTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCControllerExceptionTest.java index 927779c485..dc848147a9 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCControllerExceptionTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCControllerExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.asdc.client.exceptions; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; public class ASDCControllerExceptionTest { @@ -31,19 +30,14 @@ public class ASDCControllerExceptionTest { @Test public void asdcParametersExceptionTest() { ASDCControllerException asdcDownloadException = new ASDCControllerException(exceptionMessage); - - Exception expectedException = new Exception(exceptionMessage); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); } @Test public void asdcParametersExceptionThrowableTest() { Throwable throwableCause = new Throwable(throwableMessage); ASDCControllerException asdcDownloadException = new ASDCControllerException(exceptionMessage, throwableCause); - - Exception expectedException = new Exception(exceptionMessage, new Throwable(throwableMessage)); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); + assertThat(asdcDownloadException).hasCause(throwableCause); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCDownloadExceptionTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCDownloadExceptionTest.java index b022ed91d7..f3a81919b7 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCDownloadExceptionTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCDownloadExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.asdc.client.exceptions; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; public class ASDCDownloadExceptionTest { @@ -31,19 +30,14 @@ public class ASDCDownloadExceptionTest { @Test public void asdcDownloadExceptionTest() { ASDCDownloadException asdcDownloadException = new ASDCDownloadException(exceptionMessage); - - Exception expectedException = new Exception(exceptionMessage); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); } @Test public void asdcDownloadExceptionThrowableTest() { Throwable throwableCause = new Throwable(throwableMessage); ASDCDownloadException asdcDownloadException = new ASDCDownloadException(exceptionMessage, throwableCause); - - Exception expectedException = new Exception(exceptionMessage, new Throwable(throwableMessage)); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); + assertThat(asdcDownloadException).hasCause(throwableCause); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCParametersExceptionTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCParametersExceptionTest.java index 2b4a0c956e..70dc57f463 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCParametersExceptionTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ASDCParametersExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.asdc.client.exceptions; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; public class ASDCParametersExceptionTest { @@ -31,19 +30,14 @@ public class ASDCParametersExceptionTest { @Test public void asdcParametersExceptionTest() { ASDCParametersException asdcDownloadException = new ASDCParametersException(exceptionMessage); - - Exception expectedException = new Exception(exceptionMessage); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); } @Test public void asdcParametersExceptionThrowableTest() { Throwable throwableCause = new Throwable(throwableMessage); ASDCParametersException asdcDownloadException = new ASDCParametersException(exceptionMessage, throwableCause); - - Exception expectedException = new Exception(exceptionMessage, new Throwable(throwableMessage)); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); + assertThat(asdcDownloadException).hasCause(throwableCause); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerExceptionTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerExceptionTest.java index 3e0dd27d07..a7f27dc8c2 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerExceptionTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.asdc.client.exceptions; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; public class ArtifactInstallerExceptionTest { @@ -31,10 +30,7 @@ public class ArtifactInstallerExceptionTest { @Test public void asdcParametersExceptionTest() { ArtifactInstallerException asdcDownloadException = new ArtifactInstallerException(exceptionMessage); - - Exception expectedException = new Exception(exceptionMessage); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); } @Test @@ -42,9 +38,7 @@ public class ArtifactInstallerExceptionTest { Throwable throwableCause = new Throwable(throwableMessage); ArtifactInstallerException asdcDownloadException = new ArtifactInstallerException(exceptionMessage, throwableCause); - - Exception expectedException = new Exception(exceptionMessage, new Throwable(throwableMessage)); - - assertThat(asdcDownloadException, sameBeanAs(expectedException)); + assertThat(asdcDownloadException).hasMessage(exceptionMessage); + assertThat(asdcDownloadException).hasCause(throwableCause); } } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java index 7743dc7b51..8530d6992f 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java @@ -20,12 +20,11 @@ package org.onap.so.asdc.client.test.rest; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -106,11 +105,9 @@ public class ASDCRestInterfaceTest extends BaseTest { @LocalServerPort private int port; - @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Before public void setUp() { // ASDC Controller writes to this path @@ -157,18 +154,15 @@ public class ASDCRestInterfaceTest extends BaseTest { arCustomization.setAllottedResource(expectedService); - expectedService.setAllotedResourceCustomization(arCustomizationSet); AllottedResource actualResponse = allottedRepo.findResourceByModelUUID("5b18c75e-2d08-4bf2-ad58-4ea704ec648d"); - if (actualResponse == null) throw new Exception("No Allotted Resource Written to database"); - - assertThat(actualResponse, sameBeanAs(expectedService).ignoring("0x1.created") - .ignoring("0x1.allotedResourceCustomization.created")); + assertThat(actualResponse).usingRecursiveComparison().ignoringFieldsMatchingRegexes(".*created") + .isEqualTo(expectedService); } @Test @@ -200,11 +194,8 @@ public class ASDCRestInterfaceTest extends BaseTest { expectedService.setModelUUID("e16e4ed9-3429-423a-bc3c-1389ae91491c"); expectedService.setModelVersion("1.0"); - - Service actualService = serviceRepo.findOneByModelUUID("e16e4ed9-3429-423a-bc3c-1389ae91491c"); - if (actualService == null) throw new Exception("No Allotted Resource Written to database"); @@ -264,7 +255,6 @@ public class ASDCRestInterfaceTest extends BaseTest { } - @Test public void test_Vcpe_Infra_Distribution() throws Exception { wireMockServer.stubFor(post(urlPathMatching("/aai/.*")) @@ -441,7 +431,6 @@ public class ASDCRestInterfaceTest extends BaseTest { assertEquals("ubuntu16test", service.get().getModelName()); } - @Test public void testServiceBasicCnf() throws Exception { wireMockServer.stubFor(post(urlPathMatching("/aai/.*")) @@ -484,7 +473,6 @@ public class ASDCRestInterfaceTest extends BaseTest { assertEquals("basic_network", service.get().getModelName()); } - protected String createURLWithPort(String uri) { return "http://localhost:" + port + uri; } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/installer/ToscaResourceStructureTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/installer/ToscaResourceStructureTest.java index d95448577c..0d633a7069 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/installer/ToscaResourceStructureTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/installer/ToscaResourceStructureTest.java @@ -20,8 +20,7 @@ package org.onap.so.asdc.installer; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -89,35 +88,41 @@ public class ToscaResourceStructureTest { toscaResourceStructure.setSuccessfulDeployment(); assertEquals("heatTemplateUUID", toscaResourceStructure.getHeatTemplateUUID()); - assertThat(toscaResourceStructure.getAllottedList(), sameBeanAs(new ArrayList())); + assertThat(toscaResourceStructure.getAllottedList()).usingRecursiveComparison() + .isEqualTo(new ArrayList()); assertEquals(sdcCsarHelper, toscaResourceStructure.getSdcCsarHelper()); - assertThat(toscaResourceStructure.getServiceMetadata(), sameBeanAs(new Metadata(new HashMap<>()))); - assertThat(toscaResourceStructure.getCatalogService(), sameBeanAs(new Service())); - assertThat(toscaResourceStructure.getNetworkTypes(), sameBeanAs(new ArrayList<>())); - assertThat(toscaResourceStructure.getVfTypes(), sameBeanAs(new ArrayList<>())); - assertThat(toscaResourceStructure.getCatalogResourceCustomization(), - sameBeanAs(new AllottedResourceCustomization())); - assertThat(toscaResourceStructure.getCatalogNetworkResourceCustomization(), - sameBeanAs(new NetworkResourceCustomization())); - assertThat(toscaResourceStructure.getCatalogNetworkResource(), sameBeanAs(new NetworkResource())); - assertThat(toscaResourceStructure.getCatalogVfModule(), sameBeanAs(new VfModule())); - assertThat(toscaResourceStructure.getVnfResourceCustomization(), sameBeanAs(new VnfResourceCustomization())); - assertThat(toscaResourceStructure.getVfModuleCustomization(), sameBeanAs(new VfModuleCustomization())); - assertThat(toscaResourceStructure.getAllottedResource(), sameBeanAs(new AllottedResource())); - assertThat(toscaResourceStructure.getAllottedResourceCustomization(), - sameBeanAs(new AllottedResourceCustomization())); - assertThat(toscaResourceStructure.getCatalogTempNetworkHeatTemplateLookup(), - sameBeanAs(new TempNetworkHeatTemplateLookup())); + assertThat(toscaResourceStructure.getServiceMetadata()).usingRecursiveComparison() + .isEqualTo(new Metadata(new HashMap<>())); + assertThat(toscaResourceStructure.getCatalogService()).usingRecursiveComparison().isEqualTo(new Service()); + assertThat(toscaResourceStructure.getNetworkTypes()).usingRecursiveComparison().isEqualTo(new ArrayList<>()); + assertThat(toscaResourceStructure.getVfTypes()).usingRecursiveComparison().isEqualTo(new ArrayList<>()); + assertThat(toscaResourceStructure.getCatalogResourceCustomization()).usingRecursiveComparison() + .isEqualTo(new AllottedResourceCustomization()); + assertThat(toscaResourceStructure.getCatalogNetworkResourceCustomization()).usingRecursiveComparison() + .isEqualTo(new NetworkResourceCustomization()); + assertThat(toscaResourceStructure.getCatalogNetworkResource()).usingRecursiveComparison() + .isEqualTo(new NetworkResource()); + assertThat(toscaResourceStructure.getCatalogVfModule()).usingRecursiveComparison().isEqualTo(new VfModule()); + assertThat(toscaResourceStructure.getVnfResourceCustomization()).usingRecursiveComparison() + .isEqualTo(new VnfResourceCustomization()); + assertThat(toscaResourceStructure.getVfModuleCustomization()).usingRecursiveComparison() + .isEqualTo(new VfModuleCustomization()); + assertThat(toscaResourceStructure.getAllottedResource()).usingRecursiveComparison() + .isEqualTo(new AllottedResource()); + assertThat(toscaResourceStructure.getAllottedResourceCustomization()).usingRecursiveComparison() + .isEqualTo(new AllottedResourceCustomization()); + assertThat(toscaResourceStructure.getCatalogTempNetworkHeatTemplateLookup()).usingRecursiveComparison() + .isEqualTo(new TempNetworkHeatTemplateLookup()); assertEquals("heatFilesUUID", toscaResourceStructure.getHeatFilesUUID()); assertEquals(artifactInfo, toscaResourceStructure.getToscaArtifact()); - assertThat(toscaResourceStructure.getToscaCsar(), sameBeanAs(new ToscaCsar())); + assertThat(toscaResourceStructure.getToscaCsar()).usingRecursiveComparison().isEqualTo(new ToscaCsar()); assertEquals("volHeatTemplateUUID", toscaResourceStructure.getVolHeatTemplateUUID()); assertEquals("envHeatTemplateUUID", toscaResourceStructure.getEnvHeatTemplateUUID()); assertEquals("serviceVersion", toscaResourceStructure.getServiceVersion()); assertEquals("workloadPerformance", toscaResourceStructure.getWorkloadPerformance()); - assertThat(toscaResourceStructure.getVfModule(), sameBeanAs(new VfModule())); - assertThat(toscaResourceStructure.getTempNetworkHeatTemplateLookup(), - sameBeanAs(new TempNetworkHeatTemplateLookup())); + assertThat(toscaResourceStructure.getVfModule()).usingRecursiveComparison().isEqualTo(new VfModule()); + assertThat(toscaResourceStructure.getTempNetworkHeatTemplateLookup()).usingRecursiveComparison() + .isEqualTo(new TempNetworkHeatTemplateLookup()); assertEquals(true, toscaResourceStructure.isDeployedSuccessfully()); } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java index 4796703bf4..957092a4b2 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java @@ -20,8 +20,7 @@ package org.onap.so.asdc.installer.heat; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -150,7 +149,6 @@ public class ToscaResourceInstallerTest extends BaseTest { ToscaCsarRepository toscaCsarRepo = spy(ToscaCsarRepository.class); - doReturn(artifactUuid).when(toscaCsar).getArtifactUUID(); doReturn(checkSum).when(toscaCsar).getArtifactChecksum(); doReturn(returnValue).when(toscaCsarRepo).findById(artifactUuid); @@ -190,8 +188,8 @@ public class ToscaResourceInstallerTest extends BaseTest { verify(vfResourceStructure, times(3)).getResourceInstance(); verify(vfResourceStructure, times(5)).getNotification(); - assertThat(actualWatchdogComponentDistributionStatus, - sameBeanAs(expectedComponentDistributionStatus).ignoring("createTime").ignoring("modifyTime")); + assertThat(actualWatchdogComponentDistributionStatus).usingRecursiveComparison() + .ignoringFields("createTime", "modifyTime").isEqualTo(expectedComponentDistributionStatus); } @Test @@ -245,8 +243,8 @@ public class ToscaResourceInstallerTest extends BaseTest { assertEquals(statusData.getDistributionID(), cdStatus.getDistributionId()); assertEquals(statusData.getComponentName(), cdStatus.getComponentName()); - assertThat(actualWatchdogComponentDistributionStatus, - sameBeanAs(expectedWatchdogComponentDistributionStatus).ignoring("createTime").ignoring("modifyTime")); + assertThat(actualWatchdogComponentDistributionStatus).usingRecursiveComparison() + .ignoringFields("createTime", "modifyTime").isEqualTo(expectedWatchdogComponentDistributionStatus); } @Test @@ -301,7 +299,6 @@ public class ToscaResourceInstallerTest extends BaseTest { ToscaCsarRepository toscaCsarRepo = spy(ToscaCsarRepository.class); - ToscaCsar toscaCsar = mock(ToscaCsar.class); Optional returnValue = Optional.of(toscaCsar); doReturn(artifactUuid).when(toscaCsar).getArtifactUUID(); @@ -366,7 +363,6 @@ public class ToscaResourceInstallerTest extends BaseTest { doReturn(resourceCustomizationUUID).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID); doReturn(uuid).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID); - // vnfc instance group list List vnfcInstanceGroupList = new ArrayList<>(); Group vnfcG1 = mock(Group.class); @@ -440,8 +436,6 @@ public class ToscaResourceInstallerTest extends BaseTest { return toscaResourceStructObj; } - - @Test public void installTheResourceExceptionTest() throws Exception { expectedException.expect(ArtifactInstallerException.class); @@ -660,7 +654,6 @@ public class ToscaResourceInstallerTest extends BaseTest { doReturn(null).when(toscaInstaller).getLeafPropertyValue(entityDetails, SdcPropertyNames.PROPERTY_NAME_NFTYPE); } - @Test public void getConfigurationResourceCustomizationTest() { prepareConfigurationResourceCustomization(); @@ -776,7 +769,6 @@ public class ToscaResourceInstallerTest extends BaseTest { } - class MockConstants { public final static String MODEL_NAME = "VLAN Network Receptor Configuration"; public final static String MODEL_INVARIANT_UUID = "1608eef4-de53-4334-a8d2-ba79cab4bde0"; @@ -787,6 +779,5 @@ public class ToscaResourceInstallerTest extends BaseTest { public final static String TEMPLATE_TYPE = "org.openecomp.nodes.VLANNetworkReceptor"; public final static String TEMPLATE_NAME = "VLAN Network Receptor Configuration 0"; - } } diff --git a/bpmn/MSOCommonBPMN/bin/pom.xml b/bpmn/MSOCommonBPMN/bin/pom.xml new file mode 100644 index 0000000000..2ccfdaeae3 --- /dev/null +++ b/bpmn/MSOCommonBPMN/bin/pom.xml @@ -0,0 +1,286 @@ + + + 4.0.0 + + org.onap.so + bpmn + 1.17.0-SNAPSHOT + + MSOCommonBPMN + MSOCommonBPMN + jar + + + + org.apache.maven.plugins + maven-compiler-plugin + + groovy-eclipse-compiler + + + + org.codehaus.groovy + groovy-eclipse-compiler + 3.6.0-03 + + + org.codehaus.groovy + groovy-eclipse-batch + 2.5.8-03 + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + false + + **/validation/* + + + + + + + org.apache.cxf + cxf-codegen-plugin + 2.5.2 + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestSuites.java + + + + + non-spring-tests + + test + + + + **/NonSpringSuite.java + + + + + groovy-tests + + test + + + + **/AllGroovyTestSuites.java + + + + + + suites + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.3,) + + + execute + + + + + true + + + + + + + + + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + test + + + org.camunda.connect + camunda-connect-connectors-all + + + + com.h2database + h2 + test + + + org.codehaus.groovy + groovy-xml + + + org.codehaus.groovy + groovy-json + + + org.codehaus.groovy + groovy-jsr223 + + + org.codehaus.groovy + groovy-test + test + + + org.onap.so + client-cds + ${project.version} + + + org.onap.so + MSOCoreBPMN + ${project.version} + + + org.onap.so + mso-catalog-db + ${project.version} + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + commons-lang + commons-lang + 2.6 + + + org.onap.appc.client + client-lib + ${appc.client.version} + + + org.mockito + mockito-core + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + + + + org.onap.appc.client + client-kit + ${appc.client.version} + + + org.mockito + mockito-core + + + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + 2.26 + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + me.hdpe.bowman + bowman-client + ${bowman.client.version} + + + pl.pragmatists + JUnitParams + test + + + ch.vorburger.mariaDB4j + mariaDB4j + test + + + org.assertj + assertj-core + 3.16.0 + test + + + diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 568e8f2239..2ccfdaeae3 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -279,7 +279,7 @@ org.assertj assertj-core - 3.11.1 + 3.16.0 test diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy index 3b7179df6c..7eb804d2f3 100644 --- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy +++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.bpmn.common.scripts -import static com.shazam.shazamcrest.MatcherAssert.assertThat -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs +import static org.assertj.core.api.Assertions.assertThat import static org.mockito.Mockito.spy import static org.mockito.Mockito.times import static org.mockito.Mockito.when @@ -67,8 +66,8 @@ class ConfirmVolumeGroupTenantTest extends MsoGroovyTest { relationship.getRelationshipData().add(data) relationshipList.getRelationship().add(relationship) expectedVolumeGroup.setRelationshipList(relationshipList) - - + + expectedVolumeGroup.setRelationshipList(relationshipList) ConfirmVolumeGroupTenant confirmVolumeGroupTenant = spy(ConfirmVolumeGroupTenant.class) when(confirmVolumeGroupTenant.getAAIClient()).thenReturn(client) @@ -88,6 +87,6 @@ class ConfirmVolumeGroupTenantTest extends MsoGroovyTest { Mockito.verify(mockExecution, times(4)).setVariable(captor.capture(), captor.capture()) List executionEntities = captor.getAllValues() - assertThat(executionEntities.get(3), sameBeanAs(expectedVolumeGroup)) + assertThat(executionEntities.get(3)).usingRecursiveComparison().isEqualTo(expectedVolumeGroup) } } diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy index 5deec5b434..d3878fbacf 100644 --- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy +++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy @@ -1,22 +1,22 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.onap.so.bpmn.common.scripts @@ -33,22 +33,21 @@ import static org.mockito.Mockito.* import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity import static org.junit.Assert.*; import org.junit.Test; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; class DecomposeServiceTest { - + @Test public void testDecomposeService() { - + String catalogDbResponse = FileUtil.readResourceFile("__files/decomposition/catalogDbResponse.json"); - + ServiceDecomposition serviceDecomposition = new ServiceDecomposition(); ServiceInstance serviceInstance = new ServiceInstance(); serviceInstance.setInstanceId("serviceInstanceID"); serviceDecomposition.setServiceType(""); serviceDecomposition.setServiceRole(""); - + ArrayList networkResources = new ArrayList(); NetworkResource networkResource = new NetworkResource(); networkResource.setNetworkType("testNetworkType"); @@ -64,13 +63,13 @@ class DecomposeServiceTest { modelInfo.setModelCustomizationUuid("testModelCustomizationUuid"); modelInfo.setModelInstanceName("testModelInstanceName"); networkResource.setModelInfo(modelInfo); - + networkResources.add(networkResource); serviceDecomposition.setNetworkResources(networkResources) serviceDecomposition.setServiceInstance(serviceInstance); - + ServiceDecomposition serviceDecompositionExtracted = DecomposeJsonUtil.jsonToServiceDecomposition(catalogDbResponse, "serviceInstanceID") - - assertThat(serviceDecompositionExtracted, sameBeanAs(serviceDecomposition).ignoring("modelInfo").ignoring("vnfResources").ignoring("allottedResources").ignoring("networkResources.resourceId")); + + assertThat(serviceDecompositionExtracted).usingRecursiveComparison().ignoringFields("modelInfo", "vnfResources", "allottedResources", "networkResources.resourceId").isEqualTo(serviceDecomposition); } } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java index 18bb420541..334fbd7382 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java @@ -20,9 +20,7 @@ package org.onap.so.bpmn.servicedecomposition.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.CoreMatchers.equalTo; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -93,61 +91,60 @@ public class BBInputSetupMapperLayerTest { private static final String RESOURCE_PATH = "src/test/resources/__files/ExecuteBuildingBlock/"; - @Test public void testMapOrchestrationStatusFromAAI() { OrchestrationStatus expected = OrchestrationStatus.INVENTORIED; String orchStatusInput = "Inventoried"; OrchestrationStatus actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.ASSIGNED; orchStatusInput = "Assigned"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.ACTIVE; orchStatusInput = "Active"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.CREATED; orchStatusInput = "Created"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.PRECREATED; orchStatusInput = "PreCreated"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.PENDING_CREATE; orchStatusInput = "PendingCreate"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.PENDING_DELETE; orchStatusInput = "PendingDelete"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.PENDING; orchStatusInput = "Pending"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); expected = OrchestrationStatus.PENDING_ACTIVATION; orchStatusInput = "PendingActivation"; actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test public void testMapOrchestrationFuzzyCases() { List values = Arrays.asList("pending-create", "pending_Create", "pendinggcreate", "PendingCreate"); values.forEach(value -> { - assertThat(bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(value), - equalTo(OrchestrationStatus.PENDING_CREATE)); + assertThat(bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(value)) + .isEqualTo(OrchestrationStatus.PENDING_CREATE); }); } @@ -160,7 +157,7 @@ public class BBInputSetupMapperLayerTest { Customer actual = bbInputSetupMapperLayer.mapAAICustomer(customerAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -174,7 +171,7 @@ public class BBInputSetupMapperLayerTest { ServiceSubscription actual = bbInputSetupMapperLayer.mapAAIServiceSubscription(svcSubscriptionAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -186,7 +183,7 @@ public class BBInputSetupMapperLayerTest { Project actual = bbInputSetupMapperLayer.mapAAIProject(projectAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -198,7 +195,7 @@ public class BBInputSetupMapperLayerTest { Project actual = bbInputSetupMapperLayer.mapRequestProject(requestProject); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -211,7 +208,7 @@ public class BBInputSetupMapperLayerTest { OwningEntity actual = bbInputSetupMapperLayer.mapAAIOwningEntity(entityAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -225,7 +222,7 @@ public class BBInputSetupMapperLayerTest { OwningEntity actual = bbInputSetupMapperLayer.mapRequestOwningEntity(requestOwningEntity); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -237,7 +234,7 @@ public class BBInputSetupMapperLayerTest { Platform actual = bbInputSetupMapperLayer.mapAAIPlatform(platformAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -250,7 +247,7 @@ public class BBInputSetupMapperLayerTest { LineOfBusiness actual = bbInputSetupMapperLayer.mapAAILineOfBusiness(lobAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -266,7 +263,7 @@ public class BBInputSetupMapperLayerTest { NetworkPolicy actualNetworkPolicy = bbInputSetupMapperLayer.mapAAINetworkPolicy(aaiNetworkPolicy); - assertThat(actualNetworkPolicy, sameBeanAs(expectedNetworkPolicy)); + assertThat(actualNetworkPolicy).usingRecursiveComparison().isEqualTo(expectedNetworkPolicy); } @Test @@ -279,7 +276,7 @@ public class BBInputSetupMapperLayerTest { VolumeGroup actualVolumeGroup = bbInputSetupMapperLayer.mapAAIVolumeGroup(aaiVolumeGroup); - assertThat(actualVolumeGroup, sameBeanAs(expectedVolumeGroup)); + assertThat(actualVolumeGroup).usingRecursiveComparison().isEqualTo(expectedVolumeGroup); } @Test @@ -291,7 +288,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoServiceInstance actual = bbInputSetupMapperLayer.mapCatalogServiceIntoServiceInstance(catalogService); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -313,7 +310,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoInstanceGroup actual = bbInputSetupMapperLayer.mapCatalogInstanceGroupToInstanceGroup(collectionResourceCust, instanceGroup); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -343,7 +340,7 @@ public class BBInputSetupMapperLayerTest { NetworkResourceCustomization actual = bbInputSetupMapperLayer .mapCollectionNetworkResourceCustToNetworkResourceCust(collectionNetworkResourceCust); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -361,7 +358,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoCollection actual = bbInputSetupMapperLayer.mapCatalogCollectionToCollection(collectionCust, collectionResource); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -375,7 +372,7 @@ public class BBInputSetupMapperLayerTest { ServiceInstance actual = bbInputSetupMapperLayer.mapAAIServiceInstanceIntoServiceInstance(serviceInstanceAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -396,7 +393,7 @@ public class BBInputSetupMapperLayerTest { bbInputSetupMapperLayer.setPlatformAndLOBIntoServiceInstance(platformMSO, lineOfBusinessMSO, actual, resourcesToBeOrchestrated); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -410,7 +407,7 @@ public class BBInputSetupMapperLayerTest { L3Network actual = bbInputSetupMapperLayer.mapAAIL3Network(aaiL3Network); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -421,7 +418,7 @@ public class BBInputSetupMapperLayerTest { GenericVnf actual = bbInputSetupMapperLayer.mapAAIGenericVnfIntoGenericVnf(aaiGenericVnf); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -432,7 +429,7 @@ public class BBInputSetupMapperLayerTest { Pnf actual = bbInputSetupMapperLayer.mapAAIPnfIntoPnf(aaiPnf); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -445,7 +442,7 @@ public class BBInputSetupMapperLayerTest { Collection actualCollection = bbInputSetupMapperLayer.mapAAICollectionIntoCollection(aaiCollection); - assertThat(actualCollection, sameBeanAs(expectedCollection)); + assertThat(actualCollection).usingRecursiveComparison().isEqualTo(expectedCollection); } @Test @@ -460,7 +457,7 @@ public class BBInputSetupMapperLayerTest { org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup actualInstanceGroup = bbInputSetupMapperLayer.mapAAIInstanceGroupIntoInstanceGroup(aaiInstanceGroup); - assertThat(actualInstanceGroup, sameBeanAs(expectedInstanceGroup)); + assertThat(actualInstanceGroup).usingRecursiveComparison().isEqualTo(expectedInstanceGroup); } @Test @@ -475,7 +472,7 @@ public class BBInputSetupMapperLayerTest { RouteTableReference actualRouteTableReference = bbInputSetupMapperLayer.mapAAIRouteTableReferenceIntoRouteTableReference(aaiRouteTableReference); - assertThat(actualRouteTableReference, sameBeanAs(expectedRouteTableReference)); + assertThat(actualRouteTableReference).usingRecursiveComparison().isEqualTo(expectedRouteTableReference); } @Test @@ -489,7 +486,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoNetwork actualModelInfoNetwork = bbInputSetupMapperLayer.mapCatalogNetworkToNetwork(networkResourceCustomization); - assertThat(actualModelInfoNetwork, sameBeanAs(expectedModelInfoNetwork)); + assertThat(actualModelInfoNetwork).usingRecursiveComparison().isEqualTo(expectedModelInfoNetwork); } @Test @@ -503,7 +500,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoGenericVnf actualModelInfoGenericVnf = bbInputSetupMapperLayer.mapCatalogVnfToVnf(vnfResourceCustomization); - assertThat(actualModelInfoGenericVnf, sameBeanAs(expectedModelInfoGenericVnf)); + assertThat(actualModelInfoGenericVnf).usingRecursiveComparison().isEqualTo(expectedModelInfoGenericVnf); } @Test @@ -523,7 +520,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoPnf actualModelInfoPnf = bbInputSetupMapperLayer.mapCatalogPnfToPnf(pnfResourceCustomization); - assertThat(actualModelInfoPnf, sameBeanAs(expectedModelInfoPnf)); + assertThat(actualModelInfoPnf).usingRecursiveComparison().isEqualTo(expectedModelInfoPnf); } @Test @@ -537,7 +534,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoVfModule actualModelInfoVfModule = bbInputSetupMapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization); - assertThat(actualModelInfoVfModule, sameBeanAs(expectedModelInfoVfModule)); + assertThat(actualModelInfoVfModule).usingRecursiveComparison().isEqualTo(expectedModelInfoVfModule); } @Test @@ -549,7 +546,7 @@ public class BBInputSetupMapperLayerTest { Platform actualPlatform = bbInputSetupMapperLayer.mapRequestPlatform(platform); - assertThat(actualPlatform, sameBeanAs(expectedPlatform)); + assertThat(actualPlatform).usingRecursiveComparison().isEqualTo(expectedPlatform); } @Test @@ -563,7 +560,7 @@ public class BBInputSetupMapperLayerTest { LineOfBusiness actualLineOfBusiness = bbInputSetupMapperLayer.mapRequestLineOfBusiness(lineOfBusiness); - assertThat(actualLineOfBusiness, sameBeanAs(expectedLineOfBusiness)); + assertThat(actualLineOfBusiness).usingRecursiveComparison().isEqualTo(expectedLineOfBusiness); } @Test @@ -576,7 +573,7 @@ public class BBInputSetupMapperLayerTest { Configuration actualConfiguration = bbInputSetupMapperLayer.mapAAIConfiguration(configurationAAI); - assertThat(actualConfiguration, sameBeanAs(expectedConfiguration)); + assertThat(actualConfiguration).usingRecursiveComparison().isEqualTo(expectedConfiguration); } @Test @@ -588,7 +585,7 @@ public class BBInputSetupMapperLayerTest { .readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class); RequestContext actual = bbInputSetupMapperLayer.mapRequestContext(requestDetails); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -601,7 +598,7 @@ public class BBInputSetupMapperLayerTest { OrchestrationContext actual = bbInputSetupMapperLayer.mapOrchestrationContext(requestDetails); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -614,7 +611,7 @@ public class BBInputSetupMapperLayerTest { OrchestrationContext actual = bbInputSetupMapperLayer.mapOrchestrationContext(requestDetails); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -635,7 +632,7 @@ public class BBInputSetupMapperLayerTest { CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -658,7 +655,7 @@ public class BBInputSetupMapperLayerTest { CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -675,7 +672,7 @@ public class BBInputSetupMapperLayerTest { Tenant actual = bbInputSetupMapperLayer.mapTenant(aaiTenant); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -684,7 +681,7 @@ public class BBInputSetupMapperLayerTest { CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(null, null); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -712,7 +709,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoConfiguration actual = bbInputSetupMapperLayer .mapCatalogConfigurationToConfiguration(configurationResourceCustomization, policyNameTable); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -741,7 +738,7 @@ public class BBInputSetupMapperLayerTest { ModelInfoConfiguration actual = bbInputSetupMapperLayer.mapCatalogConfigurationToConfiguration(fabricCustomization); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java index 811187277c..58bc11b813 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java @@ -24,8 +24,7 @@ package org.onap.so.bpmn.servicedecomposition.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -218,7 +217,7 @@ public class BBInputSetupTest { ServiceInstance actual = SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test(expected = Exception.class) @@ -252,7 +251,7 @@ public class BBInputSetupTest { ServiceInstance actual = SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -276,12 +275,11 @@ public class BBInputSetupTest { Customer actual = this.SPY_bbInputSetup.getCustomerAndServiceSubscription(requestDetails, resourceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); requestDetails.setSubscriberInfo(null); - - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @@ -304,7 +302,7 @@ public class BBInputSetupTest { actual.getCustomer().getServiceSubscription().getServiceInstances().get(0).getVnfs().add(genericVnfActual); SPY_bbInputSetup.setHomingFlag(actual, homing, lookupKeyMap); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -315,7 +313,7 @@ public class BBInputSetupTest { DelegateExecution execution = Mockito.mock(DelegateExecution.class); doReturn(expected).when(execution).getVariable(any(String.class)); ExecuteBuildingBlock actual = SPY_bbInputSetup.getExecuteBBFromExecution(execution); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -343,7 +341,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBB(executeBB, lookupKeyMap, requestAction, aLaCarte, resourceId, null); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -376,7 +374,7 @@ public class BBInputSetupTest { .mapAAIGenericVnfIntoGenericVnf(ArgumentMatchers.isA(org.onap.aai.domain.yang.GenericVnf.class)); GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBCM(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -422,7 +420,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBCM(executeBB, requestDetails, lookupKeyMap, requestAction, instanceGroupId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -455,7 +453,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -495,7 +493,7 @@ public class BBInputSetupTest { verify(SPY_bbInputSetupUtils, times(1)).getCatalogServiceByModelUUID(aaiServiceInstance.getModelVersionId()); verify(SPY_bbInputSetupUtils, times(1)).getCatalogServiceByModelUUID("modelUUID"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -578,7 +576,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -623,7 +621,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -670,7 +668,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -710,7 +708,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -731,13 +729,12 @@ public class BBInputSetupTest { doReturn(null).when(SPY_bbInputSetupUtils).getAAIServiceInstanceByName(requestInfo.getInstanceName(), customer); doReturn(null).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId); - doReturn(expected).when(SPY_bbInputSetup).createServiceInstance(requestDetails, null, null, lookupKeyMap, serviceInstanceId); ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -763,7 +760,7 @@ public class BBInputSetupTest { ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -788,7 +785,7 @@ public class BBInputSetupTest { ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -811,10 +808,9 @@ public class BBInputSetupTest { doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId); - ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null, lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -834,7 +830,7 @@ public class BBInputSetupTest { Mockito.any(), Mockito.any()); ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null, new HashMap<>(), "SharansInstanceId", false, new Service(), "ActivateServiceInstanceBB"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test(expected = Exception.class) @@ -1009,7 +1005,7 @@ public class BBInputSetupTest { .setRequestDetails(requestDetails).setExecuteBB(executeBB).setRequestAction(requestAction).build(); GeneralBuildingBlock actual = SPY_bbInputSetup.populateGBBWithSIAndAdditionalInfo(parameter); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -1045,7 +1041,7 @@ public class BBInputSetupTest { SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, project, owningEntity, lookupKeyMap, serviceInstanceId, aLaCarte, executeBB.getBuildingBlock().getBpmnFlowName()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -1064,7 +1060,7 @@ public class BBInputSetupTest { doReturn(expected).when(bbInputSetupMapperLayer).mapAAIServiceSubscription(aaiServiceSubscription); ServiceSubscription actual = SPY_bbInputSetup.getServiceSubscription(requestDetails, customer); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -1080,7 +1076,7 @@ public class BBInputSetupTest { doReturn(expected).when(bbInputSetupMapperLayer).mapAAICustomer(aaiCustomer); Customer actual = SPY_bbInputSetup.getCustomerFromRequest(requestDetails); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -1090,9 +1086,8 @@ public class BBInputSetupTest { doReturn(expected).when(bbInputSetupMapperLayer).mapAAIServiceInstanceIntoServiceInstance(serviceInstanceAAI); - ServiceInstance actual = SPY_bbInputSetup.getExistingServiceInstance(serviceInstanceAAI); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -1518,7 +1513,6 @@ public class BBInputSetupTest { lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "genericVnfId"); String bbName = AssignFlows.VNF.toString(); - ServiceModel serviceModel = new ServiceModel(); serviceModel.setCurrentService(service); @@ -1807,8 +1801,9 @@ public class BBInputSetupTest { SPY_bbInputSetup.mapCatalogNetworkCollectionInstanceGroup(service, serviceInstance.getCollection().getInstanceGroup(), collectionCust.getModelCustomizationUUID()); - assertThat(collection.getModelInfoCollection(), sameBeanAs(modelInfoCollection)); - assertThat(instanceGroup.getModelInfoInstanceGroup(), sameBeanAs(modelInfoInstanceGroup)); + assertThat(collection.getModelInfoCollection()).usingRecursiveComparison().isEqualTo(modelInfoCollection); + assertThat(instanceGroup.getModelInfoInstanceGroup()).usingRecursiveComparison() + .isEqualTo(modelInfoInstanceGroup); } @Test @@ -1826,7 +1821,6 @@ public class BBInputSetupTest { uriKeys.put("global-customer-id", "globalCustomerId"); uriKeys.put("service-type", "serviceType"); - doNothing().when(SPY_bbInputSetup).mapProject(any(), eq(serviceInstance)); doNothing().when(SPY_bbInputSetup).mapOwningEntity(any(), eq(serviceInstance)); doNothing().when(SPY_bbInputSetup).mapL3Networks(any(), eq(serviceInstance.getNetworks())); @@ -2176,7 +2170,7 @@ public class BBInputSetupTest { SPY_bbInputSetup.populateLookupKeyMapWithIds(workflowResourceIds, actual); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -2307,7 +2301,7 @@ public class BBInputSetupTest { service.setServiceProxyCustomizations(new ArrayList()); service.getServiceProxyCustomizations().add(serviceProxyCatalog); ServiceProxy actual = SPY_bbInputSetup.getServiceProxy(service); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -2419,7 +2413,7 @@ public class BBInputSetupTest { GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType); - assertThat(actual, sameBeanAs(gBB)); + assertThat(actual).usingRecursiveComparison().isEqualTo(gBB); } @Test @@ -3071,12 +3065,12 @@ public class BBInputSetupTest { VfModule actual = SPY_bbInputSetup.createVfModule(lookupKeyMap, vfModuleId, instanceName, instanceParams); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); assertEquals("LookupKeyMap is populated", vfModuleId, lookupKeyMap.get(ResourceKey.VF_MODULE_ID)); expected.getCloudParams().clear(); actual = SPY_bbInputSetup.createVfModule(lookupKeyMap, vfModuleId, instanceName, null); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -3099,12 +3093,12 @@ public class BBInputSetupTest { VolumeGroup actual = SPY_bbInputSetup.createVolumeGroup(lookupKeyMap, volumeGroupId, instanceName, vnfType, instanceParams); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); assertEquals("LookupKeyMap is populated", volumeGroupId, lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID)); expected.getCloudParams().clear(); actual = SPY_bbInputSetup.createVolumeGroup(lookupKeyMap, volumeGroupId, instanceName, vnfType, null); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -3137,13 +3131,13 @@ public class BBInputSetupTest { L3Network actual = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, networkId, instanceParams, parameter); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); assertEquals("LookupKeyMap is populated", networkId, lookupKeyMap.get(ResourceKey.NETWORK_ID)); expected.getCloudParams().clear(); actual = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, networkId, null, parameter); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -3187,13 +3181,13 @@ public class BBInputSetupTest { GenericVnf actual = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, requestPlatform, requestLineOfBusiness, vnfId, vnfType, instanceParams, productFamilyId, applicationId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); assertEquals("LookupKeyMap is populated", vnfId, lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID)); expected.getCloudParams().clear(); actual = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, requestPlatform, requestLineOfBusiness, vnfId, vnfType, null, productFamilyId, applicationId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -3216,14 +3210,14 @@ public class BBInputSetupTest { SPY_bbInputSetup.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID); - assertThat(vfModule.getModelInfoVfModule(), sameBeanAs(modelInfoVfModule)); + assertThat(vfModule.getModelInfoVfModule()).usingRecursiveComparison().isEqualTo(modelInfoVfModule); modelInfo.setModelCustomizationUuid(null); modelInfo.setModelCustomizationId(vfModuleCustomizationUUID); SPY_bbInputSetup.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID); - assertThat(vfModule.getModelInfoVfModule(), sameBeanAs(modelInfoVfModule)); + assertThat(vfModule.getModelInfoVfModule()).usingRecursiveComparison().isEqualTo(modelInfoVfModule); } @Test @@ -3245,7 +3239,7 @@ public class BBInputSetupTest { SPY_bbInputSetup.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID); - assertThat(vfModule.getModelInfoVfModule(), sameBeanAs(modelInfoVfModule)); + assertThat(vfModule.getModelInfoVfModule()).usingRecursiveComparison().isEqualTo(modelInfoVfModule); verify(SPY_bbInputSetupUtils, times(1)) .getVfModuleCustomizationByModelCuztomizationUUID(modelInfo.getModelCustomizationId()); @@ -3467,7 +3461,6 @@ public class BBInputSetupTest { .setInstanceName(instanceName).setInstanceParams(instanceParams) .setCloudConfiguration(cloudConfiguration).setIsReplace(true).setServiceModel(serviceModel).build(); - SPY_bbInputSetup.populateVfModule(parameter); verify(SPY_bbInputSetup, times(2)).mapCatalogVfModule(isA(VfModule.class), isA(ModelInfo.class), diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java index e96aacb126..87e9ec58e0 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java @@ -22,8 +22,7 @@ package org.onap.so.bpmn.servicedecomposition.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -127,7 +126,8 @@ public class BBInputSetupUtilsTest { doReturn(expected).when(MOCK_catalogDbClient).getServiceByID(modelUUID); - assertThat(bbInputSetupUtils.getCatalogServiceByModelUUID(modelUUID), sameBeanAs(expected)); + assertThat(bbInputSetupUtils.getCatalogServiceByModelUUID(modelUUID)).usingRecursiveComparison() + .isEqualTo(expected); } @Test @@ -141,7 +141,7 @@ public class BBInputSetupUtilsTest { modelInvariantUUID); assertThat(bbInputSetupUtils.getCatalogServiceByModelVersionAndModelInvariantUUID(modelVersion, - modelInvariantUUID), sameBeanAs(expectedService)); + modelInvariantUUID)).usingRecursiveComparison().isEqualTo(expectedService); } @Test @@ -153,7 +153,8 @@ public class BBInputSetupUtilsTest { doReturn(Arrays.asList(vnfc)).when(MOCK_catalogDbClient) .getVnfcInstanceGroupsByVnfResourceCust(modelCustomizationUUID); - assertThat(bbInputSetupUtils.getVnfcInstanceGroups(modelCustomizationUUID), sameBeanAs(Arrays.asList(vnfc))); + assertThat(bbInputSetupUtils.getVnfcInstanceGroups(modelCustomizationUUID)).usingRecursiveComparison() + .isEqualTo(Arrays.asList(vnfc)); } @Test @@ -166,7 +167,7 @@ public class BBInputSetupUtilsTest { doReturn(infraActiveRequest).when(MOCK_requestsDbClient).getInfraActiveRequestbyRequestId(requestId); - assertThat(bbInputSetupUtils.getRequestDetails(requestId), sameBeanAs(expected)); + assertThat(bbInputSetupUtils.getRequestDetails(requestId)).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -186,7 +187,7 @@ public class BBInputSetupUtilsTest { .cloudRegion(cloudConfig.getCloudOwner(), cloudConfig.getLcpCloudRegionId())) .depth(Depth.ONE).nodesOnly(true)); - assertThat(bbInputSetupUtils.getCloudRegion(cloudConfig), sameBeanAs(expected.get())); + assertThat(bbInputSetupUtils.getCloudRegion(cloudConfig)).usingRecursiveComparison().isEqualTo(expected.get()); } @Test @@ -214,7 +215,8 @@ public class BBInputSetupUtilsTest { doReturn(expected).when(MOCK_aaiResourcesClient).get(InstanceGroup.class, AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().instanceGroup(instanceGroupId))); - assertThat(bbInputSetupUtils.getAAIInstanceGroup(instanceGroupId), sameBeanAs(expected.get())); + assertThat(bbInputSetupUtils.getAAIInstanceGroup(instanceGroupId)).usingRecursiveComparison() + .isEqualTo(expected.get()); } @Test @@ -231,7 +233,8 @@ public class BBInputSetupUtilsTest { doReturn(expected).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.Customer.class, AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business().customer(globalSubscriberId))); - assertThat(bbInputSetupUtils.getAAICustomer(globalSubscriberId), sameBeanAs(expected.get())); + assertThat(bbInputSetupUtils.getAAICustomer(globalSubscriberId)).usingRecursiveComparison() + .isEqualTo(expected.get()); } @Test @@ -251,8 +254,8 @@ public class BBInputSetupUtilsTest { AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business().customer(globalSubscriberId) .serviceSubscription(subscriptionServiceType))); - assertThat(bbInputSetupUtils.getAAIServiceSubscription(globalSubscriberId, subscriptionServiceType), - sameBeanAs(expected.get())); + assertThat(bbInputSetupUtils.getAAIServiceSubscription(globalSubscriberId, subscriptionServiceType)) + .usingRecursiveComparison().isEqualTo(expected.get()); } @Test @@ -271,7 +274,8 @@ public class BBInputSetupUtilsTest { doReturn(Optional.of(expectedServiceInstance)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class)); - assertThat(bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId), sameBeanAs(expectedServiceInstance)); + assertThat(bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId)).usingRecursiveComparison() + .isEqualTo(expectedServiceInstance); } @Test @@ -298,7 +302,7 @@ public class BBInputSetupUtilsTest { .depth(Depth.TWO)); assertThat(bbInputSetupUtils.getAAIServiceInstanceByIdAndCustomer(globalCustomerId, serviceType, - serviceInstanceId), sameBeanAs(expected)); + serviceInstanceId)).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -348,7 +352,7 @@ public class BBInputSetupUtilsTest { public void getOptionalAAIServiceInstanceByNameNullTest() { Optional actual = bbInputSetupUtils.getAAIServiceInstanceByName("", "", ""); - assertThat(actual, sameBeanAs(Optional.empty())); + assertThat(actual).usingRecursiveComparison().isEqualTo(Optional.empty()); } @Test @@ -364,7 +368,8 @@ public class BBInputSetupUtilsTest { doReturn(expectedInstanceGroup).when(MOCK_catalogDbClient).getInstanceGroupByModelUUID(modelUUID); - assertThat(bbInputSetupUtils.getCatalogInstanceGroup(modelUUID), sameBeanAs(expectedInstanceGroup)); + assertThat(bbInputSetupUtils.getCatalogInstanceGroup(modelUUID)).usingRecursiveComparison() + .isEqualTo(expectedInstanceGroup); } @Test @@ -376,8 +381,8 @@ public class BBInputSetupUtilsTest { doReturn(Arrays.asList(expectedCollection)).when(MOCK_catalogDbClient) .getCollectionResourceInstanceGroupCustomizationByModelCustUUID(modelCustomizationUUID); - assertThat(bbInputSetupUtils.getCollectionResourceInstanceGroupCustomization(modelCustomizationUUID), - sameBeanAs(Arrays.asList(expectedCollection))); + assertThat(bbInputSetupUtils.getCollectionResourceInstanceGroupCustomization(modelCustomizationUUID)) + .usingRecursiveComparison().isEqualTo(Arrays.asList(expectedCollection)); } @Test @@ -394,7 +399,8 @@ public class BBInputSetupUtilsTest { doReturn(Optional.of(expectedAaiConfiguration)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class)); - assertThat(bbInputSetupUtils.getAAIConfiguration(configurationId), sameBeanAs(expectedAaiConfiguration)); + assertThat(bbInputSetupUtils.getAAIConfiguration(configurationId)).usingRecursiveComparison() + .isEqualTo(expectedAaiConfiguration); } @Test @@ -411,7 +417,7 @@ public class BBInputSetupUtilsTest { doReturn(Optional.of(expectedAaiVnf)).when(MOCK_aaiResourcesClient).get(isA(Class.class), eq(AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId)).depth(Depth.ONE))); - assertThat(bbInputSetupUtils.getAAIGenericVnf(vnfId), sameBeanAs(expectedAaiVnf)); + assertThat(bbInputSetupUtils.getAAIGenericVnf(vnfId)).usingRecursiveComparison().isEqualTo(expectedAaiVnf); } @Test diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/CloudInfoFromAAITest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/CloudInfoFromAAITest.java index 5443ef3b83..59f43f9fa8 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/CloudInfoFromAAITest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/CloudInfoFromAAITest.java @@ -20,8 +20,7 @@ package org.onap.so.bpmn.servicedecomposition.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; @@ -85,7 +84,7 @@ public class CloudInfoFromAAITest { doReturn(relationshipsOp).when(SPY_CloudInfoFromAAI).getRelationshipsFromWrapper(isA(AAIResultWrapper.class)); doReturn(Optional.of(expected)).when(SPY_CloudInfoFromAAI).getRelatedCloudRegionAndTenant(relationships); Optional actual = SPY_CloudInfoFromAAI.getCloudInfoFromAAI(serviceInstance); - assertThat(actual.get(), sameBeanAs(expected)); + assertThat(actual.get()).usingRecursiveComparison().isEqualTo(expected); // Test networks serviceInstance = @@ -99,7 +98,7 @@ public class CloudInfoFromAAITest { aaiL3Network.setNetworkId(networkId); doReturn(aaiL3Network).when(SPY_bbInputSetupUtils).getAAIL3Network(l3Network.getNetworkId()); actual = SPY_CloudInfoFromAAI.getCloudInfoFromAAI(serviceInstance); - assertThat(actual.get(), sameBeanAs(expected)); + assertThat(actual.get()).usingRecursiveComparison().isEqualTo(expected); // Test no relationships @@ -151,6 +150,6 @@ public class CloudInfoFromAAITest { Optional actual = SPY_CloudInfoFromAAI.getRelatedCloudRegionAndTenant(relationships); - assertThat(actual.get(), sameBeanAs(expected)); + assertThat(actual.get()).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java index 2df840f2fa..5733bb2fa5 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.dmaapproperties; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; @@ -42,7 +41,6 @@ public class DmaapPropertiesClientTest extends BaseTest { @Autowired private DmaapPropertiesClient dmaapPropertiesClient; - private final String file = "src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json"; private String requestId = "rq1234d1-5a33-55df-13ab-12abad84e331"; private String clientSource = "SPP"; @@ -66,7 +64,7 @@ public class DmaapPropertiesClientTest extends BaseTest { AVPNDmaapBean expected = new ObjectMapper().readValue(new File(file), AVPNDmaapBean.class); assertNotNull(actualBean); - assertThat(actualBean, sameBeanAs(expected)); + assertThat(actualBean).usingRecursiveComparison().isEqualTo(expected); } @Test diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java index cfb2adafe1..307d8c70cf 100644 --- a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java +++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/ServiceDecompositionTest.java @@ -14,8 +14,7 @@ */ package org.onap.so.bpmn.core.domain; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -51,7 +50,6 @@ public class ServiceDecompositionTest { configResource.setResourceId("configResourceId"); } - @Test public void serviceDecompositionWithGroupandVnfc() throws IOException { String sericeStr = new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "ServiceWithGroupandVnfc.json"))); @@ -79,10 +77,14 @@ public class ServiceDecompositionTest { serviceDecomp.addAllottedResource(allottedResource); serviceDecomp.addConfigResource(configResource); - assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId()), sameBeanAs(vnfResource)); - assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId()), sameBeanAs(networkResource)); - assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId()), sameBeanAs(allottedResource)); - assertThat(serviceDecomp.getServiceResource(configResource.getResourceId()), sameBeanAs(configResource)); + assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(vnfResource); + assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(networkResource); + assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(allottedResource); + assertThat(serviceDecomp.getServiceResource(configResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(configResource); VnfResource vnfResourceReplace = new VnfResource(); vnfResourceReplace.setResourceId(vnfResource.getResourceId()); @@ -116,10 +118,14 @@ public class ServiceDecompositionTest { System.out.println(serviceDecomp.toJsonString()); - assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId()), sameBeanAs(vnfResource)); - assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId()), sameBeanAs(networkResource)); - assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId()), sameBeanAs(allottedResource)); - assertThat(serviceDecomp.getServiceResource(configResource.getResourceId()), sameBeanAs(configResource)); + assertThat(serviceDecomp.getServiceResource(vnfResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(vnfResource); + assertThat(serviceDecomp.getServiceResource(networkResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(networkResource); + assertThat(serviceDecomp.getServiceResource(allottedResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(allottedResource); + assertThat(serviceDecomp.getServiceResource(configResource.getResourceId())).usingRecursiveComparison() + .isEqualTo(configResource); serviceDecomp = new ServiceDecomposition(catalogRestOutput, "serviceInstanceId"); serviceDecomp.addVnfResource(vnfResourceJson); @@ -130,7 +136,7 @@ public class ServiceDecompositionTest { ServiceDecomposition expectedServiceDecomp = new ServiceDecomposition(expectedCatalogRestOutput, "serviceInstanceId"); - assertThat(serviceDecomp, sameBeanAs(expectedServiceDecomp)); + assertThat(serviceDecomp).usingRecursiveComparison().isEqualTo(expectedServiceDecomp); assertEquals( serviceDecomp.listToJson(Arrays.asList(networkResource)) + serviceDecomp.listToJson(Arrays.asList(vnfResource)) diff --git a/bpmn/pom.xml b/bpmn/pom.xml index a52f082d65..2754cbd4a7 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -54,7 +54,7 @@ org.assertj assertj-core - 3.11.1 + 3.16.0 test diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCompareServiceInstanceDataTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCompareServiceInstanceDataTest.groovy index 715a7dff6d..3f8f7cf697 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCompareServiceInstanceDataTest.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCompareServiceInstanceDataTest.groovy @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,8 +32,7 @@ import org.onap.so.bpmn.common.scripts.MsoGroovyTest import org.onap.so.bpmn.core.domain.Resource import org.onap.so.bpmn.core.domain.ServiceDecomposition -import static com.shazam.shazamcrest.MatcherAssert.assertThat -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs +import static org.assertj.core.api.Assertions.assertThat import static org.mockito.Mockito.times import static org.mockito.Mockito.when /** @@ -258,7 +257,7 @@ class DoCompareServiceInstanceDataTest extends MsoGroovyTest { csi.prepareDecomposeService_Original(mockExecution) Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture()) String serviceModelInfo = getServiceModelInfo() - assertThat(captor.getValue(), sameBeanAs(serviceModelInfo)) + assertThat(captor.getValue()).usingRecursiveComparison().isEqualTo(serviceModelInfo) } @Test @@ -268,7 +267,7 @@ class DoCompareServiceInstanceDataTest extends MsoGroovyTest { csi.processDecomposition_Original(mockExecution) Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture()) ServiceDecomposition serviceDecomposition = getServiceDecomposition() - assertThat(captor.getValue(), sameBeanAs(serviceDecomposition)) + assertThat(captor.getValue()).usingRecursiveComparison().isEqualTo(serviceDecomposition) } @Test diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateCommunicationServiceTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateCommunicationServiceTest.groovy index 12783ae047..7b125e7f84 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateCommunicationServiceTest.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateCommunicationServiceTest.groovy @@ -32,8 +32,7 @@ import org.onap.aai.domain.yang.ServiceInstance import org.onap.so.bpmn.common.scripts.MsoGroovyTest import org.onap.aaiclient.client.aai.AAIResourcesClient -import static com.shazam.shazamcrest.MatcherAssert.assertThat -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs +import static org.assertj.core.api.Assertions.assertThat import static org.junit.Assert.assertEquals import static org.junit.Assert.assertNotNull import static org.mockito.ArgumentMatchers.eq @@ -78,7 +77,7 @@ class DoCreateCommunicationServiceTest extends MsoGroovyTest { ServiceInstance resData = captor.getValue() resData.setCreatedAt("") resData.setEnvironmentContext("") - assertThat(resData, sameBeanAs(expectedServiceInstanceData)) + assertThat(resData).usingRecursiveComparison().isEqualTo(expectedServiceInstanceData) } @Test @@ -97,7 +96,7 @@ class DoCreateCommunicationServiceTest extends MsoGroovyTest { Mockito.verify(mockExecution).setVariable(eq("communicationServiceInstanceProfile"), captor.capture()) CommunicationServiceProfile resData = captor.getValue() resData.setProfileId("") - assertThat(resData, sameBeanAs(expectedServiceInstanceData)) + assertThat(resData).usingRecursiveComparison().isEqualTo(expectedServiceInstanceData) } private static CommunicationServiceProfile getExpectedServiceInstanceProfile() { diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceTest.groovy index fc8bd0da8a..c905391432 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceTest.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceTest.groovy @@ -20,8 +20,7 @@ package org.onap.so.bpmn.infrastructure.scripts -import static com.shazam.shazamcrest.MatcherAssert.assertThat -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs +import static org.assertj.core.api.Assertions.assertThat import static org.mockito.Mockito.times import static org.mockito.Mockito.when @@ -54,7 +53,7 @@ class DoCreateE2EServiceInstanceTest extends MsoGroovyTest{ DoCreateE2EServiceInstance serviceInstance = new DoCreateE2EServiceInstance() serviceInstance.preProcessRequest(mockExecution) Mockito.verify(mockExecution, times(7)).setVariable(captor.capture(), captor.capture()) - assertThat(captor.getValue(), sameBeanAs(expectedServiceInstanceData)) + assertThat(captor.getValue()).usingRecursiveComparison().isEqualTo(expectedServiceInstanceData) } private ServiceInstance getExpectedServiceInstance() { diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceTest.groovy index 30df8eacc5..433399dd57 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceTest.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceTest.groovy @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,8 +29,7 @@ import org.mockito.Mockito import org.onap.aai.domain.yang.ServiceInstance import org.onap.so.bpmn.common.scripts.MsoGroovyTest -import static com.shazam.shazamcrest.MatcherAssert.assertThat -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs +import static org.assertj.core.api.Assertions.assertThat import static org.mockito.Mockito.times import static org.mockito.Mockito.when @@ -54,7 +53,7 @@ class DoUpdateE2EServiceInstanceTest extends MsoGroovyTest{ DoUpdateE2EServiceInstance serviceInstance = new DoUpdateE2EServiceInstance() serviceInstance.preProcessAAIPUT(mockExecution) Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture()) - assertThat(captor.getValue(), sameBeanAs(expectedServiceInstanceData)) + assertThat(captor.getValue()).usingRecursiveComparison().isEqualTo(expectedServiceInstanceData) } private ServiceInstance getExpectedServiceInstance() { diff --git a/bpmn/so-bpmn-moi/pom.xml b/bpmn/so-bpmn-moi/pom.xml index 705b396749..b449910a86 100644 --- a/bpmn/so-bpmn-moi/pom.xml +++ b/bpmn/so-bpmn-moi/pom.xml @@ -155,7 +155,7 @@ org.assertj assertj-core - 3.11.1 + 3.16.0 test diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java index cf97fa0b82..bce6c49f9e 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java @@ -1,7 +1,6 @@ package org.onap.so.bpmn.infrastructure.adapter.network.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import javax.xml.bind.JAXBException; import org.junit.Test; @@ -30,8 +29,8 @@ public class NetworkAdapterImplTest extends TestDataSetup { execution.setVariable("WorkflowResponse", RESPONSE); networkAdapterImpl.postProcessNetworkAdapter(execution); assertNotNull(execution.getVariable("createNetworkResponse")); - assertThat(networkAdapterImpl.unmarshalXml(RESPONSE, CreateNetworkResponse.class), - sameBeanAs(execution.getVariable("createNetworkResponse"))); + assertThat(networkAdapterImpl.unmarshalXml(RESPONSE, CreateNetworkResponse.class)).usingRecursiveComparison() + .isEqualTo(execution.getVariable("createNetworkResponse")); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessorTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessorTest.java index db8a2ec1c4..7deeedb21a 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessorTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessorTest.java @@ -22,8 +22,6 @@ package org.onap.so.bpmn.infrastructure.appc.tasks; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; @@ -90,7 +88,7 @@ public class AppcOrchestratorPreProcessorTest extends TestDataSetup { when(extractPojosForBB.extractByKey(eq(execution), eq(ResourceKey.VF_MODULE_ID))).thenReturn(vfModule); appcOrchestratorPreProcessor.buildAppcTaskRequest(execution, "Lock"); ApplicationControllerTaskRequest actualTaskRequest = execution.getVariable("appcOrchestratorRequest"); - assertThat(actualTaskRequest, sameBeanAs(expectedTaskRequest)); + assertThat(actualTaskRequest).usingRecursiveComparison().isEqualTo(expectedTaskRequest); } @Test @@ -195,7 +193,7 @@ public class AppcOrchestratorPreProcessorTest extends TestDataSetup { when(extractPojosForBB.extractByKey(eq(execution), eq(ResourceKey.VF_MODULE_ID))).thenReturn(vfModule); appcOrchestratorPreProcessor.buildAppcTaskRequest(execution, "ConfigModify"); ApplicationControllerTaskRequest actualTaskRequest = execution.getVariable("appcOrchestratorRequest"); - assertThat(actualTaskRequest, sameBeanAs(expectedTaskRequest)); + assertThat(actualTaskRequest).usingRecursiveComparison().isEqualTo(expectedTaskRequest); } private void fillRequiredAppcExecutionFieldsConfigModify() { diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CreateNetworkTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CreateNetworkTest.java index 7d8cba2bce..f89aa67dba 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CreateNetworkTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CreateNetworkTest.java @@ -19,8 +19,7 @@ */ package org.onap.so.bpmn.infrastructure.flowspecific.tasks; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; @@ -87,6 +86,7 @@ public class CreateNetworkTest extends BaseTaskTest { verify(networkAdapterObjectMapper, times(1)).createNetworkRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, network, userInput, cloudRegionPo, customer); - assertThat(expectedCreateNetworkRequest, sameBeanAs(execution.getVariable("createNetworkRequest"))); + assertThat(expectedCreateNetworkRequest).usingRecursiveComparison() + .isEqualTo(execution.getVariable("createNetworkRequest")); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java index 365a98d837..222fd2f234 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.bpmn.infrastructure.sdnc.mapper; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -63,7 +62,6 @@ import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule; import org.onap.so.client.exception.MapperException; import org.onap.so.client.sdnc.beans.SDNCSvcAction; - public class GeneralTopologyObjectMapperTest extends TestDataSetup { @InjectMocks private GeneralTopologyObjectMapper genObjMapper = new GeneralTopologyObjectMapper(); @@ -278,7 +276,8 @@ public class GeneralTopologyObjectMapperTest extends TestDataSetup { onapModelInformation.setModelCustomizationUuid("my-customization-uuid"); networkInformation.setOnapModelInformation(onapModelInformation); - assertThat(networkInformation, sameBeanAs(genObjMapper.buildNetworkInformation(network))); + assertThat(networkInformation).usingRecursiveComparison() + .isEqualTo(genObjMapper.buildNetworkInformation(network)); } @@ -297,12 +296,11 @@ public class GeneralTopologyObjectMapperTest extends TestDataSetup { networkInformation.networkTechnology("my-network-technology"); networkInformation.setFromPreload(null); - - assertThat(networkInformation, sameBeanAs(genObjMapper.buildNetworkInformation(network))); + assertThat(networkInformation).usingRecursiveComparison() + .isEqualTo(genObjMapper.buildNetworkInformation(network)); } - @Test public void buildVfModuleInformationTest_withNoModelIsFromPreload() { VfModule vfModule = new VfModule(); diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java index ce54dfc0f6..d1cb4ce477 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.bpmn.infrastructure.sdnc.mapper; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -136,8 +135,8 @@ public class NetworkTopologyOperationRequestMapperTest { omapper.readValue(getJson("genericResourceApiNetworkOperationInformation.json"), GenericResourceApiNetworkOperationInformation.class); - assertThat(networkSDNCrequest, sameBeanAs(reqMapper1).ignoring("sdncRequestHeader.svcRequestId") - .ignoring("requestInformation.requestId")); + assertThat(networkSDNCrequest).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("sdncRequestHeader.svcRequestId", "requestInformation.requestId").isEqualTo(reqMapper1); assertEquals("MsoRequestId", networkSDNCrequest.getRequestInformation().getRequestId()); } @@ -197,8 +196,9 @@ public class NetworkTopologyOperationRequestMapperTest { omapperUnassign.readValue(getJson("genericResourceApiNetworkOperationInformationUnAssign.json"), GenericResourceApiNetworkOperationInformation.class); - assertThat(reqMapperUnassign, sameBeanAs(networkSDNCrequestUnassign).ignoring("sdncRequestHeader.svcRequestId") - .ignoring("requestInformation.requestId")); + assertThat(reqMapperUnassign).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("sdncRequestHeader.svcRequestId", "requestInformation.requestId") + .isEqualTo(networkSDNCrequestUnassign); assertEquals("MsoRequestId", networkSDNCrequestUnassign.getRequestInformation().getRequestId()); } @@ -218,8 +218,9 @@ public class NetworkTopologyOperationRequestMapperTest { omapper.readValue(getJson("genericResourceApiNetworkOperationInformationNoNetworkName.json"), GenericResourceApiNetworkOperationInformation.class); - assertThat(reqMapper1, sameBeanAs(networkSDNCrequest).ignoring("sdncRequestHeader.svcRequestId") - .ignoring("requestInformation.requestId")); + assertThat(reqMapper1).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("sdncRequestHeader.svcRequestId", "requestInformation.requestId") + .isEqualTo(networkSDNCrequest); } /* diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java index 920f61794e..666c9910cf 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/ServiceTopologyOperationMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.bpmn.infrastructure.sdnc.mapper; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.nio.file.Files; @@ -96,7 +95,8 @@ public class ServiceTopologyOperationMapperTest { GenericResourceApiOnapmodelinformationOnapModelInformation reqMapper1 = omapper.readValue(jsonToCompare, GenericResourceApiOnapmodelinformationOnapModelInformation.class); - assertThat(reqMapper1, sameBeanAs(serviceOpInformation.getServiceInformation().getOnapModelInformation())); + assertThat(reqMapper1).usingRecursiveComparison() + .isEqualTo(serviceOpInformation.getServiceInformation().getOnapModelInformation()); assertEquals("MsoRequestId", serviceOpInformation.getRequestInformation().getRequestId()); assertNotNull(serviceOpInformationNullReqContext.getRequestInformation().getRequestId()); } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java index 88e94bea9e..01a50fa8fe 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.bpmn.infrastructure.sdnc.mapper; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -146,8 +145,8 @@ public class VfModuleTopologyOperationRequestMapperTest { GenericResourceApiVfModuleOperationInformation reqMapper1 = omapper.readValue(jsonToCompare, GenericResourceApiVfModuleOperationInformation.class); - assertThat(vfModuleSDNCrequest, sameBeanAs(reqMapper1).ignoring("sdncRequestHeader.svcRequestId") - .ignoring("requestInformation.requestId")); + assertThat(vfModuleSDNCrequest).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("sdncRequestHeader.svcRequestId", "requestInformation.requestId").isEqualTo(reqMapper1); assertEquals("MsoRequestId", vfModuleSDNCrequest.getRequestInformation().getRequestId()); } @@ -184,8 +183,8 @@ public class VfModuleTopologyOperationRequestMapperTest { GenericResourceApiVfModuleOperationInformation reqMapper1 = omapper.readValue(jsonToCompare, GenericResourceApiVfModuleOperationInformation.class); - assertThat(vfModuleSDNCrequest, sameBeanAs(reqMapper1).ignoring("sdncRequestHeader.svcRequestId") - .ignoring("requestInformation.requestId")); + assertThat(vfModuleSDNCrequest).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("sdncRequestHeader.svcRequestId", "requestInformation.requestId").isEqualTo(reqMapper1); assertEquals("MsoRequestId", vfModuleSDNCrequest.getRequestInformation().getRequestId()); } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoaderTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoaderTest.java index 5cdca49590..44d4f991cd 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoaderTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoaderTest.java @@ -22,6 +22,7 @@ package org.onap.so.bpmn.infrastructure.workflow.tasks.ebb.loader; +import static org.assertj.core.api.Assertions.assertThat; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.camunda.bpm.engine.delegate.DelegateExecution; @@ -67,8 +68,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -117,7 +116,6 @@ public class ServiceEBBLoaderTest extends BaseTaskTest { mockBbInputSetup, mock(ExceptionBuilder.class)); } - @Test public void getResourceListForServiceWithRequestActionAssignInstance() throws IOException, VrfBondingServiceException { @@ -258,7 +256,7 @@ public class ServiceEBBLoaderTest extends BaseTaskTest { serviceEBBLoader.traverseAAIService(execution, resourceCounter, resourceId, aaiResourceIds); assertEquals(8, resourceCounter.size()); assertTrue(resourceCounter.get(2).isBaseVfModule()); - assertThat(aaiResourceIds, sameBeanAs(getExpectedResourceIds())); + assertThat(aaiResourceIds).usingRecursiveComparison().isEqualTo(getExpectedResourceIds()); } catch (Exception e) { fail("Unexpected exception was thrown."); } @@ -292,7 +290,6 @@ public class ServiceEBBLoaderTest extends BaseTaskTest { RelatedInstance relatedLocalNetwork = new RelatedInstance(); relatedLocalNetwork.setInstanceId("localNetworkInstanceId"); - doReturn(aaiLocalNetwork).when(mockBbInputSetupUtils).getAAIL3Network("localNetworkInstanceId"); Resource serviceResource = new Resource(WorkflowType.SERVICE, "1", false, null); @@ -341,7 +338,6 @@ public class ServiceEBBLoaderTest extends BaseTaskTest { service.getCollectionResourceCustomizations().add(collectionResourceCustomization); service.getCollectionResourceCustomizations().add(collectionResourceCustomization); - doReturn(service).when(mockCatalogDbClient).getServiceByID("3c40d244-808e-42ca-b09a-256d83d19d0a"); doReturn(collectionResourceCustomization).when(mockCatalogDbClient) .getNetworkCollectionResourceCustomizationByID("123"); @@ -395,7 +391,6 @@ public class ServiceEBBLoaderTest extends BaseTaskTest { relatedToProperty1.setPropertyKey("service-instance.service-instance-name"); relatedToProperty.setPropertyValue("child_euler_001"); - Relationship relationship = new Relationship(); Relationship relationship1 = new Relationship(); relationship.setRelatedTo("service-instance"); diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java index d3aadf1e51..dc23ab9647 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java @@ -22,8 +22,7 @@ package org.onap.so.client.aai.mapper; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.IOException; @@ -69,7 +68,6 @@ public class AAIObjectMapperTest { private AAIObjectMapper aaiObjectMapper = new AAIObjectMapper(); private final static String JSON_FILE_LOCATION = "src/test/resources/__files/BuildingBlocks/"; - @Test public void mapConfigurationTest() { Configuration configuration = new Configuration(); @@ -100,7 +98,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.Configuration actualConfiguration = aaiObjectMapper.mapConfiguration(configuration); - assertThat(actualConfiguration, sameBeanAs(expectedConfiguration)); + assertThat(actualConfiguration).usingRecursiveComparison().isEqualTo(expectedConfiguration); } @Test @@ -126,7 +124,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.VolumeGroup actualVolumeGroup = aaiObjectMapper.mapVolumeGroup(volumeGroup); - assertThat(actualVolumeGroup, sameBeanAs(expectedVolumeGroup)); + assertThat(actualVolumeGroup).usingRecursiveComparison().isEqualTo(expectedVolumeGroup); } @Test @@ -288,7 +286,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.VfModule reqMapper1 = omapper.readValue(jsonToCompare, org.onap.aai.domain.yang.VfModule.class); - assertThat(reqMapper1, sameBeanAs(AAIVfModule)); + assertThat(reqMapper1).usingRecursiveComparison().isEqualTo(AAIVfModule); } @@ -314,7 +312,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.VfModule reqMapper1 = omapper.readValue(jsonToCompare, org.onap.aai.domain.yang.VfModule.class); - assertThat(reqMapper1, sameBeanAs(AAIVfModule)); + assertThat(reqMapper1).usingRecursiveComparison().isEqualTo(AAIVfModule); } @@ -337,7 +335,6 @@ public class AAIObjectMapperTest { instanceGroup.setModelInfoInstanceGroup(model); - org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = aaiObjectMapper.mapInstanceGroup(instanceGroup); try { @@ -376,7 +373,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.Customer actualCustomer = aaiObjectMapper.mapCustomer(customer); - assertThat(actualCustomer, sameBeanAs(expectedCustomer)); + assertThat(actualCustomer).usingRecursiveComparison().isEqualTo(expectedCustomer); } @Test @@ -413,7 +410,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.L3Network network = omapper.readValue(getJson("aaiL3NetworkMapped.json"), org.onap.aai.domain.yang.L3Network.class); - com.shazam.shazamcrest.MatcherAssert.assertThat(aaiL3Network, sameBeanAs(network)); + assertThat(aaiL3Network).usingRecursiveComparison().isEqualTo(network); } @@ -443,7 +440,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.Collection actualCollection = aaiObjectMapper.mapCollection(networkCollection); - assertThat(actualCollection, sameBeanAs(expectedCollection)); + assertThat(actualCollection).usingRecursiveComparison().isEqualTo(expectedCollection); } /* @@ -673,7 +670,6 @@ public class AAIObjectMapperTest { routeTarget.setGlobalRouteTarget("testGrt"); vpnBinding.getRouteTargets().add(routeTarget); - org.onap.aai.domain.yang.VpnBinding expectedVpnBinding = new org.onap.aai.domain.yang.VpnBinding(); expectedVpnBinding.setVpnId("testVpnId"); expectedVpnBinding.setVpnName("testVpn"); @@ -694,7 +690,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.VpnBinding actualVpnBinding = aaiObjectMapper.mapVpnBinding(vpnBinding); - assertThat(actualVpnBinding, sameBeanAs(expectedVpnBinding)); + assertThat(actualVpnBinding).usingRecursiveComparison().isEqualTo(expectedVpnBinding); } @Test @@ -709,7 +705,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.RouteTarget actualRouteTarget = aaiObjectMapper.mapRouteTarget(routeTarget); - assertThat(actualRouteTarget, sameBeanAs(expectedRouteTarget)); + assertThat(actualRouteTarget).usingRecursiveComparison().isEqualTo(expectedRouteTarget); } @Test @@ -726,7 +722,7 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.Subnet actualSubnet = aaiObjectMapper.mapSubnet(subnet); - assertThat(actualSubnet, sameBeanAs(expectedSubnet)); + assertThat(actualSubnet).usingRecursiveComparison().isEqualTo(expectedSubnet); } @Test @@ -743,6 +739,6 @@ public class AAIObjectMapperTest { org.onap.aai.domain.yang.NetworkPolicy actualNetworkPolicy = aaiObjectMapper.mapNetworkPolicy(networkPolicy); - assertThat(actualNetworkPolicy, sameBeanAs(expectedNetworkPolicy)); + assertThat(actualNetworkPolicy).usingRecursiveComparison().isEqualTo(expectedNetworkPolicy); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java index da97da2848..21747c6c81 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java @@ -19,8 +19,7 @@ */ package org.onap.so.client.adapter.network.mapper; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doReturn; import java.nio.file.Files; @@ -140,8 +139,9 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { SPY_networkAdapterObjectMapper.createNetworkRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, customer); - assertThat(createNetworkRequest, sameBeanAs(expectedCreateNetworkRequest).ignoring("contrailRequest") - .ignoring("contrailNetwork").ignoring("providerVlanNetwork").ignoring("subnets").ignoring("messageId")); + assertThat(createNetworkRequest).usingRecursiveComparison() + .ignoringFields("contrailRequest", "contrailNetwork", "providerVlanNetwork", "subnets", "messageId") + .isEqualTo(expectedCreateNetworkRequest); } @Test @@ -167,8 +167,9 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { .createNetworkRollbackRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, createNetworkResponse); - assertThat(rollbackNetworkRequest, sameBeanAs(expectedRollbackNetworkRequest).ignoring("contrailNetwork") - .ignoring("providerVlanNetwork").ignoring("subnets").ignoring("networkParams").ignoring("messageId")); + assertThat(rollbackNetworkRequest).usingRecursiveComparison() + .ignoringFields("contrailNetwork", "providerVlanNetwork", "subnets", "networkParams", "messageId") + .isEqualTo(expectedRollbackNetworkRequest); } @Test @@ -269,8 +270,8 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { SPY_networkAdapterObjectMapper.createNetworkUpdateRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, customer); - assertThat(actualUpdateNetworkRequest, - sameBeanAs(expectedUpdateNetworkRequest).ignoring("msoRequest.requestId")); + assertThat(actualUpdateNetworkRequest).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("msoRequest.requestId").isEqualTo(expectedUpdateNetworkRequest); } @Test @@ -312,7 +313,7 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { DeleteNetworkRequest deleteNetworkRequest = SPY_networkAdapterObjectMapper .deleteNetworkRequestMapper(requestContext, cloudRegion, serviceInstance, l3Network); - assertThat(expectedDeleteNetworkRequest, sameBeanAs(deleteNetworkRequest)); + assertThat(expectedDeleteNetworkRequest).usingRecursiveComparison().isEqualTo(deleteNetworkRequest); } @Test @@ -353,7 +354,7 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { DeleteNetworkRequest deleteNetworkRequest = SPY_networkAdapterObjectMapper .deleteNetworkRequestMapper(requestContext, cloudRegion, serviceInstance, l3Network); - assertThat(expectedDeleteNetworkRequest, sameBeanAs(deleteNetworkRequest)); + assertThat(expectedDeleteNetworkRequest).usingRecursiveComparison().isEqualTo(deleteNetworkRequest); } @Test @@ -380,8 +381,9 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { SPY_networkAdapterObjectMapper.createNetworkRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, myNetwork, userInput, cloudRegionPo, customer); // ignoring dynamic fields and networkParams that throws parsing exception on json file load - assertThat(createNetworkRequest, sameBeanAs(expectedCreateNetworkRequest).ignoring("messageId") - .ignoring("msoRequest.requestId").ignoring("networkParams")); + assertThat(createNetworkRequest).usingRecursiveComparison().ignoringAllOverriddenEquals() + .ignoringFields("messageId", "msoRequest.requestId", "networkParams") + .isEqualTo(expectedCreateNetworkRequest); } @Test @@ -397,7 +399,6 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup { assertEquals("192.168.0.0/16", subnets.get(0).getHostRoutes().get(0).getPrefix()); assertEquals("192.168.1.5/16", subnets.get(0).getHostRoutes().get(1).getPrefix()); - assertEquals("NULL", subnets.get(1).getGatewayIp()); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapperTest.java index fa3cce5386..aa36cdc24b 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapperTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.adapter.vnf.mapper; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; @@ -98,7 +97,6 @@ public class VnfAdapterObjectMapperTest { serviceInstance.getVnfs().get(0).getVolumeGroups().add(volumeGroup); - CloudRegion cloudRegion = new CloudRegion(); cloudRegion.setLcpCloudRegionId("lcpCloudRegionId"); cloudRegion.setTenantId("tenantId"); @@ -150,24 +148,28 @@ public class VnfAdapterObjectMapperTest { CreateVolumeGroupRequest actualCreateVolumeGroupRequest = vnfAdapterObjectMapper.createVolumeGroupRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, sdncVfModuleQueryResponse); - assertThat(actualCreateVolumeGroupRequest, sameBeanAs(expectedCreateVolumeGroupRequest)); + assertThat(actualCreateVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedCreateVolumeGroupRequest); doReturn("false").when(vnfAdapterObjectMapper).getProperty("mso.bridgeEnabled"); actualCreateVolumeGroupRequest = vnfAdapterObjectMapper.createVolumeGroupRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, sdncVfModuleQueryResponse); - assertThat(actualCreateVolumeGroupRequest, sameBeanAs(expectedCreateVolumeGroupRequest)); + assertThat(actualCreateVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedCreateVolumeGroupRequest); doReturn(null).when(vnfAdapterObjectMapper).getProperty("mso.bridgeEnabled"); expectedCreateVolumeGroupRequest.setEnableBridge(true); actualCreateVolumeGroupRequest = vnfAdapterObjectMapper.createVolumeGroupRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, sdncVfModuleQueryResponse); - assertThat(actualCreateVolumeGroupRequest, sameBeanAs(expectedCreateVolumeGroupRequest)); + assertThat(actualCreateVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedCreateVolumeGroupRequest); doReturn("true").when(vnfAdapterObjectMapper).getProperty("mso.bridgeEnabled"); expectedCreateVolumeGroupRequest.setEnableBridge(true); actualCreateVolumeGroupRequest = vnfAdapterObjectMapper.createVolumeGroupRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, sdncVfModuleQueryResponse); - assertThat(actualCreateVolumeGroupRequest, sameBeanAs(expectedCreateVolumeGroupRequest)); + assertThat(actualCreateVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedCreateVolumeGroupRequest); } @Test @@ -188,7 +190,6 @@ public class VnfAdapterObjectMapperTest { genericVnf.setVnfType("vnfType"); serviceInstance.getVnfs().add(genericVnf); - ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule(); modelInfoVfModule.setModelName("modelName"); modelInfoVfModule.setModelCustomizationUUID("modelCustomizationUUID"); @@ -246,7 +247,8 @@ public class VnfAdapterObjectMapperTest { CreateVolumeGroupRequest actualCreateVolumeGroupRequest = vnfAdapterObjectMapper.createVolumeGroupRequestMapper( requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, null); - assertThat(actualCreateVolumeGroupRequest, sameBeanAs(expectedCreateVolumeGroupRequest)); + assertThat(actualCreateVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedCreateVolumeGroupRequest); } @Test @@ -302,7 +304,8 @@ public class VnfAdapterObjectMapperTest { DeleteVolumeGroupRequest actualDeleteVolumeGroupRequest = vnfAdapterObjectMapper .deleteVolumeGroupRequestMapper(requestContext, cloudRegion, serviceInstance, volumeGroup); - assertThat(actualDeleteVolumeGroupRequest, sameBeanAs(expectedDeleteVolumeGroupRequest)); + assertThat(actualDeleteVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(expectedDeleteVolumeGroupRequest); } @Test @@ -409,6 +412,6 @@ public class VnfAdapterObjectMapperTest { MsoRequest actualMsoRequest = vnfAdapterObjectMapper.createMsoRequest(requestContext, serviceInstance); - assertThat(expectedMsoRequest, sameBeanAs(actualMsoRequest)); + assertThat(expectedMsoRequest).usingRecursiveComparison().isEqualTo(actualMsoRequest); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java index 836f8c1842..593de37223 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.adapter.vnf.mapper; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doReturn; import java.io.IOException; @@ -143,8 +142,8 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { String jsonToCompare = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequest.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); - + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); doReturn("true").when(spyMapper).getProperty("mso.bridgeEnabled"); vfModuleVNFAdapterRequest = @@ -153,8 +152,8 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { jsonToCompare = new String(Files .readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestBridgeEnabled.json"))); reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); - + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); doReturn(null).when(spyMapper).getProperty("mso.bridgeEnabled"); vfModuleVNFAdapterRequest = @@ -163,7 +162,8 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { jsonToCompare = new String(Files .readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestBridgeEnabled.json"))); reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -232,13 +232,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String( Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestTrueBackout.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -303,13 +303,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String(Files.readAllBytes(Paths .get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleWithNoEnvironmentAndWorkloadContextRequest.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -384,13 +384,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String( Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleAddonRequest.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -489,13 +489,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, volumeGroup, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String(Files .readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleWithVolumeGroupRequest.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -561,13 +561,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String(Files.readAllBytes( Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestWithSingleAvailabilityZone.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -633,13 +633,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String(Files.readAllBytes( Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestWithCloudResources.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -704,13 +704,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String( Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestDhcpDisabled.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -775,13 +775,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String( Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestMultipleDhcp.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -844,13 +844,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { vfModuleObjectMapper.createVfModuleRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, vnf, vfModule, null, sdncVnfQueryResponse, sdncVfModuleQueryResponse); - String jsonToCompare = new String( Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterCreateVfModuleRequestNoUserParams.json"))); CreateVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, CreateVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison().ignoringFields("messageId", "notificationUrl") + .isEqualTo(reqMapper1); } @Test @@ -906,14 +906,13 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest { DeleteVfModuleRequest vfModuleVNFAdapterRequest = vfModuleObjectMapper .deleteVfModuleRequestMapper(requestContext, cloudRegion, serviceInstance, vnf, vfModule); - String jsonToCompare = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "vnfAdapterDeleteVfModuleRequest.json"))); DeleteVfModuleRequest reqMapper1 = omapper.readValue(jsonToCompare, DeleteVfModuleRequest.class); - assertThat(vfModuleVNFAdapterRequest, - sameBeanAs(reqMapper1).ignoring("messageId").ignoring("notificationUrl").ignoring("vfModuleStackId")); + assertThat(vfModuleVNFAdapterRequest).usingRecursiveComparison() + .ignoringFields("messageId", "notificationUrl", "vfModuleStackId").isEqualTo(reqMapper1); } @Test diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperTest.java index 41b8c18ebf..14a91daf2e 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperTest.java @@ -20,9 +20,7 @@ package org.onap.so.client.adapter.vnf.mapper; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -73,7 +71,7 @@ public class VnfAdapterVfModuleObjectMapperTest { mapper.addPairToMap(map, "test", "_key2", Arrays.asList()); - assertThat(map.containsKey("test_key2"), equalTo(false)); + assertThat(map.containsKey("test_key2")).isFalse(); mapper.addPairToMap(map, "test", "_key3", "myVal"); @@ -116,8 +114,8 @@ public class VnfAdapterVfModuleObjectMapperTest { DeleteVfModuleRequest actualDeleteVfModuleRequest = mapper.deleteVfModuleRequestMapper(requestContext, cloudRegion, serviceInstance, genericVnf, vfModule); - assertThat(actualDeleteVfModuleRequest, - sameBeanAs(expectedDeleteVfModuleRequest).ignoring("messageId").ignoring("notificationUrl")); + assertThat(actualDeleteVfModuleRequest).usingRecursiveComparison() + .ignoringFields("messageId", "notificationUrl").isEqualTo(expectedDeleteVfModuleRequest); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectBuilderTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectBuilderTest.java index 3636873a0a..c60d56915a 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectBuilderTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectBuilderTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.namingservice; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.List; import org.junit.Test; @@ -53,7 +52,7 @@ public class NamingRequestObjectBuilderTest { Element actual = mapper.elementMapper(instanceGroupId, policyInstanceName, namingType, nfNamingCode, instanceGroupName); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -65,7 +64,7 @@ public class NamingRequestObjectBuilderTest { // Actual Deleteelement Deleteelement actual = mapper.deleteElementMapper(instanceGroupId); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -85,7 +84,7 @@ public class NamingRequestObjectBuilderTest { // Actual NameGenRequest NameGenRequest actual = mapper.nameGenRequestMapper(elements); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -101,6 +100,6 @@ public class NamingRequestObjectBuilderTest { // Actual NameGenDeleteRequest NameGenDeleteRequest actual = mapper.nameGenDeleteRequestMapper(deleteElements); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java index cbd192c0da..8559e5d8ab 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingRequestObjectTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.namingservice; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; import org.junit.Test; import org.onap.namingservice.model.Element; @@ -54,7 +53,7 @@ public class NamingRequestObjectTest { namingRequestObject.setResourceNameValue(resourceName); HashMap actual = namingRequestObject.getNamingRequestObjectMap(); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -77,6 +76,6 @@ public class NamingRequestObjectTest { namingRequestObject.setServiceModelNameValue(serviceModelName); HashMap actual = namingRequestObject.getNamingRequestObjectMap(); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java index 8197d4751e..ddc90b024f 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.orchestration; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -113,7 +112,6 @@ public class AAINetworkResourcesTest extends TestDataSetup { doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient(); } - @Test public void updateNetworkTest() { @@ -175,7 +173,8 @@ public class AAINetworkResourcesTest extends TestDataSetup { if (oVpnBinding.isPresent()) { VpnBinding vpnBinding = oVpnBinding.get(); - assertThat(aaiResultWrapper.asBean(VpnBinding.class).get(), sameBeanAs(vpnBinding)); + assertThat(aaiResultWrapper.asBean(VpnBinding.class).get()).usingRecursiveComparison() + .isEqualTo(vpnBinding); } } @@ -193,8 +192,8 @@ public class AAINetworkResourcesTest extends TestDataSetup { verify(MOCK_aaiResourcesClient, times(1)).get(any(AAIResourceUri.class)); if (oNetPolicy.isPresent()) { org.onap.aai.domain.yang.NetworkPolicy networkPolicy = oNetPolicy.get(); - assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.NetworkPolicy.class).get(), - sameBeanAs(networkPolicy)); + assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.NetworkPolicy.class).get()) + .usingRecursiveComparison().isEqualTo(networkPolicy); } } @@ -212,8 +211,8 @@ public class AAINetworkResourcesTest extends TestDataSetup { verify(MOCK_aaiResourcesClient, times(1)).get(any(AAIPluralResourceUri.class)); if (oNetPolicies.isPresent()) { org.onap.aai.domain.yang.NetworkPolicies networkPolicies = oNetPolicies.get(); - assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.NetworkPolicies.class).get(), - sameBeanAs(networkPolicies)); + assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.NetworkPolicies.class).get()) + .usingRecursiveComparison().isEqualTo(networkPolicies); } } @@ -232,7 +231,8 @@ public class AAINetworkResourcesTest extends TestDataSetup { if (oRtref.isPresent()) { RouteTableReference rTref = oRtref.get(); - assertThat(aaiResultWrapper.asBean(RouteTableReference.class).get(), sameBeanAs(rTref)); + assertThat(aaiResultWrapper.asBean(RouteTableReference.class).get()).usingRecursiveComparison() + .isEqualTo(rTref); } } @@ -279,7 +279,6 @@ public class AAINetworkResourcesTest extends TestDataSetup { assertEquals(network.getNetworkId(), aaiL3Network.get().getNetworkId()); assertEquals(network.getNetworkName(), aaiL3Network.get().getNetworkName()); - } @Test @@ -411,7 +410,8 @@ public class AAINetworkResourcesTest extends TestDataSetup { if (oSubnet.isPresent()) { org.onap.aai.domain.yang.Subnet subnet = oSubnet.get(); - assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.Subnet.class).get(), sameBeanAs(subnet)); + assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.Subnet.class).get()).usingRecursiveComparison() + .isEqualTo(subnet); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIVnfResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIVnfResourcesTest.java index 9c16915b80..43b322ab17 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIVnfResourcesTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAIVnfResourcesTest.java @@ -20,8 +20,7 @@ package org.onap.so.client.orchestration; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -211,7 +210,6 @@ public class AAIVnfResourcesTest extends TestDataSetup { .cloudRegion(cloudRegion.getCloudOwner(), cloudRegion.getLcpCloudRegionId())))); } - @Test public void checkVnfClosedLoopDisabledFlagTest() { Optional vnf = Optional.of(new org.onap.aai.domain.yang.GenericVnf()); @@ -241,7 +239,6 @@ public class AAIVnfResourcesTest extends TestDataSetup { assertTrue(isVnfPserversLockedFlag); } - @Test public void checkNameInUseTrueTest() { AAIPluralResourceUri vnfUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnfs()) @@ -290,7 +287,8 @@ public class AAIVnfResourcesTest extends TestDataSetup { if (oVserver.isPresent()) { org.onap.aai.domain.yang.Vserver vserver = oVserver.get(); - assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.Vserver.class).get(), sameBeanAs(vserver)); + assertThat(aaiResultWrapper.asBean(org.onap.aai.domain.yang.Vserver.class).get()).usingRecursiveComparison() + .isEqualTo(vserver); } } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NetworkAdapterResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NetworkAdapterResourcesTest.java index 9ec0b0c3bd..c148e942f7 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NetworkAdapterResourcesTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/NetworkAdapterResourcesTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,7 +20,7 @@ package org.onap.so.client.orchestration; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; @@ -59,7 +59,6 @@ import org.onap.so.client.adapter.network.NetworkAdapterClientImpl; import org.onap.so.client.adapter.network.mapper.NetworkAdapterObjectMapper; import org.onap.so.db.catalog.beans.OrchestrationStatus; import org.onap.so.entity.MsoRequest; -import com.shazam.shazamcrest.matcher.Matchers; @RunWith(MockitoJUnitRunner.Silent.class) @@ -155,7 +154,7 @@ public class NetworkAdapterResourcesTest extends TestDataSetup { verify(MOCK_networkAdapterObjectMapper, times(1)).createNetworkRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, customer); - assertThat(expectedCreateNetworkResponse, Matchers.sameBeanAs(actualCreateNetwrokResponse)); + assertThat(expectedCreateNetworkResponse).usingRecursiveComparison().isEqualTo(actualCreateNetwrokResponse); } @Test @@ -183,7 +182,7 @@ public class NetworkAdapterResourcesTest extends TestDataSetup { isA(ServiceInstance.class), isA(L3Network.class), isA(Map.class), isA(String.class), isA(CreateNetworkResponse.class)); - RollbackNetworkResponse actualRollbackCreateNetwrokResponse = + RollbackNetworkResponse actualRollbackCreateNetworkResponse = (networkAdapterResources.rollbackCreateNetwork(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, createNetworkResponse)).get(); @@ -193,7 +192,8 @@ public class NetworkAdapterResourcesTest extends TestDataSetup { cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, createNetworkResponse); - assertThat(expectedRollbackNetworkResponse, Matchers.sameBeanAs(actualRollbackCreateNetwrokResponse)); + assertThat(expectedRollbackNetworkResponse).usingRecursiveComparison() + .isEqualTo(actualRollbackCreateNetworkResponse); } @Test @@ -235,6 +235,6 @@ public class NetworkAdapterResourcesTest extends TestDataSetup { verify(MOCK_networkAdapterObjectMapper, times(1)).deleteNetworkRequestMapper(requestContext, cloudRegion, serviceInstance, l3Network); verify(MOCK_networkAdapterClient, times(1)).deleteNetwork(l3Network.getNetworkId(), deleteNetworkRequest); - assertThat(expectedDeleteNetworkResponse, Matchers.sameBeanAs(actualDeleteNetworkResponse)); + assertThat(expectedDeleteNetworkResponse).usingRecursiveComparison().isEqualTo(actualDeleteNetworkResponse); } } diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/VnfAdapterVolumeGroupResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/VnfAdapterVolumeGroupResourcesTest.java index 99eac004d1..f0518d5531 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/VnfAdapterVolumeGroupResourcesTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/VnfAdapterVolumeGroupResourcesTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,7 +20,7 @@ package org.onap.so.client.orchestration; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext; import org.onap.so.client.adapter.vnf.VnfVolumeAdapterClientImpl; import org.onap.so.client.adapter.vnf.mapper.VnfAdapterObjectMapper; import org.onap.so.db.catalog.beans.OrchestrationStatus; -import com.shazam.shazamcrest.matcher.Matchers; @RunWith(MockitoJUnitRunner.Silent.class) public class VnfAdapterVolumeGroupResourcesTest extends TestDataSetup { @@ -104,7 +103,7 @@ public class VnfAdapterVolumeGroupResourcesTest extends TestDataSetup { verify(MOCK_vnfAdapterObjectMapper, times(1)).createVolumeGroupRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, genericVnf, volumeGroup, sdncVfModuleQueryResponse); - assertThat(createVolumeGroupRequest, Matchers.sameBeanAs(actualCreateVolumeGroupResponse)); + assertThat(createVolumeGroupRequest).usingRecursiveComparison().isEqualTo(actualCreateVolumeGroupResponse); } @Test @@ -119,6 +118,7 @@ public class VnfAdapterVolumeGroupResourcesTest extends TestDataSetup { verify(MOCK_vnfAdapterObjectMapper, times(1)).deleteVolumeGroupRequestMapper(requestContext, cloudRegion, serviceInstance, volumeGroup); - assertThat(expectedDeleteVolumeGroupRequest, Matchers.sameBeanAs(actualDeleteVolumeGroupRequest)); + assertThat(expectedDeleteVolumeGroupRequest).usingRecursiveComparison() + .isEqualTo(actualDeleteVolumeGroupRequest); } } diff --git a/common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java b/common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java index 29c8196585..582de2fc3a 100644 --- a/common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java +++ b/common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,6 @@ package org.onap.so.client.policy; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -158,7 +157,7 @@ public class PolicyClientImplTest { String configJson = returnedPolicyConfigList[0].getConfig(); Config actual = client.getConfigFromStringJson(configJson); - org.hamcrest.MatcherAssert.assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -177,7 +176,7 @@ public class PolicyClientImplTest { Config actual = client.getConfigWithPolicyName("policyName"); - org.hamcrest.MatcherAssert.assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/common/common/pom.xml b/common/common/pom.xml index 2dc6247e40..d36fe37f22 100644 --- a/common/common/pom.xml +++ b/common/common/pom.xml @@ -69,26 +69,7 @@ cxf-rt-rs-client test - - com.shazam - shazamcrest - 0.11 - test - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - com.vaadin.external.google - android-json - - - + org.apache.tomcat tomcat-catalina diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml index b9ce3a6e26..192f8e9972 100644 --- a/graph-inventory/aai-client/pom.xml +++ b/graph-inventory/aai-client/pom.xml @@ -93,10 +93,6 @@ org.apache.httpcomponents httpclient - - org.skyscreamer - jsonassert - xmlunit xmlunit @@ -120,22 +116,7 @@ mockito-core test - - com.shazam - shazamcrest - 0.11 - test - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - + org.onap.aai.schema-service aai-schema @@ -150,5 +131,10 @@ junit-vintage-engine test + + org.skyscreamer + jsonassert + test + diff --git a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java index 0d408c77d4..749d0d9b0d 100644 --- a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java +++ b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIResourcesClientTest.java @@ -28,9 +28,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.put; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -229,11 +228,11 @@ public class AAIResourcesClientTest { Relationship relationship = new Relationship(); relationship.setRelatedLink(uri.build().toString()); Relationship actual = client.buildRelationship(uri); - assertThat("expect equal no label", actual, sameBeanAs(relationship)); + assertThat(actual).as("expect equal no label").usingRecursiveComparison().isEqualTo(relationship); relationship.setRelationshipLabel(AAIEdgeLabel.USES.toString()); actual = client.buildRelationship(uri, AAIEdgeLabel.USES); - assertThat("expect equal has label", actual, sameBeanAs(relationship)); + assertThat(actual).as("expect equal has label").usingRecursiveComparison().isEqualTo(relationship); } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/filters/RequestIdFilterTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/filters/RequestIdFilterTest.java index 14a8c0e9fd..aa83bb1121 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/filters/RequestIdFilterTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/filters/RequestIdFilterTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandler.filters; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -97,11 +96,9 @@ public class RequestIdFilterTest { thrown.expect(DuplicateRequestIdException.class); thrown.expectMessage("HTTP 400 Bad Request"); - requestIdFilter.filter(mockContext); } - @Test public void filterTestInfraSkipRequestIdLookup() throws IOException { String requestId = REQUEST_ID; @@ -119,13 +116,12 @@ public class RequestIdFilterTest { requestIdFilter.filter(mockContext); } - @Test public void createRequestErrorTest() throws IOException { RequestError requestError = getRequestError(); String result = requestIdFilter.createRequestError(REQUEST_ID, "InfraActiveRequests"); RequestError resultingError = mapper.readValue(result, RequestError.class); - assertThat(resultingError, sameBeanAs(requestError)); + assertThat(resultingError).usingRecursiveComparison().isEqualTo(requestError); } } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java index 7bd371c974..1353123d11 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import org.apache.http.HttpStatus; import org.junit.Rule; import org.junit.Test; @@ -32,12 +33,11 @@ import org.onap.so.logger.MessageEnum; import java.io.IOException; import java.util.LinkedList; import java.util.List; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; - public class ApiExceptionTest { @Rule @@ -54,7 +54,6 @@ public class ApiExceptionTest { throw testException; } - @Test public void testBPMNFailureException() throws ApiException { List testVariables = new LinkedList<>(); @@ -63,13 +62,12 @@ public class ApiExceptionTest { thrown.expectMessage(startsWith("Request Failed due to BPEL error with HTTP Status =")); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("variables", sameBeanAs(testVariables))); + thrown.expect(hasProperty("variables", equalTo(testVariables))); BPMNFailureException testException = new BPMNFailureException.Builder("Test Message", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).variables(testVariables).build(); throw testException; } - @Test public void testClientConnectionException() throws ApiException { IOException ioException = new IOException(); @@ -79,14 +77,13 @@ public class ApiExceptionTest { thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("cause", sameBeanAs(ioException))); + thrown.expect(hasProperty("cause", equalTo(ioException))); ClientConnectionException testException = new ClientConnectionException.Builder("test", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER) .cause(ioException).build(); throw testException; } - @Test public void testDuplicateRequestException() throws ApiException { ErrorLoggerInfo testLog = @@ -96,13 +93,12 @@ public class ApiExceptionTest { thrown.expectMessage(startsWith("Error: Locked instance")); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("errorLoggerInfo", sameBeanAs(testLog))); + thrown.expect(hasProperty("errorLoggerInfo", equalTo(testLog))); DuplicateRequestException testException = new DuplicateRequestException.Builder("Test1", "Test2", "Test3", "Test4", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).errorInfo(testLog).build(); throw testException; } - @Test public void testValidateException() throws ApiException { thrown.expect(ValidateException.class); @@ -116,7 +112,6 @@ public class ApiExceptionTest { throw testException; } - @Test public void testVfModuleNotFoundException() throws ApiException { thrown.expect(VfModuleNotFoundException.class); @@ -129,5 +124,4 @@ public class ApiExceptionTest { throw testException; } - } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java index 3d80ec230e..0bcc1e50f1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ApiExceptionTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import org.apache.http.HttpStatus; import org.junit.Rule; import org.junit.Test; @@ -32,12 +33,11 @@ import org.onap.so.logger.MessageEnum; import java.io.IOException; import java.util.LinkedList; import java.util.List; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; - public class ApiExceptionTest extends BaseTest { @Rule @@ -54,7 +54,6 @@ public class ApiExceptionTest extends BaseTest { throw testException; } - @Test public void testBPMNFailureException() throws ApiException { List testVariables = new LinkedList<>(); @@ -63,13 +62,12 @@ public class ApiExceptionTest extends BaseTest { thrown.expectMessage(startsWith("Request Failed due to BPEL error with HTTP Status =")); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("variables", sameBeanAs(testVariables))); + thrown.expect(hasProperty("variables", equalTo(testVariables))); BPMNFailureException testException = new BPMNFailureException.Builder("Test Message", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).variables(testVariables).build(); throw testException; } - @Test public void testClientConnectionException() throws ApiException { IOException ioException = new IOException(); @@ -79,14 +77,13 @@ public class ApiExceptionTest extends BaseTest { thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("cause", sameBeanAs(ioException))); + thrown.expect(hasProperty("cause", equalTo(ioException))); ClientConnectionException testException = new ClientConnectionException.Builder("test", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER) .cause(ioException).build(); throw testException; } - @Test public void testDuplicateRequestException() throws ApiException { ErrorLoggerInfo testLog = @@ -96,13 +93,12 @@ public class ApiExceptionTest extends BaseTest { thrown.expectMessage(startsWith("Error: Locked instance")); thrown.expect(hasProperty("httpResponseCode", is(HttpStatus.SC_NOT_FOUND))); thrown.expect(hasProperty("messageID", is(ErrorNumbers.SVC_BAD_PARAMETER))); - thrown.expect(hasProperty("errorLoggerInfo", sameBeanAs(testLog))); + thrown.expect(hasProperty("errorLoggerInfo", equalTo(testLog))); DuplicateRequestException testException = new DuplicateRequestException.Builder("Test1", "Test2", "Test3", "Test4", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).errorInfo(testLog).build(); throw testException; } - @Test public void testValidateException() throws ApiException { @@ -117,7 +113,6 @@ public class ApiExceptionTest extends BaseTest { throw testException; } - @Test public void testVfModuleNotFoundException() throws ApiException { thrown.expect(VfModuleNotFoundException.class); @@ -130,5 +125,4 @@ public class ApiExceptionTest extends BaseTest { throw testException; } - } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java index 88ea7e98aa..d29d662eeb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java @@ -20,13 +20,12 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -56,7 +55,6 @@ public class E2EServiceInstancesTest extends BaseTest { private final String e2eServInstancesUri = "/onap/so/infra/e2eServiceInstances/"; - @Before public void init() throws JsonProcessingException { wireMockServer.stubFor(post(urlPathEqualTo("/testOrchestrationUri")).willReturn(aResponse() @@ -129,7 +127,7 @@ public class E2EServiceInstancesTest extends BaseTest { assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -249,7 +247,7 @@ public class E2EServiceInstancesTest extends BaseTest { assertEquals(Response.Status.BAD_GATEWAY.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/GlobalHealthcheckHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/GlobalHealthcheckHandlerTest.java index 47755a09a0..14ac817641 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/GlobalHealthcheckHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/GlobalHealthcheckHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import java.net.URI; @@ -49,7 +48,6 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.RestTemplate; - @RunWith(SpringRunner.class) @ContextConfiguration(classes = {GenericStringConverter.class, HealthCheckConverter.class}, initializers = {ConfigDataApplicationContextInitializer.class}) @@ -122,7 +120,8 @@ public class GlobalHealthcheckHandlerTest { assertEquals(Response.Status.OK.getStatusCode(), response.getStatus()); HealthCheckResponse root; root = (HealthCheckResponse) response.getEntity(); - assertThat(root, sameBeanAs(expected).ignoring("subsystems.uri").ignoring("subsystems.subsystem")); + assertThat(root).usingRecursiveComparison().ignoringFields("subsystems.uri", "subsystems.subsystem") + .isEqualTo(expected); } @@ -139,7 +138,8 @@ public class GlobalHealthcheckHandlerTest { assertEquals(Response.Status.OK.getStatusCode(), response.getStatus()); HealthCheckResponse root; root = (HealthCheckResponse) response.getEntity(); - assertThat(root, sameBeanAs(expected).ignoring("subsystems.uri").ignoring("subsystems.subsystem")); + assertThat(root).usingRecursiveComparison().ignoringFields("subsystems.uri", "subsystems.subsystem") + .isEqualTo(expected); } @Test @@ -149,7 +149,6 @@ public class GlobalHealthcheckHandlerTest { assertEquals(MediaType.APPLICATION_JSON, he.getHeaders().getContentType()); } - @Test public void processResponseFromSubsystemTest() { SubsystemHealthcheckResponse subSystemResponse = new SubsystemHealthcheckResponse(); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java index 823f255bc3..b10ebf449d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java @@ -20,14 +20,12 @@ package org.onap.so.apihandlerinfra; - +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.onap.logging.filter.base.Constants.HttpHeaders.ONAP_PARTNER_NAME; import static org.onap.logging.filter.base.Constants.HttpHeaders.ONAP_REQUEST_ID; @@ -175,7 +173,8 @@ public class InstanceManagementTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -204,7 +203,8 @@ public class InstanceManagementTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -233,7 +233,8 @@ public class InstanceManagementTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java index fb923faf78..9f402a2db9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java @@ -20,11 +20,10 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertEquals; import static org.onap.logging.filter.base.Constants.HttpHeaders.ECOMP_REQUEST_ID; import static org.onap.logging.filter.base.Constants.HttpHeaders.ONAP_PARTNER_NAME; @@ -49,7 +48,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.http.Fault; - public class ManualTasksTest extends BaseTest { private final String basePath = "/onap/so/infra/tasks/v1/"; @@ -85,17 +83,15 @@ public class ManualTasksTest extends BaseTest { ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class); - ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); TaskRequestReference realResponse = mapper.readValue(response.getBody(), TaskRequestReference.class); - // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -125,7 +121,7 @@ public class ManualTasksTest extends BaseTest { RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value()); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -161,7 +157,7 @@ public class ManualTasksTest extends BaseTest { RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value()); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -197,12 +193,11 @@ public class ManualTasksTest extends BaseTest { ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class); - ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals(Response.Status.BAD_GATEWAY.getStatusCode(), response.getStatusCode().value()); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java index 7c58a754b6..49bb54f687 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java @@ -20,6 +20,7 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.any; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -28,8 +29,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -153,8 +152,9 @@ public class OrchestrationRequestsTest extends BaseTest { restTemplate.exchange(builder.build().toUri(), HttpMethod.GET, entity, GetOrchestrationResponse.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(response.getBody(), sameBeanAs(testResponse).ignoring("request.startTime") - .ignoring("request.finishTime").ignoring("request.requestStatus.timeStamp")); + assertThat(response.getBody()).usingRecursiveComparison() + .ignoringFields("request.startTime", "request.finishTime", "request.requestStatus.timeStamp") + .isEqualTo(testResponse); assertNull(response.getBody().getRequest().getInstanceReferences().getRequestorId()); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); @@ -188,8 +188,9 @@ public class OrchestrationRequestsTest extends BaseTest { restTemplate.exchange(builder.build().toUri(), HttpMethod.GET, entity, GetOrchestrationResponse.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(response.getBody(), sameBeanAs(testResponse).ignoring("request.startTime") - .ignoring("request.finishTime").ignoring("request.requestStatus.timeStamp")); + assertThat(response.getBody()).usingRecursiveComparison() + .ignoringFields("request.startTime", "request.finishTime", "request.requestStatus.timeStamp") + .isEqualTo(testResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); @@ -228,8 +229,9 @@ public class OrchestrationRequestsTest extends BaseTest { restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, GetOrchestrationResponse.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(response.getBody(), sameBeanAs(testResponse).ignoring("request.startTime") - .ignoring("request.finishTime").ignoring("request.requestStatus.timeStamp")); + assertThat(response.getBody()).usingRecursiveComparison() + .ignoringFields("request.startTime", "request.finishTime", "request.requestStatus.timeStamp") + .isEqualTo(testResponse); } @Test @@ -275,8 +277,9 @@ public class OrchestrationRequestsTest extends BaseTest { System.out.println("Response :" + response.getBody().toString()); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(response.getBody(), sameBeanAs(testResponse).ignoring("request.startTime") - .ignoring("request.finishTime").ignoring("request.requestStatus.timeStamp")); + assertThat(response.getBody()).usingRecursiveComparison() + .ignoringFields("request.startTime", "request.finishTime", "request.requestStatus.timeStamp") + .isEqualTo(testResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); @@ -346,8 +349,10 @@ public class OrchestrationRequestsTest extends BaseTest { ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, GetOrchestrationListResponse.class); - assertThat(response.getBody(), sameBeanAs(testResponse).ignoring("requestList.request.startTime") - .ignoring("requestList.request.finishTime").ignoring("requestList.request.requestStatus.timeStamp")); + assertThat(response.getBody()) + .usingRecursiveComparison().ignoringFields("requestList.request.startTime", + "requestList.request.finishTime", "requestList.request.requestStatus.timeStamp") + .isEqualTo(testResponse); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); assertEquals(requests.size(), response.getBody().getRequestList().size()); @@ -385,7 +390,7 @@ public class OrchestrationRequestsTest extends BaseTest { actualRequestError = mapper.readValue(response.getBody(), RequestError.class); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode().value()); - assertThat(actualRequestError, sameBeanAs(expectedRequestError)); + assertThat(actualRequestError).usingRecursiveComparison().isEqualTo(expectedRequestError); } @Test @@ -419,7 +424,7 @@ public class OrchestrationRequestsTest extends BaseTest { actualRequestError = mapper.readValue(response.getBody(), RequestError.class); assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value()); - assertThat(expectedRequestError, sameBeanAs(actualRequestError)); + assertThat(expectedRequestError).usingRecursiveComparison().isEqualTo(actualRequestError); } @Test @@ -469,7 +474,7 @@ public class OrchestrationRequestsTest extends BaseTest { mapper.readValue(new File("src/test/resources/OrchestrationRequest/RequestProcessingData.json"), new TypeReference>() {}); actualProcessingData = orchReq.mapRequestProcessingData(processingData); - assertThat(actualProcessingData, sameBeanAs(expectedDataList)); + assertThat(actualProcessingData).usingRecursiveComparison().isEqualTo(expectedDataList); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java index 7b2bdcf241..c1528286b3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java @@ -20,11 +20,10 @@ package org.onap.so.apihandlerinfra; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -92,7 +91,6 @@ public class OrchestrationRequestsUnitTest { private static final String ROLLBACK_EXT_SYSTEM_ERROR_SOURCE = "SDNC"; private Timestamp startTime = new Timestamp(System.currentTimeMillis()); - @Before public void setup() { iar = new InfraActiveRequests(); @@ -132,7 +130,7 @@ public class OrchestrationRequestsUnitTest { Request result = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(result, sameBeanAs(expected)); + assertThat(result).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -159,7 +157,7 @@ public class OrchestrationRequestsUnitTest { Request result = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(result, sameBeanAs(expected)); + assertThat(result).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -190,7 +188,7 @@ public class OrchestrationRequestsUnitTest { Request result = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v8"); - assertThat(result, sameBeanAs(expected)); + assertThat(result).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -213,7 +211,6 @@ public class OrchestrationRequestsUnitTest { expected.setRequestScope(SERVICE); expected.setStartTime(new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(startTime) + " GMT"); - expected.setWorkflowName(REQUEST_ACTION); expected.setRequestType(REQUEST_ACTION); @@ -224,7 +221,7 @@ public class OrchestrationRequestsUnitTest { Request result = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v8"); - assertThat(result, sameBeanAs(expected)); + assertThat(result).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -250,7 +247,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -277,7 +274,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.STATUSDETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -305,7 +302,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.STATUSDETAIL.toString(), "v8"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -328,7 +325,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.SIMPLENOTASKINFO.toString(), "v7"); - assertThat(expected, sameBeanAs(actual)); + assertThat(expected).usingRecursiveComparison().isEqualTo(actual); } @Test @@ -351,7 +348,7 @@ public class OrchestrationRequestsUnitTest { includeCloudRequest = false; Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, null, "v7"); - assertThat(expected, sameBeanAs(actual)); + assertThat(expected).usingRecursiveComparison().isEqualTo(actual); } @Test @@ -378,7 +375,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -404,7 +401,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -446,7 +443,7 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -473,14 +470,14 @@ public class OrchestrationRequestsUnitTest { Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, OrchestrationRequestFormat.DETAIL.toString(), "v7"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test public void requestStatusExtSystemErrorSourceTest() { RequestStatus requestStatus = new RequestStatus(); requestStatus.setExtSystemErrorSource(EXT_SYSTEM_ERROR_SOURCE); - assertThat(requestStatus.getExtSystemErrorSource(), is(equalTo(EXT_SYSTEM_ERROR_SOURCE))); + assertThat(requestStatus.getExtSystemErrorSource()).isEqualTo(EXT_SYSTEM_ERROR_SOURCE); } @Test @@ -500,7 +497,6 @@ public class OrchestrationRequestsUnitTest { assertEquals(Status.ABORTED.toString(), result); } - @Test public void mapRequestStatusToRequestForFormatEmptyStringTest() { iar.setRequestStatus(Status.ABORTED.toString()); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsUnitTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsUnitTest.java index 13586feca9..fd4477be36 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsUnitTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsUnitTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -142,7 +141,6 @@ public class RequestHandlerUtilsUnitTest { currentActiveRequestIARNull.setOriginalRequestId(RESUMED_REQUEST_ID); } - @Test public void createNewRecordCopyFromInfraActiveRequestTest() throws IOException, ApiException { doNothing().when(requestHandler).setInstanceIdAndName(infraActiveRequest, currentActiveRequest); @@ -150,14 +148,14 @@ public class RequestHandlerUtilsUnitTest { .updateRequestorIdInRequestBody(infraActiveRequest, "yyyyyy"); InfraActiveRequests result = requestHandler.createNewRecordCopyFromInfraActiveRequest(infraActiveRequest, CURRENT_REQUEST_ID, startTimeStamp, "VID", requestUri, "yyyyyy", RESUMED_REQUEST_ID); - assertThat(currentActiveRequest, sameBeanAs(result)); + assertThat(currentActiveRequest).usingRecursiveComparison().isEqualTo(result); } @Test public void createNewRecordCopyFromInfraActiveRequestNullIARTest() throws ApiException { InfraActiveRequests result = requestHandler.createNewRecordCopyFromInfraActiveRequest(null, CURRENT_REQUEST_ID, startTimeStamp, "VID", requestUri, "xxxxxx", RESUMED_REQUEST_ID); - assertThat(currentActiveRequestIARNull, sameBeanAs(result)); + assertThat(currentActiveRequestIARNull).usingRecursiveComparison().isEqualTo(result); } @Test @@ -169,7 +167,7 @@ public class RequestHandlerUtilsUnitTest { expected.setServiceInstanceName(SERVICE_INSTANCE_NAME); requestHandler.setInstanceIdAndName(infraActiveRequest, serviceRequest); - assertThat(serviceRequest, sameBeanAs(expected)); + assertThat(serviceRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -184,7 +182,7 @@ public class RequestHandlerUtilsUnitTest { expected.setServiceInstanceId(SERVICE_INSTANCE_ID); requestHandler.setInstanceIdAndName(request, serviceRequest); - assertThat(serviceRequest, sameBeanAs(expected)); + assertThat(serviceRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -214,7 +212,7 @@ public class RequestHandlerUtilsUnitTest { InfraActiveRequests expected = new InfraActiveRequests(); requestHandler.setInstanceIdAndName(originalServiceRequest, serviceRequest); - assertThat(serviceRequest, sameBeanAs(expected)); + assertThat(serviceRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -230,7 +228,7 @@ public class RequestHandlerUtilsUnitTest { expected.setVnfName(VNF_NAME); requestHandler.setInstanceIdAndName(vnfRequestOriginal, vnfRequest); - assertThat(vnfRequest, sameBeanAs(expected)); + assertThat(vnfRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -246,7 +244,7 @@ public class RequestHandlerUtilsUnitTest { expected.setVfModuleName(VFMODULE_NAME); requestHandler.setInstanceIdAndName(vfModuleRequestOriginal, vfModuleRequest); - assertThat(vfModuleRequest, sameBeanAs(expected)); + assertThat(vfModuleRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -262,7 +260,7 @@ public class RequestHandlerUtilsUnitTest { expected.setNetworkName(NETWORK_NAME); requestHandler.setInstanceIdAndName(networkRequestOriginal, networkRequest); - assertThat(networkRequest, sameBeanAs(expected)); + assertThat(networkRequest).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -278,7 +276,7 @@ public class RequestHandlerUtilsUnitTest { expected.setVolumeGroupName(VOLUME_GROUP_NAME); requestHandler.setInstanceIdAndName(volumeGroupRequestOriginal, volumeGroupRequest); - assertThat(volumeGroupRequest, sameBeanAs(expected)); + assertThat(volumeGroupRequest).usingRecursiveComparison().isEqualTo(expected); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ResumeOrchestrationRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ResumeOrchestrationRequestTest.java index 43bdbafcee..0cba8f9203 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ResumeOrchestrationRequestTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ResumeOrchestrationRequestTest.java @@ -19,8 +19,7 @@ */ package org.onap.so.apihandlerinfra; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -120,7 +119,6 @@ public class ResumeOrchestrationRequestTest { private HashMap instanceIdMap = new HashMap<>(); ModelInfo modelInfo; - @Before public void setup() throws IOException { // Setup general requestHandler mocks @@ -281,7 +279,7 @@ public class ResumeOrchestrationRequestTest { any(Action.class))).thenReturn(requestBody); RequestClientParameter result = resumeReq.setRequestClientParameter(lookupResult, version, infraActiveRequest, currentActiveRequest, "pnfCorrelationId", aLaCarte, sir); - assertThat(requestClientParameter, sameBeanAs(result)); + assertThat(requestClientParameter).usingRecursiveComparison().isEqualTo(result); } @Test @@ -291,7 +289,7 @@ public class ResumeOrchestrationRequestTest { doReturn(ModelType.vfModule).when(requestHandler).getModelType(action, modelInfo); RequestClientParameter result = resumeReq.setRequestClientParameter(lookupResult, version, infraActiveRequestVfModule, currentActiveRequest, "pnfCorrelationId", aLaCarte, sir); - assertThat(requestClientParameterVfModule, sameBeanAs(result)); + assertThat(requestClientParameterVfModule).usingRecursiveComparison().isEqualTo(result); } @Test diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java index 8a0ff4f80d..947337603b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java @@ -20,15 +20,13 @@ package org.onap.so.apihandlerinfra; - +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -187,7 +185,6 @@ public class ServiceInstancesTest extends BaseTest { Service defaultService = new Service(); defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a"); - wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK))); @@ -213,7 +210,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -231,7 +229,6 @@ public class ServiceInstancesTest extends BaseTest { .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor(get(urlMatching(".*/service/search/.*")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK))); @@ -265,12 +262,10 @@ public class ServiceInstancesTest extends BaseTest { Service defaultService = new Service(); defaultService.setModelUUID("d88da85c-d9e8-4f73-b837-3a72a431622a"); - wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB")).willReturn(aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_BAD_GATEWAY))); - wireMockServer.stubFor(get(urlMatching(".*/service/search/.*")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK))); @@ -359,7 +354,6 @@ public class ServiceInstancesTest extends BaseTest { .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK))); - wireMockServer.stubFor(get(urlMatching( ".*/serviceRecipe/search/findFirstByServiceModelUUIDAndAction?serviceModelUUID=d88da85c-d9e8-4f73-b837-3a72a431622a&action=activateInstance")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) @@ -420,7 +414,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -467,7 +462,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -512,7 +508,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -557,7 +554,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -598,7 +596,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -618,7 +617,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -650,7 +650,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -671,7 +672,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -692,7 +694,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -713,7 +716,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -734,7 +738,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -754,7 +759,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -774,7 +780,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -783,7 +790,6 @@ public class ServiceInstancesTest extends BaseTest { .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor(get(urlMatching( ".*/vnfResourceCustomization/search/findByModelCustomizationUUID[?]MODEL_CUSTOMIZATION_UUID=68dc9a92-214c-11e7-93ae-92361f002671")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) @@ -814,7 +820,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -832,7 +839,6 @@ public class ServiceInstancesTest extends BaseTest { .withBody(getWiremockResponseForCatalogdb("vnfResourceCustomizationsList_Response.json")) .withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor( get(urlMatching(".*/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vnfResources")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) @@ -857,7 +863,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -915,7 +922,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -954,7 +962,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -994,7 +1003,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1033,7 +1043,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1071,7 +1082,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1080,7 +1092,6 @@ public class ServiceInstancesTest extends BaseTest { .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction" + "[?]nfRole=GR-API-DEFAULT&action=applyUpdatedConfig")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) @@ -1100,7 +1111,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1127,7 +1139,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1154,7 +1167,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -1205,7 +1219,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -1251,7 +1266,6 @@ public class ServiceInstancesTest extends BaseTest { .withBody(getWiremockResponseForCatalogdb("vfModulePCM_Response.json")) .withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor( get(urlMatching(".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVnfComponentTypeAndAction" + "[?]vnfComponentType=vfModule&action=createInstance")) @@ -1273,7 +1287,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ObjectMapper mapper = new ObjectMapper(); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1334,11 +1349,11 @@ public class ServiceInstancesTest extends BaseTest { ResponseEntity response = sendRequest(inputStream("/VfModuleNoMatchingModelUUID.json"), uri, HttpMethod.DELETE, headers); - assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ObjectMapper mapper = new ObjectMapper(); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1413,7 +1428,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1451,7 +1467,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1498,7 +1515,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1554,7 +1572,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1591,7 +1610,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1621,7 +1641,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1658,7 +1679,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1698,7 +1720,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -1740,7 +1763,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1785,7 +1809,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1823,7 +1848,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1860,7 +1886,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -1900,7 +1927,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -1915,7 +1943,6 @@ public class ServiceInstancesTest extends BaseTest { .withBody(getWiremockResponseForCatalogdb("networkRecipe_Response.json")) .withStatus(org.apache.http.HttpStatus.SC_OK))); - // expected response ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse(); RequestReferences requestReferences = new RequestReferences(); @@ -1929,7 +1956,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2004,7 +2032,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2043,7 +2072,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2101,7 +2131,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2140,7 +2171,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2182,7 +2214,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2377,7 +2410,7 @@ public class ServiceInstancesTest extends BaseTest { mapper.readValue(inputStream("/LegacyMacroServiceInstance.json"), ServiceInstancesRequest.class); requestHandlerUtils.mapToLegacyRequest(request.getRequestDetails()); System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request)); - assertThat(request, sameBeanAs(expected)); + assertThat(request).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -2402,7 +2435,6 @@ public class ServiceInstancesTest extends BaseTest { .withBody(getWiremockResponseForCatalogdb("vfModule_Response.json")) .withStatus(org.apache.http.HttpStatus.SC_OK))); - wireMockServer.stubFor(get(urlMatching( ".*/vnfComponentsRecipe/search/findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction" + "[?]vfModuleModelUUID=GR-API-DEFAULT&vnfComponentType=vfModule&action=scaleOut")) @@ -2430,7 +2462,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertTrue(response.getBody().contains("1882939")); } @@ -2652,7 +2685,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); assertEquals(response.getHeaders().get(TRANSACTION_ID).get(0), "32807a28-1a14-4b88-b7b3-2950918aa76d"); } @@ -2675,7 +2709,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2696,7 +2731,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2758,7 +2794,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2779,7 +2816,8 @@ public class ServiceInstancesTest extends BaseTest { // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -2811,7 +2849,8 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId")); + assertThat(realResponse).usingRecursiveComparison().ignoringFields("requestReferences.requestId") + .isEqualTo(expectedResponse); } @Test @@ -3003,7 +3042,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); - assertThat(expectedResponse, sameBeanAs(realResponse)); + assertThat(expectedResponse).usingRecursiveComparison().isEqualTo(realResponse); } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java index 656571171a..9eef31a04c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/TasksHandlerTest.java @@ -20,12 +20,11 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.ArrayList; @@ -106,11 +105,10 @@ public class TasksHandlerTest extends BaseTest { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - // then assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value()); TasksGetResponse realResponse = mapper.readValue(response.getBody(), TasksGetResponse.class); - assertThat(realResponse, sameBeanAs(expectedResponse)); + assertThat(realResponse).usingRecursiveComparison().isEqualTo(expectedResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java index 1d614c5ece..a6e776b8e9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java @@ -22,6 +22,7 @@ package org.onap.so.apihandlerinfra; +import static org.assertj.core.api.Assertions.assertThat; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -48,7 +49,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; @@ -162,7 +162,7 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { WorkflowSpecifications realResponse = mapper.readValue(response.getBody(), WorkflowSpecifications.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(expectedResponse, sameBeanAs(realResponse)); + assertThat(expectedResponse).usingRecursiveComparison().isEqualTo(realResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); @@ -236,7 +236,6 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { userParameter6.setName("lcpCloudRegionId"); userParameter6.setPayloadLocation("cloudConfiguration"); - List activitySpecUserParameters = new ArrayList(); ActivitySpecUserParameters activitySpecUserParameter1 = new ActivitySpecUserParameters(); @@ -251,7 +250,6 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { activitySpecUserParameter3.setUserParameters(userParameter3); activitySpecUserParameters.add(activitySpecUserParameter3); - ActivitySpecUserParameters activitySpecUserParameter4 = new ActivitySpecUserParameters(); activitySpecUserParameter4.setUserParameters(userParameter4); activitySpecUserParameters.add(activitySpecUserParameter4); @@ -316,7 +314,8 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { String expectedResultJson = mapper.writeValueAsString(expectedResult); JSONAssert.assertEquals(expectedResultJson, workflowSpecificationsJson, false); - assertThat(expectedResult, sameBeanAs(workflowSpecifications).ignoring(WorkflowInputParameter.class)); + assertThat(expectedResult).usingRecursiveComparison().ignoringFieldsOfTypes(WorkflowInputParameter.class) + .isEqualTo(workflowSpecifications); } @Test @@ -357,7 +356,7 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { WorkflowSpecifications realResponse = mapper.readValue(response.getBody(), WorkflowSpecifications.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(expectedResponse, sameBeanAs(realResponse)); + assertThat(expectedResponse).usingRecursiveComparison().isEqualTo(realResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); @@ -403,7 +402,7 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { WorkflowSpecifications realResponse = mapper.readValue(response.getBody(), WorkflowSpecifications.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(expectedResponse, sameBeanAs(realResponse)); + assertThat(expectedResponse).usingRecursiveComparison().isEqualTo(realResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); @@ -450,7 +449,7 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest { WorkflowSpecifications realResponse = mapper.readValue(response.getBody(), WorkflowSpecifications.class); assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); - assertThat(expectedResponse, sameBeanAs(realResponse)); + assertThat(expectedResponse).usingRecursiveComparison().isEqualTo(realResponse); assertEquals("application/json", response.getHeaders().get(HttpHeaders.CONTENT_TYPE).get(0)); assertEquals("0", response.getHeaders().get("X-MinorVersion").get(0)); assertEquals("0", response.getHeaders().get("X-PatchVersion").get(0)); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilderTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilderTest.java index 16329d474f..0f12a3dd89 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilderTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilderTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -63,7 +62,6 @@ public class BpmnRequestBuilderTest { @Rule public ExpectedException exceptionRule = ExpectedException.none(); - @Mock private AAIResourcesClient aaiResourcesClient; @@ -76,7 +74,6 @@ public class BpmnRequestBuilderTest { @InjectMocks private BpmnRequestBuilder reqBuilder = spy(BpmnRequestBuilder.class); - private ObjectMapper mapper = new ObjectMapper(); private GraphInventoryCommonObjectMapperProvider provider = new GraphInventoryCommonObjectMapperProvider(); @@ -97,7 +94,7 @@ public class BpmnRequestBuilderTest { expectedRequest.getRequestDetails().getModelInfo().setModelId(null); // bad getter/setter setting multiple // fields ServiceInstancesRequest actualRequest = reqBuilder.buildServiceDeleteRequest("serviceId"); - assertThat(actualRequest, sameBeanAs(expectedRequest)); + assertThat(actualRequest).usingRecursiveComparison().isEqualTo(expectedRequest); } @Test @@ -110,7 +107,7 @@ public class BpmnRequestBuilderTest { ServiceInstancesRequest expectedRequest = mapper.readValue(new File(RESOURCE_PATH + "ExpectedVnfRequest.json"), ServiceInstancesRequest.class); ServiceInstancesRequest actualRequest = reqBuilder.buildVnfDeleteRequest("vnfId"); - assertThat(actualRequest, sameBeanAs(expectedRequest)); + assertThat(actualRequest).usingRecursiveComparison().isEqualTo(expectedRequest); } @Test @@ -128,7 +125,7 @@ public class BpmnRequestBuilderTest { .readValue(new File(RESOURCE_PATH + "ExpectedVfModuleRequest.json"), ServiceInstancesRequest.class); ServiceInstancesRequest actualRequest = reqBuilder.buildVFModuleDeleteRequest("vnfId", "vfModuleId", ModelType.vfModule); - assertThat(actualRequest, sameBeanAs(expectedRequest)); + assertThat(actualRequest).usingRecursiveComparison().isEqualTo(expectedRequest); } @Test @@ -147,7 +144,7 @@ public class BpmnRequestBuilderTest { ServiceInstancesRequest expectedRequest = mapper .readValue(new File(RESOURCE_PATH + "ExpectedVolumeGroupRequest.json"), ServiceInstancesRequest.class); ServiceInstancesRequest actualRequest = reqBuilder.buildVolumeGroupDeleteRequest("vnfId", "volumeGroupId"); - assertThat(actualRequest, sameBeanAs(expectedRequest)); + assertThat(actualRequest).usingRecursiveComparison().isEqualTo(expectedRequest); } @Test @@ -186,7 +183,6 @@ public class BpmnRequestBuilderTest { doReturn(filters).when(reqBuilder).createQueryRequest("vnfId", vnfId); doReturn(Optional.of(serviceRequest)).when(reqBuilder).findServiceInstanceRequest(filters); - CloudConfiguration result = reqBuilder.mapCloudConfigurationVnf(vnfId); assertEquals("tenantId", result.getTenantId()); assertEquals("cloudOwner", result.getCloudOwner()); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/AbstractRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/AbstractRestHandlerTest.java index a304278e6c..75cea4d06c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/AbstractRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/AbstractRestHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import java.net.MalformedURLException; import java.net.URL; @@ -58,7 +57,7 @@ public class AbstractRestHandlerTest { doReturn(Optional.of(selfLinkURL)).when(restHandler).buildSelfLinkUrl("http://localhost:8080/v1", "requestId"); ServiceInstancesResponse actualResponse = restHandler.createResponse("instanceId", "requestId", mockRequestContext); - assertThat(actualResponse, sameBeanAs(expectedResponse)); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -69,6 +68,6 @@ public class AbstractRestHandlerTest { "http://some.domain.com:30277/onap/so/infra/orchestrationRequests/v7/4d0437c3-ee48-4361-a4f7-e1613c82493a")); Optional resultURL = restHandler.buildSelfLinkUrl(initialLink, requestId); - assertThat(resultURL, sameBeanAs(expectedLink)); + assertThat(resultURL).usingRecursiveComparison().isEqualTo(expectedLink); } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandlerTest.java index 8c17237830..4c155d0663 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import java.util.HashMap; @@ -98,7 +97,7 @@ public class NetworkRestHandlerTest { .setRequestUri("http://localhost:8080/serviceInstances").setApiVersion("v8").build(); RequestClientParameter actual = restHandler.buildRequestParams(createTestRequest(), "http://localhost:8080/serviceInstances", "requestId", "serviceInstanceId", "networkId"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -116,7 +115,7 @@ public class NetworkRestHandlerTest { expected.setRequestUrl("http://localhost:9090"); InfraActiveRequests actual = restHandler.createInfraActiveRequestForDelete("requestId", "serviceInstanceId", "networkId", "userId", "VID", "http://localhost:9090"); - assertThat(actual, sameBeanAs(expected).ignoring("startTime")); + assertThat(actual).usingRecursiveComparison().ignoringFields("startTime").isEqualTo(expected); Mockito.verify(infraActiveRequestsClient, Mockito.times(1)).save(actual); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandlerTest.java index 4a655e5f3f..6b30a13602 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -81,7 +80,7 @@ public class ServiceInstanceRestHandlerTest { doReturn(expected).when(catalogDbClient) .findServiceRecipeByActionAndServiceModelUUID(Action.createInstance.toString(), "testModelId"); Recipe actual = restHandler.findServiceRecipe("testModelId", Action.createInstance.toString()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); Mockito.verify(catalogDbClient, Mockito.times(1)) .findServiceRecipeByActionAndServiceModelUUID(Action.createInstance.toString(), "testModelId"); } @@ -95,7 +94,7 @@ public class ServiceInstanceRestHandlerTest { doReturn(expected).when(catalogDbClient).findServiceRecipeByActionAndServiceModelUUID( Action.createInstance.toString(), "d88da85c-d9e8-4f73-b837-3a72a431622b"); Recipe actual = restHandler.findServiceRecipe("testModelId", Action.createInstance.toString()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); Mockito.verify(catalogDbClient, Mockito.times(1)) .findServiceRecipeByActionAndServiceModelUUID(Action.createInstance.toString(), "testModelId"); Mockito.verify(catalogDbClient, Mockito.times(1)).findServiceRecipeByActionAndServiceModelUUID( @@ -144,7 +143,7 @@ public class ServiceInstanceRestHandlerTest { .setRequestUri("http://localhost:8080/serviceInstances").setApiVersion("v8").build(); RequestClientParameter actual = restHandler.buildRequestParams(createTestRequest(), "http://localhost:8080/serviceInstances", "requestId", "serviceInstanceId"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -161,7 +160,7 @@ public class ServiceInstanceRestHandlerTest { expected.setRequestScope(ModelType.service.toString()); InfraActiveRequests actual = restHandler.createInfraActiveRequestForDelete("requestId", "serviceInstanceId", "userId", "VID", "http://localhost:9090"); - assertThat(actual, sameBeanAs(expected).ignoring("startTime")); + assertThat(actual).usingRecursiveComparison().ignoringFields("startTime").isEqualTo(expected); Mockito.verify(infraActiveRequestsClient, Mockito.times(1)).save(actual); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VfModuleRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VfModuleRestHandlerTest.java index 2071e18430..3c863a430c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VfModuleRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VfModuleRestHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -82,7 +81,7 @@ public class VfModuleRestHandlerTest { ModelType.vfModule.toString(), Action.createInstance.toString()); Recipe actual = restHandler.findVfModuleRecipe("testModelId", ModelType.vfModule.toString(), Action.createInstance.toString()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); Mockito.verify(catalogDbClient, Mockito.times(1)) .getFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction("testModelId", ModelType.vfModule.toString(), Action.createInstance.toString()); @@ -99,7 +98,7 @@ public class VfModuleRestHandlerTest { ModelType.vfModule.toString(), Action.createInstance.toString()); Recipe actual = restHandler.findVfModuleRecipe("testModelId", ModelType.vfModule.toString(), Action.createInstance.toString()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); Mockito.verify(catalogDbClient, Mockito.times(1)) .getFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction("testModelId", ModelType.vfModule.toString(), Action.createInstance.toString()); @@ -145,7 +144,7 @@ public class VfModuleRestHandlerTest { .setRequestUri("http://localhost:8080/serviceInstances").setApiVersion("v8").build(); RequestClientParameter actual = restHandler.buildRequestParams(createTestRequest(), "http://localhost:8080/serviceInstances", "requestId", "serviceInstanceId", "vnfId", "vfModuleId"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -164,7 +163,7 @@ public class VfModuleRestHandlerTest { expected.setRequestScope(ModelType.vfModule.toString()); InfraActiveRequests actual = restHandler.createInfraActiveRequestForDelete("requestId", "vfModuleId", "serviceInstanceId", "vnfId", "userId", "VID", "http://localhost:9090"); - assertThat(actual, sameBeanAs(expected).ignoring("startTime")); + assertThat(actual).usingRecursiveComparison().ignoringFields("startTime").isEqualTo(expected); Mockito.verify(infraActiveRequestsClient, Mockito.times(1)).save(actual); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandlerTest.java index a60958ac28..34547c031c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandlerTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import java.util.HashMap; @@ -41,7 +40,6 @@ import org.onap.so.apihandlerinfra.Action; import org.onap.so.apihandlerinfra.Constants; import org.onap.so.constants.Status; import org.onap.so.db.catalog.beans.Recipe; -import org.onap.so.db.catalog.beans.ServiceRecipe; import org.onap.so.db.catalog.client.CatalogDbClient; import org.onap.so.db.request.beans.InfraActiveRequests; import org.onap.so.db.request.client.RequestsDbClient; @@ -73,11 +71,9 @@ public class VnfRestHandlerTest { @Test public void test_find_vnf_recipe() { - ServiceRecipe expected = new ServiceRecipe(); - expected.setOrchestrationUri("/mso/async/services/WorkflowActionBB"); Recipe actual = restHandler.findVnfModuleRecipe("testModelId", ModelType.vnf.toString(), Action.createInstance.toString()); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual.getOrchestrationUri()).isEqualTo("/mso/async/services/WorkflowActionBB"); } @Test @@ -109,7 +105,7 @@ public class VnfRestHandlerTest { .setRequestUri("http://localhost:8080/serviceInstances").setApiVersion("v8").build(); RequestClientParameter actual = restHandler.buildRequestParams(createTestRequest(), "http://localhost:8080/serviceInstances", "requestId", "serviceInstanceId", "vnfId"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -127,7 +123,7 @@ public class VnfRestHandlerTest { expected.setRequestScope(ModelType.vnf.toString()); InfraActiveRequests actual = restHandler.createInfraActiveRequestForDelete("requestId", "serviceInstanceId", "vnfId", "userId", "VID", "http://localhost:9090"); - assertThat(actual, sameBeanAs(expected).ignoring("startTime")); + assertThat(actual).usingRecursiveComparison().ignoringFields("startTime").isEqualTo(expected); Mockito.verify(infraActiveRequestsClient, Mockito.times(1)).save(actual); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandlerTest.java index bdef8fb9e6..1f15af7b79 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandlerTest.java @@ -20,8 +20,7 @@ package org.onap.so.apihandlerinfra.infra.rest.handler; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import java.util.HashMap; @@ -99,7 +98,7 @@ public class VolumeRestHandlerTest { .setRequestUri("http://localhost:8080/serviceInstances").setApiVersion("v8").build(); RequestClientParameter actual = restHandler.buildRequestParams(createTestRequest(), "http://localhost:8080/serviceInstances", "requestId", "serviceInstanceId", "vnfId", "volumeGroupId"); - assertThat(actual, sameBeanAs(expected)); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -118,7 +117,7 @@ public class VolumeRestHandlerTest { expected.setRequestUrl("http://localhost:9090"); InfraActiveRequests actual = restHandler.createInfraActiveRequestForDelete("requestId", "volumeGroupId", "serviceInstanceId", "vnfId", "userId", "VID", "http://localhost:9090"); - assertThat(actual, sameBeanAs(expected).ignoring("startTime")); + assertThat(actual).usingRecursiveComparison().ignoringFields("startTime").isEqualTo(expected); Mockito.verify(infraActiveRequestsClient, Mockito.times(1)).save(actual); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java index 8fe7e9f56f..17b8d8a333 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/helpers/ActivateVnfDBHelperTest.java @@ -20,6 +20,7 @@ package org.onap.so.apihandlerinfra.tenantisolation.helpers; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; import org.onap.so.apihandlerinfra.BaseTest; @@ -27,9 +28,6 @@ import org.onap.so.apihandlerinfra.tenantisolationbeans.DistributionStatus; import org.onap.so.db.request.beans.OperationalEnvDistributionStatus; import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus; import org.springframework.beans.factory.annotation.Autowired; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; -import static org.hamcrest.MatcherAssert.assertThat; - public class ActivateVnfDBHelperTest extends BaseTest { @@ -84,7 +82,7 @@ public class ActivateVnfDBHelperTest extends BaseTest { // test insert method OperationalEnvDistributionStatus distStatus1 = dbHelper.insertRecordToOperationalEnvDistributionStatus( distributionId1, operationalEnvironmentId, serviceModelVersionId1, requestId, statusOk, ""); - assertThat(distStatus1, sameBeanAs(expectedDistStatus)); + assertThat(distStatus1).usingRecursiveComparison().isEqualTo(expectedDistStatus); // prepare updated expected object OperationalEnvDistributionStatus expectedUpdatedDistStatus = expectedDistStatus; @@ -94,7 +92,7 @@ public class ActivateVnfDBHelperTest extends BaseTest { // test update method - statusOk to statusError OperationalEnvDistributionStatus distStatus2 = dbHelper.updateStatusInOperationalEnvDistributionStatus(distStatus1, statusError, errorReason); - assertThat(distStatus2, sameBeanAs(expectedUpdatedDistStatus)); + assertThat(distStatus2).usingRecursiveComparison().isEqualTo(expectedUpdatedDistStatus); } @@ -105,7 +103,7 @@ public class ActivateVnfDBHelperTest extends BaseTest { OperationalEnvServiceModelStatus serviceModelStatus1 = dbHelper.insertRecordToOperationalEnvServiceModelStatus( requestId, operationalEnvironmentId, serviceModelVersionId1, statusOk, recoveryActionRetry, retryCountThree, workloadContext1, vnfOperationalEnvironmentId); - assertThat(serviceModelStatus1, sameBeanAs(expectedServiceModelStatus)); + assertThat(serviceModelStatus1).usingRecursiveComparison().isEqualTo(expectedServiceModelStatus); // prepare updated expected object OperationalEnvServiceModelStatus expectedUpdatedServiceModelStatus = serviceModelStatus1; @@ -116,7 +114,7 @@ public class ActivateVnfDBHelperTest extends BaseTest { OperationalEnvServiceModelStatus serviceModelStatus2 = dbHelper.updateRetryCountAndStatusInOperationalEnvServiceModelStatus(serviceModelStatus1, statusError, retryCountZero); - assertThat(serviceModelStatus2, sameBeanAs(expectedUpdatedServiceModelStatus)); + assertThat(serviceModelStatus2).usingRecursiveComparison().isEqualTo(expectedUpdatedServiceModelStatus); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java index c33eca9d66..598fa477b6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java @@ -20,6 +20,7 @@ package org.onap.so.apihandlerinfra.tenantisolation.process; +import static org.assertj.core.api.Assertions.assertThat; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.containing; import static com.github.tomakehurst.wiremock.client.WireMock.get; @@ -27,7 +28,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.put; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import java.util.UUID; @@ -53,7 +53,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - public class CreateEcompOperationalEnvironmentTest extends BaseTest { @Autowired @@ -135,7 +134,8 @@ public class CreateEcompOperationalEnvironmentTest extends BaseTest { try { createEcompOpEn.execute(uuid, getCloudOrchestrationRequest()); } catch (ApiException e) { - assertThat(e, sameBeanAs((ApiException) expectedException).ignoring("cause")); + assertThat(e).usingRecursiveComparison().ignoringFields("cause") + .isEqualTo((ApiException) expectedException); } } diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java index c19d25ef71..fe9358fa60 100644 --- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java +++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java @@ -20,8 +20,7 @@ package org.onap.so.db.catalog.data.repository; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.List; import org.junit.Assert; @@ -41,7 +40,6 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { @Autowired private CvnfcCustomizationRepository cvnfcCustomizationRepository; - @Test public void findAllTest() { List cvnfcCustomizationList = cvnfcCustomizationRepository.findAll(); @@ -73,7 +71,6 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { vnfResourceCustomizations.add(vnfResourceCustomization); vnfResourceCustomization.setVnfResources(vnfResource); - VnfcCustomization vnfcCustomization = setUpVnfcCustomization(); vnfcCustomization.setModelCustomizationUUID("d95d704a-9ff2-11e8-98d0-529269fb1459"); @@ -84,10 +81,10 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { for (CvnfcCustomization foundCvnfcCustomization : cvnfcCustomizationList) { if (foundCvnfcCustomization.getDescription().equalsIgnoreCase(cvnfcCustomization.getDescription())) { - assertThat(cvnfcCustomization, - sameBeanAs(foundCvnfcCustomization).ignoring("id").ignoring("created") - .ignoring("vnfVfmoduleCvnfcConfigurationCustomization") - .ignoring("vnfResourceCusteModelCustomizationUUID")); + assertThat(cvnfcCustomization) + .usingRecursiveComparison().ignoringFields("id", "created", + "vnfVfmoduleCvnfcConfigurationCustomization", "vnfResourceCusteModelCustomizationUUID") + .isEqualTo(foundCvnfcCustomization); matchFound = true; break; @@ -121,23 +118,21 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { vnfResourceCustomizations.add(vnfResourceCustomization); vnfResourceCustomization.setVnfResources(vnfResource); - VnfcCustomization vnfcCustomization = setUpVnfcCustomization(); vnfcCustomization.setModelCustomizationUUID("d95d704a-9ff2-11e8-98d0-529269fb1459"); cvnfcCustomizationRepository.save(cvnfcCustomization); - List cvnfcCustomizationList = cvnfcCustomizationRepository.findByModelCustomizationUUID("cf9f6efc-9f14-11e8-98d0-529269fb1459"); boolean matchFound = false; for (CvnfcCustomization foundCvnfcCustomization : cvnfcCustomizationList) { if (foundCvnfcCustomization.getDescription().equalsIgnoreCase(cvnfcCustomization.getDescription())) { - assertThat(cvnfcCustomization, - sameBeanAs(foundCvnfcCustomization).ignoring("id").ignoring("created") - .ignoring("vnfVfmoduleCvnfcConfigurationCustomization") - .ignoring("vnfResourceCusteModelCustomizationUUID")); + assertThat(cvnfcCustomization) + .usingRecursiveComparison().ignoringFields("id", "created", + "vnfVfmoduleCvnfcConfigurationCustomization", "vnfResourceCusteModelCustomizationUUID") + .isEqualTo(foundCvnfcCustomization); matchFound = true; break; @@ -146,7 +141,6 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { Assert.assertTrue(matchFound); } - @Test @Transactional public void createAndGetCvnfcCustomizationTest() { @@ -172,8 +166,6 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { vnfResourceCustomizations.add(vnfResourceCustomization); vnfResourceCustomization.setVnfResources(vnfResource); - - VnfcCustomization vnfcCustomization = setUpVnfcCustomization(); vnfcCustomization.setModelCustomizationUUID("d95d704a-9ff2-11e8-98d0-529269fb1459"); @@ -182,13 +174,11 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest { CvnfcCustomization cvnfcCustomizationList = cvnfcCustomizationRepository.findOneByModelCustomizationUUID("cf9f6efc-9f14-11e8-98d0-529269fb1459"); - assertThat(cvnfcCustomization, - sameBeanAs(cvnfcCustomizationList).ignoring("id").ignoring("created") - .ignoring("vnfVfmoduleCvnfcConfigurationCustomization") - .ignoring("vnfResourceCusteModelCustomizationUUID")); + assertThat(cvnfcCustomization) + .usingRecursiveComparison().ignoringFields("id", "created", + "vnfVfmoduleCvnfcConfigurationCustomization", "vnfResourceCusteModelCustomizationUUID") + .isEqualTo(cvnfcCustomizationList); } - - } diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepositoryTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepositoryTest.java index 8bf47e71d3..8e440523ba 100644 --- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepositoryTest.java +++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepositoryTest.java @@ -20,8 +20,7 @@ package org.onap.so.db.catalog.data.repository; -import static com.shazam.shazamcrest.MatcherAssert.assertThat; -import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; +import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -60,6 +59,7 @@ public class VnfcCustomizationRepositoryTest extends BaseTest { vnfcCustomizationRepository.findById("cf9f6efc-9f14-11e8-98d0-529269fb1459") .orElseThrow(() -> new NoEntityFoundException("Cannot Find Operation")); - assertThat(vnfcCustomization, sameBeanAs(foundVnfcCustomization).ignoring("created")); + assertThat(vnfcCustomization).usingRecursiveComparison().ignoringFields("created") + .isEqualTo(foundVnfcCustomization); } } diff --git a/pom.xml b/pom.xml index 808e42f5f1..9bc0a61c87 100644 --- a/pom.xml +++ b/pom.xml @@ -847,30 +847,11 @@ openpojo 0.8.13 - - com.shazam - shazamcrest - 0.11 - test - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - com.vaadin.external.google - android-json - - - + org.assertj assertj-core - 3.11.1 + 3.16.0 test