From 552b66a92b70211812a139369a3255dd13ecc4ee Mon Sep 17 00:00:00 2001 From: vempo Date: Sat, 17 Nov 2018 22:18:53 +0200 Subject: Unit-tests in notification, validation, VLM Unit-tests for mappers in a few libraries. (cherry picked from commit cc628e4c8258820e2fb0a47acdcc47c15a2b71bd) Change-Id: I250ff97e5dfe90fa05ec329e25cf6a14dac261f7 Issue-ID: SDC-1917 Signed-off-by: vempo --- .../notifications-rest-services/pom.xml | 10 ++ .../mapping/MapNotificationsStatusToDtoTest.java | 57 +++++++ .../openecomp-sdc-common-rest/pom.xml | 21 +++ .../common/mapping/MapErrorCodeToDtoTest.java | 49 ++++++ .../common/mapping/MapErrorMessageToDtoTest.java | 46 ++++++ .../sdcrests/mapping/EchoMapMappingTest.java | 54 +++++++ .../validation-rest-services/pom.xml | 117 ++++++++------- ...ileResponseToValidationFileResponseDtoTest.java | 46 ++++++ .../vendor-license-rest-services/pom.xml | 166 ++++++++++++--------- .../MapLimitRequestDtoToLimitEntityTest.java | 69 +++++++++ .../src/test/resources/logback-test.xml | 13 ++ 11 files changed, 521 insertions(+), 127 deletions(-) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/test/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorCodeToDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorMessageToDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/mapping/EchoMapMappingTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/src/test/java/org/openecomp/sdcrests/validation/rest/mapping/MapValidationFileResponseToValidationFileResponseDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntityTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/resources/logback-test.xml diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml index cb7e6f048e..3cb2627df2 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml @@ -50,6 +50,16 @@ spring-context ${spring.framework.version} + + junit + junit + test + + + org.mockito + mockito-core + test + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/test/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/test/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDtoTest.java new file mode 100644 index 0000000000..22071d5670 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/src/test/java/org/openecomp/sdcrests/notifications/rest/mapping/MapNotificationsStatusToDtoTest.java @@ -0,0 +1,57 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.notifications.rest.mapping; + +import static org.junit.Assert.assertEquals; + +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import org.junit.Test; +import org.mockito.Mockito; +import org.openecomp.sdc.notification.dtos.NotificationsStatus; +import org.openecomp.sdcrests.notifications.types.NotificationsStatusDto; + +public class MapNotificationsStatusToDtoTest { + + @Test() + public void testConversion() { + + final NotificationsStatus source = Mockito.mock(NotificationsStatus.class); + + final UUID lastScanned = UUID.randomUUID(); + Mockito.when(source.getLastScanned()).thenReturn(lastScanned); + + final List newEntries = Collections.singletonList(UUID.randomUUID()); + Mockito.when(source.getNewEntries()).thenReturn(newEntries); + + final UUID endOfPage = UUID.randomUUID(); + Mockito.when(source.getEndOfPage()).thenReturn(endOfPage); + + final long numOfNotSeenNotifications = 499436903074L; + Mockito.when(source.getNumOfNotSeenNotifications()).thenReturn(numOfNotSeenNotifications); + + final NotificationsStatusDto target = new NotificationsStatusDto(); + final MapNotificationsStatusToDto mapper = new MapNotificationsStatusToDto(); + mapper.doMapping(source, target); + + assertEquals(lastScanned, target.getLastScanned()); + assertEquals(newEntries, target.getNewEntries()); + assertEquals(endOfPage, target.getEndOfPage()); + assertEquals(numOfNotSeenNotifications, target.getNumOfNotSeenNotifications()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 99a9b69588..0116fba3bd 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -1,4 +1,20 @@ + + @@ -56,6 +72,11 @@ ${javax.servlet.version} provided + + junit + junit + test + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorCodeToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorCodeToDtoTest.java new file mode 100644 index 0000000000..9c6ee5a573 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorCodeToDtoTest.java @@ -0,0 +1,49 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.common.mapping; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.openecomp.sdc.common.errors.ErrorCategory; +import org.openecomp.sdc.common.errors.ErrorCode; +import org.openecomp.sdcrests.common.types.ErrorCodeDto; + +/** + * This class was generated. + */ +public class MapErrorCodeToDtoTest { + + @Test() + public void testConversion() { + + final String id = "f42e101e-595a-4826-bd15-832e5436a527"; + final String message = "45255428-0e3a-4e93-8d40-ac970dce2d48"; + final ErrorCategory category = ErrorCategory.SECURITY; + + final ErrorCode source = + new ErrorCode.ErrorCodeBuilder().withId(id).withMessage(message).withCategory(category).build(); + + final ErrorCodeDto target = new ErrorCodeDto(); + final MapErrorCodeToDto mapper = new MapErrorCodeToDto(); + mapper.doMapping(source, target); + + assertEquals(id, target.getId()); + assertEquals(message, target.getMessage()); + assertEquals(category, target.getCategory()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorMessageToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorMessageToDtoTest.java new file mode 100644 index 0000000000..fb05ffde8b --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/common/mapping/MapErrorMessageToDtoTest.java @@ -0,0 +1,46 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.common.mapping; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + +import org.junit.Test; +import org.openecomp.sdc.datatypes.error.ErrorLevel; +import org.openecomp.sdc.datatypes.error.ErrorMessage; +import org.openecomp.sdcrests.common.types.ErrorMessageDto; + +/** + * This class was generated. + */ +public class MapErrorMessageToDtoTest { + + @Test() + public void testConversion() { + + final ErrorLevel level = ErrorLevel.INFO; + final String message = "75e35f57-1489-453d-ab49-f3ae2b85b9fa"; + final ErrorMessage source = new ErrorMessage(level, message); + + final ErrorMessageDto target = new ErrorMessageDto(); + final MapErrorMessageToDto mapper = new MapErrorMessageToDto(); + mapper.doMapping(source, target); + + assertSame(level, target.getLevel()); + assertEquals(message, target.getMessage()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/mapping/EchoMapMappingTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/mapping/EchoMapMappingTest.java new file mode 100644 index 0000000000..ef41a34492 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/mapping/EchoMapMappingTest.java @@ -0,0 +1,54 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.mapping; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.junit.Test; + +/** + * This class was generated. + */ +public class EchoMapMappingTest { + + @Test() + public void testConversion() { + + final int size = 5; + + final Map source = new HashMap<>(size); + for (int i = 0; i < size; i++) { + source.put(String.valueOf(i), UUID.randomUUID().toString()); + } + + final Map target = new HashMap<>(size); + final EchoMapMapping mapper = new EchoMapMapping(); + mapper.doMapping(source, target); + + assertEquals(size, target.size()); + + for (Map.Entry entry : target.entrySet()) { + String value = source.get(entry.getKey()); + assertNotNull(value); + assertEquals(value, entry.getValue()); + } + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index fa135feeae..70dd36f05a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -1,4 +1,20 @@ + + @@ -12,59 +28,49 @@ - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - - + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + - - - javax.inject - javax.inject - ${javax.inject.version} - provided - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + javax.inject + javax.inject + ${javax.inject.version} + provided + javax.ws.rs javax.ws.rs-api @@ -117,8 +123,11 @@ ${jersey.multipart.version} provided - - + + junit + junit + test + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/src/test/java/org/openecomp/sdcrests/validation/rest/mapping/MapValidationFileResponseToValidationFileResponseDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/src/test/java/org/openecomp/sdcrests/validation/rest/mapping/MapValidationFileResponseToValidationFileResponseDtoTest.java new file mode 100644 index 0000000000..07476e29b4 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/src/test/java/org/openecomp/sdcrests/validation/rest/mapping/MapValidationFileResponseToValidationFileResponseDtoTest.java @@ -0,0 +1,46 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.validation.rest.mapping; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.openecomp.sdc.heat.datatypes.structure.ValidationStructureList; +import org.openecomp.sdc.validation.types.ValidationFileResponse; +import org.openecomp.sdcrests.validation.types.ValidationFileResponseDto; + +/** + * This class was generated. + */ +public class MapValidationFileResponseToValidationFileResponseDtoTest { + + @Test() + public void testConversion() { + + final ValidationFileResponse source = new ValidationFileResponse(); + + final ValidationStructureList validationData = new ValidationStructureList(); + source.setValidationData(validationData); + + final ValidationFileResponseDto target = new ValidationFileResponseDto(); + + final MapValidationFileResponseToValidationFileResponseDto mapper = new MapValidationFileResponseToValidationFileResponseDto(); + mapper.doMapping(source, target); + + assertEquals(validationData, target.getValidationData()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 23ef2a596d..66aaa5e742 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -1,81 +1,101 @@ - - 4.0.0 + - vendor-license-rest-services - vendor-license-rest-services + + 4.0.0 - - org.openecomp.sdc.onboarding - vendor-license-rest - 1.3.3-SNAPSHOT - ../ - + vendor-license-rest-services + vendor-license-rest-services + + org.openecomp.sdc.onboarding + vendor-license-rest + 1.3.3-SNAPSHOT + ../ + - - ${project.build.directory}/generated-sources/error-codes - + + ${project.build.directory}/generated-sources/error-codes + - - - ${project.groupId} - vendor-license-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-vendor-license-api - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-item-permissions-manager - ${project.version} - + + + ${project.groupId} + vendor-license-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-license-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-item-permissions-manager + ${project.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - org.apache.httpcomponents - httpcore - ${http.core.version} - - - org.testng - testng - test - - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - org.openecomp.sdc - openecomp-sdc-vendor-software-product-manager - ${project.version} - - - org.openecomp.sdc - item-rest-services - ${project.version} - - - org.openecomp.sdc - unique-type-rest-types - ${project.version} - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + org.apache.httpcomponents + httpcore + ${http.core.version} + + + org.testng + testng + test + + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-manager + ${project.version} + + + org.openecomp.sdc + item-rest-services + ${project.version} + + + org.openecomp.sdc + unique-type-rest-types + ${project.version} + + + junit + junit + test + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntityTest.java new file mode 100644 index 0000000000..f492f526bb --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntityTest.java @@ -0,0 +1,69 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.vendorlicense.rest.mapping; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity; +import org.openecomp.sdc.vendorlicense.dao.types.LimitType; +import org.openecomp.sdcrests.vendorlicense.types.LimitRequestDto; + +/** + * This class was generated. + */ +public class MapLimitRequestDtoToLimitEntityTest { + + @Test() + public void testConversion() { + + final LimitRequestDto source = new LimitRequestDto(); + + final String name = "d35387ba-b2da-4b96-b4bb-3fcc947729b6"; + source.setName(name); + + final String description = "b58fb468-023f-4336-86de-3ef588f60d75"; + source.setDescription(description); + + final LimitType type = LimitType.Vendor; + source.setType(type.name()); + + final String metric = "139d3366-fd6b-4167-83cc-ac78de1d08ab"; + source.setMetric(metric); + + final String value = "eb4a1266-92ea-4c9d-82aa-12c2cf8b3d63"; + source.setValue(value); + + final String unit = "86c66de7-a02c-461b-88ce-6875cf9b1225"; + source.setUnit(unit); + + final String time = "7352b6b5-2d47-4bfc-a7d1-5fe2b1fba4e0"; + source.setTime(time); + + final LimitEntity target = new LimitEntity(); + final MapLimitRequestDtoToLimitEntity mapper = new MapLimitRequestDtoToLimitEntity(); + mapper.doMapping(source, target); + + assertEquals(name, target.getName()); + assertEquals(description, target.getDescription()); + assertEquals(type, target.getType()); + assertEquals(metric, target.getMetric()); + assertEquals(value, target.getValue()); + assertEquals(unit, target.getUnit()); + assertEquals(time, target.getTime()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/resources/logback-test.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..f9fa3d88e8 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/resources/logback-test.xml @@ -0,0 +1,13 @@ + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file -- cgit 1.2.3-korg