From 7962fe55692954548da260f31528dfc434f17755 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Tue, 20 Aug 2019 15:53:19 +0200 Subject: increasing test coverage in openecomp-be api Issue-ID: SDC-2326 Signed-off-by: Bartosz Gardziejewski Change-Id: I93cc5183190fcbada2349b18f14fbec9c28f1ae5 --- .../rest/mapping/MapConflictToDtoTest.java | 85 ++++++++++++++++++++++ .../mapping/MapItemVersionConflictToDtoTest.java | 73 +++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapItemVersionConflictToDtoTest.java (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDtoTest.java new file mode 100644 index 0000000000..a37be72944 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDtoTest.java @@ -0,0 +1,85 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.openecomp.sdcrests.conflict.rest.mapping; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.openecomp.conflicts.types.Conflict; +import org.openecomp.sdc.datatypes.model.ElementType; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; +import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NetworkEntity; +import org.openecomp.sdcrests.conflict.types.ConflictDto; +import static org.junit.Assert.assertEquals; + +public class MapConflictToDtoTest { + + private MapConflictToDto mapConflictToDto; + + private final String testId = "testId"; + private final String testName = "testName"; + + @Before + public void setUp() { + mapConflictToDto = new MapConflictToDto(); + } + + @Test + public void validDoMappingIsCorrectForNetworkEntity() { + final NetworkEntity testYoursNetworkEntity = new NetworkEntity(); + testYoursNetworkEntity.setId("YoursId"); + final NetworkEntity testTheirsNetworkEntity = new NetworkEntity(); + testTheirsNetworkEntity.setId("TheirsId"); + final Conflict testConflict = new Conflict<>(testId, ElementType.Network, testName); + testConflict.setYours(testYoursNetworkEntity); + testConflict.setTheirs(testTheirsNetworkEntity); + final ConflictDto testConflictDto = new ConflictDto(); + + mapConflictToDto.doMapping(testConflict, testConflictDto); + + assertEquals(testConflict.getId(), testConflictDto.getId()); + assertEquals(testConflict.getName(), testConflictDto.getName()); + assertEquals(testConflict.getType(), testConflictDto.getType()); + assertEquals(testConflict.getYours().getId(), testConflictDto.getYours().get("id")); + assertEquals(testConflict.getTheirs().getId(), testConflictDto.getTheirs().get("id")); + } + + @Test + public void validDoMappingIsCorrectForLicenseAgreement() { + final LicenseAgreementEntity testYoursLicenseAgreementEntity = new LicenseAgreementEntity(); + testYoursLicenseAgreementEntity.setName("YoursName"); + final LicenseAgreementEntity testTheirsLicenseAgreementEntity = new LicenseAgreementEntity(); + testTheirsLicenseAgreementEntity.setName("TheirsName"); + final Conflict testConflict = new Conflict<>(testId, ElementType.LicenseAgreement, testName); + testConflict.setYours(testYoursLicenseAgreementEntity); + testConflict.setTheirs(testTheirsLicenseAgreementEntity); + final ConflictDto testConflictDto = new ConflictDto(); + + mapConflictToDto.doMapping(testConflict, testConflictDto); + + assertEquals(testConflict.getId(), testConflictDto.getId()); + assertEquals(testConflict.getName(), testConflictDto.getName()); + assertEquals(testConflict.getType(), testConflictDto.getType()); + assertEquals(testConflict.getYours().getName(), testConflictDto.getYours().get("name")); + assertEquals(testConflict.getTheirs().getName(), testConflictDto.getTheirs().get("name")); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapItemVersionConflictToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapItemVersionConflictToDtoTest.java new file mode 100644 index 0000000000..0f1a007fce --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapItemVersionConflictToDtoTest.java @@ -0,0 +1,73 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. 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.openecomp.sdcrests.conflict.rest.mapping; + +import org.junit.Before; +import org.junit.Test; +import org.openecomp.conflicts.types.ConflictInfo; +import org.openecomp.conflicts.types.ItemVersionConflict; +import org.openecomp.sdc.datatypes.model.ElementType; +import org.openecomp.sdcrests.conflict.types.ConflictInfoDto; +import org.openecomp.sdcrests.conflict.types.ItemVersionConflictDto; + +import java.util.Collection; +import java.util.Collections; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + +public class MapItemVersionConflictToDtoTest { + + private MapItemVersionConflictToDto mapItemVersionConflictToDto; + + + @Before + public void setUp() { + mapItemVersionConflictToDto = new MapItemVersionConflictToDto(); + } + + @Test + public void validDoMappingCorrectMapsVersionConflicts() { + + final String testId01 = "testId01"; + final String testName01 = "testName01"; + final String testId02 = "testId02"; + final String testName02 = "testName02"; + + final ItemVersionConflict testSource = new ItemVersionConflict(); + Collections.addAll(testSource.getElementConflicts(), + new ConflictInfo(testId01, ElementType.itemVersion, testName01), + new ConflictInfo(testId02, ElementType.itemVersion, testName02) + ); + final ItemVersionConflictDto testTarget = new ItemVersionConflictDto(); + + mapItemVersionConflictToDto.doMapping(testSource, testTarget); + + assertArrayEquals( + testSource.getElementConflicts().stream().map(ConflictInfo::getName).toArray(), + testTarget.getConflictInfoList().stream().map(ConflictInfoDto::getName).toArray() + ); + assertArrayEquals( + testSource.getElementConflicts().stream().map(ConflictInfo::getId).toArray(), + testTarget.getConflictInfoList().stream().map(ConflictInfoDto::getId).toArray() + ); + } +} -- cgit 1.2.3-korg