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 --- .../types/NotificationEntityDtoTest.java | 64 ++++++++++++++ .../types/NotificationsStatusDtoTest.java | 38 +++++++++ .../UpdateNotificationResponseStatusTest.java | 99 ++++++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationEntityDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationsStatusDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/UpdateNotificationResponseStatusTest.java (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationEntityDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationEntityDtoTest.java new file mode 100644 index 0000000000..e9e2bee613 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationEntityDtoTest.java @@ -0,0 +1,64 @@ +/*- + * ============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.notifications.types; + +import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.Map; +import java.util.UUID; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + +class NotificationEntityDtoTest { + @Test + void testBean() { + assertThat(NotificationEntityDto.class, allOf( + hasValidBeanConstructor(), + hasValidGettersAndSetters() + )); + } + @Test + void validateArgConstructors() { + + final boolean read = false; + final UUID eventId = new UUID(10,20); + final String eventType = "testType"; + final Map eventAttributes = Collections.singletonMap("testKey","testValue"); + NotificationEntityDto notificationEntityDto = new NotificationEntityDto(read,eventId,eventType,eventAttributes); + assertEquals(notificationEntityDto.isRead(), read); + assertEquals(notificationEntityDto.getEventId(), eventId); + assertEquals(notificationEntityDto.getEventType(), eventType); + assertEquals(notificationEntityDto.getEventAttributes(), eventAttributes); + + final String dataTime = "10-10-2019"; + notificationEntityDto = new NotificationEntityDto(read, eventId, eventType, eventAttributes, dataTime); + assertEquals(notificationEntityDto.isRead(), read); + assertEquals(notificationEntityDto.getEventId(), eventId); + assertEquals(notificationEntityDto.getEventType(), eventType); + assertEquals(notificationEntityDto.getEventAttributes(), eventAttributes); + assertEquals(notificationEntityDto.getDateTime(), dataTime); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationsStatusDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationsStatusDtoTest.java new file mode 100644 index 0000000000..fe236f33ce --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/NotificationsStatusDtoTest.java @@ -0,0 +1,38 @@ +/*- + * ============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.notifications.types; + +import org.junit.jupiter.api.Test; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.MatcherAssert.assertThat; + +class NotificationsStatusDtoTest { + @Test + void testBean() { + assertThat(NotificationsStatusDto.class, allOf( + hasValidBeanConstructor(), + hasValidGettersAndSetters() + )); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/UpdateNotificationResponseStatusTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/UpdateNotificationResponseStatusTest.java new file mode 100644 index 0000000000..20d23fbf7e --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/src/test/java/org/openecomp/sdcrests/notifications/types/UpdateNotificationResponseStatusTest.java @@ -0,0 +1,99 @@ +/*- + * ============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.notifications.types; + +import org.junit.jupiter.api.Test; +import org.openecomp.sdc.datatypes.error.ErrorLevel; +import org.openecomp.sdc.datatypes.error.ErrorMessage; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class UpdateNotificationResponseStatusTest { + @Test + void testBean() { + assertThat(UpdateNotificationResponseStatus.class, allOf( + hasValidBeanConstructor(), + hasValidGettersAndSetters() + )); + } + @Test + void validateAddStructureErrorCorrectlyAddsOneError() { + UpdateNotificationResponseStatus updateNotificationResponseStatus = new UpdateNotificationResponseStatus(); + + assertTrue(updateNotificationResponseStatus.getErrors().isEmpty()); + final String notificationId = "testId"; + final ErrorMessage testError = new ErrorMessage(ErrorLevel.ERROR,"test Error"); + updateNotificationResponseStatus.addStructureError(notificationId, testError); + + assertFalse(updateNotificationResponseStatus.getErrors().isEmpty()); + assertEquals(updateNotificationResponseStatus.getErrors().size(),1); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId).size(),1); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId).get(0),testError); + } + @Test + void validateAddStructureErrorCorrectlyAddsTwoErrorsToOneKey() { + UpdateNotificationResponseStatus updateNotificationResponseStatus = new UpdateNotificationResponseStatus(); + + assertTrue(updateNotificationResponseStatus.getErrors().isEmpty()); + final String notificationId = "testId"; + final ErrorMessage testError01 = new ErrorMessage(ErrorLevel.ERROR,"test Error01"); + final ErrorMessage testError02 = new ErrorMessage(ErrorLevel.ERROR,"test Error02"); + final List testErrorsList = new ArrayList<>(); + Collections.addAll(testErrorsList,testError01,testError02); + updateNotificationResponseStatus.addStructureError(notificationId, testError01); + updateNotificationResponseStatus.addStructureError(notificationId, testError02); + + assertFalse(updateNotificationResponseStatus.getErrors().isEmpty()); + assertEquals(updateNotificationResponseStatus.getErrors().size(),1); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId).size(),2); + assertArrayEquals(updateNotificationResponseStatus.getErrors().get(notificationId).toArray(), testErrorsList.toArray()); + } + @Test + void validateAddStructureErrorCorrectlyAddsTwoErrorsToTwoKeys() { + UpdateNotificationResponseStatus updateNotificationResponseStatus = new UpdateNotificationResponseStatus(); + + assertTrue(updateNotificationResponseStatus.getErrors().isEmpty()); + final String notificationId01 = "testId01"; + final ErrorMessage testError01 = new ErrorMessage(ErrorLevel.ERROR,"test Error01"); + final String notificationId02 = "testId02"; + final ErrorMessage testError02 = new ErrorMessage(ErrorLevel.ERROR,"test Error02"); + updateNotificationResponseStatus.addStructureError(notificationId01, testError01); + updateNotificationResponseStatus.addStructureError(notificationId02, testError02); + + assertFalse(updateNotificationResponseStatus.getErrors().isEmpty()); + assertEquals(updateNotificationResponseStatus.getErrors().size(),2); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId01).size(),1); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId01).get(0), testError01); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId02).size(),1); + assertEquals(updateNotificationResponseStatus.getErrors().get(notificationId02).get(0), testError02); + } +} -- cgit 1.2.3-korg