diff options
Diffstat (limited to 'openecomp-be/backend')
2 files changed, 154 insertions, 145 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java index e124f841e7..2755edeafd 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java @@ -16,7 +16,32 @@ package org.openecomp.sdc.itempermissions.dao.impl; -import org.mockito.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_ID_PROP; +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_CHANGED; +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_GRANTED; +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_ITEM; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.session.SessionContextProviderFactory; import org.openecomp.sdc.itempermissions.PermissionsServices; @@ -25,123 +50,104 @@ import org.openecomp.sdc.notification.services.NotificationPropagationManager; import org.openecomp.sdc.notification.services.SubscriptionService; import org.openecomp.sdc.versioning.AsdcItemManager; import org.openecomp.sdc.versioning.types.Item; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +@ExtendWith(MockitoExtension.class) +class PermissionsManagerImplTest { + + private static final String ITEM1_ID = "1"; + private static final String PERMISSION = "Contributor"; + private static final String ACTION = "Change_Item_Permissions"; + private static final String USER = "user"; + private static final String AFFECTED_USER1 = "affected_user1"; + private static final String AFFECTED_USER2 = "affected_user2"; + private static final String AFFECTED_USER3 = "affected_user3"; + private static final String tenant = "dox"; + + @Mock + private PermissionsServices permissionsServicesMock; + @Mock + private AsdcItemManager asdcItemManagerMock; + @Mock + private SubscriptionService subscriptionServiceMock; + @Mock + private NotificationPropagationManager notifierMock; + @Captor + private ArgumentCaptor<Event> eventArgumentCaptor; + + @InjectMocks + private PermissionsManagerImpl permissionsManager; + + @BeforeEach + public void setUp() throws Exception { + SessionContextProviderFactory.getInstance().createInterface().create(USER, + tenant); + MockitoAnnotations.initMocks(this); + } -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.*; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; + @Test + void testUpdateItemPermissionsWhenNotAllowed() { + doReturn(false).when(permissionsServicesMock).isAllowed(ITEM1_ID, USER, ACTION); + final HashSet<String> removedUsersIds = new HashSet<>(); + final Set<String> addedUsersIds = Collections.singleton(AFFECTED_USER1); + Assertions.assertThrows(CoreException.class, () -> { + permissionsManager.updateItemPermissions(ITEM1_ID, PERMISSION, addedUsersIds, removedUsersIds); + }); + } -/** - * Created by ayalaben on 7/6/2017 - */ -public class PermissionsManagerImplTest { - - private static final String ITEM1_ID = "1"; - private static final String PERMISSION = "Contributor"; - private static final String ACTION = "Change_Item_Permissions"; - private static final String USER = "user"; - private static final String AFFECTED_USER1 = "affected_user1"; - private static final String AFFECTED_USER2 = "affected_user2"; - private static final String AFFECTED_USER3 = "affected_user3"; - private static final String tenant = "dox"; - - @Mock - private PermissionsServices permissionsServicesMock; - @Mock - private AsdcItemManager asdcItemManagerMock; - @Mock - private SubscriptionService subscriptionServiceMock; - @Mock - private NotificationPropagationManager notifierMock; - @Captor - private ArgumentCaptor<Event> eventArgumentCaptor; - - @InjectMocks - private PermissionsManagerImpl permissionsManager; - - - @BeforeMethod - public void setUp() throws Exception { - SessionContextProviderFactory.getInstance().createInterface().create(USER, - tenant); - MockitoAnnotations.initMocks(this); - } - - @Test(expectedExceptions = CoreException.class, expectedExceptionsMessageRegExp = "Permissions " + - "Error. The user does not have permission to perform this action.") - public void testUpdateItemPermissionsWhenNotAllowed() { - doReturn(false).when(permissionsServicesMock).isAllowed(ITEM1_ID, USER, ACTION); - - permissionsManager - .updateItemPermissions(ITEM1_ID, PERMISSION, Collections.singleton(AFFECTED_USER1), - new HashSet<>()); - } - - @Test - public void testUpdateItemPermissions() { - doReturn(true).when(permissionsServicesMock).isAllowed(ITEM1_ID, USER, ACTION); - Item item = new Item(); - item.setName("Item 1 Name"); - doReturn(item).when(asdcItemManagerMock).get(ITEM1_ID); - - Set<String> addedUsersIds = + @Test + void testUpdateItemPermissions() { + doReturn(true).when(permissionsServicesMock).isAllowed(ITEM1_ID, USER, ACTION); + Item item = new Item(); + item.setName("Item 1 Name"); + doReturn(item).when(asdcItemManagerMock).get(ITEM1_ID); + + Set<String> addedUsersIds = Stream.of(AFFECTED_USER1, AFFECTED_USER2).collect(Collectors.toSet()); - Set<String> removedUsersIds = Collections.singleton(AFFECTED_USER3); - permissionsManager + Set<String> removedUsersIds = Collections.singleton(AFFECTED_USER3); + permissionsManager .updateItemPermissions(ITEM1_ID, PERMISSION, addedUsersIds, removedUsersIds); - verify(permissionsServicesMock) + verify(permissionsServicesMock) .updateItemPermissions(ITEM1_ID, PERMISSION, addedUsersIds, removedUsersIds); - for (String addedUsersId : addedUsersIds) { - verifyCallsToNotificationsFramework(addedUsersId, true); - } - for (String removedUsersId : removedUsersIds) { - verifyCallsToNotificationsFramework(removedUsersId, false); + for (String addedUsersId : addedUsersIds) { + verifyCallsToNotificationsFramework(addedUsersId, true); + } + for (String removedUsersId : removedUsersIds) { + verifyCallsToNotificationsFramework(removedUsersId, false); + } } - } - @Test - public void testListUserPermittedItems(){ - permissionsManager.listUserPermittedItems(AFFECTED_USER1,PERMISSION); + @Test + void testListUserPermittedItems() { + permissionsManager.listUserPermittedItems(AFFECTED_USER1, PERMISSION); - verify(permissionsServicesMock) + verify(permissionsServicesMock) .listUserPermittedItems(AFFECTED_USER1, PERMISSION); - } - - private void verifyCallsToNotificationsFramework(String affectedUser, boolean permissionGranted) { - verifyCallToSubscriptionService(affectedUser, permissionGranted); - verifyDirectNotificationCallParameters(affectedUser, permissionGranted); - } - - private void verifyDirectNotificationCallParameters(String affectedUser, boolean permissionGranted) { - verify(notifierMock).directNotification(eventArgumentCaptor.capture(), Matchers.eq(affectedUser)); - Event event = eventArgumentCaptor.getValue(); - assertTrue(event.getEventType().equals(PERMISSION_CHANGED)); - Map<String, Object> attributes = event.getAttributes(); - assertEquals(attributes.get(PERMISSION_GRANTED), permissionGranted); - assertEquals(attributes.get(ITEM_ID_PROP), ITEM1_ID); - assertEquals(attributes.get(PERMISSION_ITEM), PERMISSION); - } - - private void verifyCallToSubscriptionService(String affectedUser, boolean permissionGranted) { - if (permissionGranted) { - verify(subscriptionServiceMock).subscribe(affectedUser, ITEM1_ID); - } else { - verify(subscriptionServiceMock).unsubscribe(affectedUser, ITEM1_ID); } - } + private void verifyCallsToNotificationsFramework(String affectedUser, boolean permissionGranted) { + verifyCallToSubscriptionService(affectedUser, permissionGranted); + verifyDirectNotificationCallParameters(affectedUser, permissionGranted); + } + + private void verifyDirectNotificationCallParameters(String affectedUser, boolean permissionGranted) { + verify(notifierMock).directNotification(eventArgumentCaptor.capture(), Matchers.eq(affectedUser)); + Event event = eventArgumentCaptor.getValue(); + assertTrue(event.getEventType().equals(PERMISSION_CHANGED)); + Map<String, Object> attributes = event.getAttributes(); + assertEquals(attributes.get(PERMISSION_GRANTED), permissionGranted); + assertEquals(attributes.get(ITEM_ID_PROP), ITEM1_ID); + assertEquals(attributes.get(PERMISSION_ITEM), PERMISSION); + } + + private void verifyCallToSubscriptionService(String affectedUser, boolean permissionGranted) { + if (permissionGranted) { + verify(subscriptionServiceMock).subscribe(affectedUser, ITEM1_ID); + } else { + verify(subscriptionServiceMock).unsubscribe(affectedUser, ITEM1_ID); + } + } } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImplTest.java index 6a310e04c5..ef82828a1a 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImplTest.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,53 +20,56 @@ package org.openecomp.sdc.vendorsoftwareproduct.impl; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.vendorsoftwareproduct.ManualVspToscaManager; import org.openecomp.sdc.vendorsoftwareproduct.services.ManualVspDataCollectionService; +@ExtendWith(MockitoExtension.class) public class ManualVspToscaManagerImplTest { - private static final String USER = "manualVspToscaTestUser"; - private static final String INVALID_VSP_ID = "Invalid_Vsp_Id"; - private static final String VSP_ID = "Vsp_Id_1"; - private static final String VSP_VERSION = "1.0"; - - private static final String RELEASE_VENDOR = "Vendor-1"; - private static final String COMPONENT_ID = "Component_id"; - private static final String COMPONENT_NAME = "Component_name"; - private static final String SP_PART_NUMBER_1 = "Part_number_123"; - private static final String FEATURE_GROUP_ID_1 = "Feature_Group_id_1"; - private static final String MANUFACTURER_REF_1 = "Manufacturer_Ref_1"; - private static final String VENDOR_MODEL_1 = "Deployment_Flavor_Model_1"; - private static final int NUM_CPUS_1 = 1; - private static final String DISK_SIZE_1 = "2 GB"; - private static final String MEM_SIZE_1 = "8 GB"; - - private static final String SP_PART_NUMBER_2 = "Part_number_345"; - private static final String FEATURE_GROUP_ID_2 = "Feature_Group_id_2"; - private static final String MANUFACTURER_REF_2 = "Manufacturer_Ref_2"; - private static final String VENDOR_MODEL_2 = "Deployment_Flavor_Model_2"; - private static final int NUM_CPUS_2 = 4; - private static final String DISK_SIZE_2 = "3 GB"; - private static final String MEM_SIZE_2 = "2 GB"; - - private static final String IMAGE_VERSION_1 = "3.16.1"; - private static final String IMAGE_HASH_1 = "65edfgye3256hjutve"; - private static final String IMAGE_FILE_NAME_1 = "image-file-name1"; - private static final String IMAGE_VERSION_2 = "3.1.9"; - private static final String IMAGE_HASH_2 = "84rtedfe3256hjutaw"; - private static final String IMAGE_FILE_NAME_2 = "image-file-name1"; - - private ManualVspToscaManager manualVspToscaManager = new ManualVspToscaManagerImpl(); - - @Spy - @InjectMocks - private ManualVspToscaManagerImpl manualVspToscaManagerMock; - - @Mock - private ManualVspDataCollectionService manualVspDataCollectionServiceMock; + private static final String USER = "manualVspToscaTestUser"; + private static final String INVALID_VSP_ID = "Invalid_Vsp_Id"; + private static final String VSP_ID = "Vsp_Id_1"; + private static final String VSP_VERSION = "1.0"; + + private static final String RELEASE_VENDOR = "Vendor-1"; + private static final String COMPONENT_ID = "Component_id"; + private static final String COMPONENT_NAME = "Component_name"; + private static final String SP_PART_NUMBER_1 = "Part_number_123"; + private static final String FEATURE_GROUP_ID_1 = "Feature_Group_id_1"; + private static final String MANUFACTURER_REF_1 = "Manufacturer_Ref_1"; + private static final String VENDOR_MODEL_1 = "Deployment_Flavor_Model_1"; + private static final int NUM_CPUS_1 = 1; + private static final String DISK_SIZE_1 = "2 GB"; + private static final String MEM_SIZE_1 = "8 GB"; + + private static final String SP_PART_NUMBER_2 = "Part_number_345"; + private static final String FEATURE_GROUP_ID_2 = "Feature_Group_id_2"; + private static final String MANUFACTURER_REF_2 = "Manufacturer_Ref_2"; + private static final String VENDOR_MODEL_2 = "Deployment_Flavor_Model_2"; + private static final int NUM_CPUS_2 = 4; + private static final String DISK_SIZE_2 = "3 GB"; + private static final String MEM_SIZE_2 = "2 GB"; + + private static final String IMAGE_VERSION_1 = "3.16.1"; + private static final String IMAGE_HASH_1 = "65edfgye3256hjutve"; + private static final String IMAGE_FILE_NAME_1 = "image-file-name1"; + private static final String IMAGE_VERSION_2 = "3.1.9"; + private static final String IMAGE_HASH_2 = "84rtedfe3256hjutaw"; + private static final String IMAGE_FILE_NAME_2 = "image-file-name1"; + + private ManualVspToscaManager manualVspToscaManager = new ManualVspToscaManagerImpl(); + + @Spy + @InjectMocks + private ManualVspToscaManagerImpl manualVspToscaManagerMock; + + @Mock + private ManualVspDataCollectionService manualVspDataCollectionServiceMock; /* @Test |