diff options
author | avigaffa <avi.gaffa@amdocs.com> | 2018-06-18 19:56:59 +0300 |
---|---|---|
committer | avigaffa <avi.gaffa@amdocs.com> | 2018-06-19 11:34:41 +0300 |
commit | aae39fb87077e4c2738d9ad11c4be25c6770d70d (patch) | |
tree | 5c86223c55e4b5c20a1d8f2ea2e2946de98eb17e /openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src | |
parent | dda451b79ca2f160f0a1179820a91623c0c8979e (diff) |
Change TestNG scope
Change TestNG scope to compile in artifact generator
Change-Id: I3e1edffd35a78b2cce99bac683eee32769920216
Issue-ID: SDC-1435
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src')
-rw-r--r-- | openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java (renamed from openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java) | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java index 0a87c29f50..a4fcd24c25 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java @@ -1,5 +1,6 @@ package org.openecomp.sdc.itempermissions.dao.impl; +import java.util.Optional; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -7,6 +8,7 @@ import org.mockito.Spy; import org.openecomp.sdc.common.session.SessionContextProviderFactory; import org.openecomp.sdc.itempermissions.PermissionsRules; import org.openecomp.sdc.itempermissions.dao.ItemPermissionsDao; +import org.openecomp.sdc.itempermissions.dao.UserPermissionsDao; import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity; import org.testng.Assert; import org.testng.annotations.BeforeMethod; @@ -35,12 +37,14 @@ public class PermissionsServicesImplTest { private static final String CHANGE_PERMISSIONS = "Change_Item_Permissions"; static { - SessionContextProviderFactory.getInstance().createInterface().create("testUser1"); + SessionContextProviderFactory.getInstance().createInterface().create("testUser1", "dox"); } @Mock private ItemPermissionsDao permissionsDaoMock; @Mock + private UserPermissionsDao userPermissionsDao; // do not delete. needed for permissionService + @Mock private PermissionsRules permissionsRules; @InjectMocks @Spy @@ -75,7 +79,7 @@ public class PermissionsServicesImplTest { @Test public void testIsAllowed(){ - when(permissionsDaoMock.getUserItemPermiission(ITEM1_ID,USER1_ID)).thenReturn(PERMISSION); + when(permissionsDaoMock.getUserItemPermission(ITEM1_ID,USER1_ID)).thenReturn(Optional.of(PERMISSION)); when(permissionsRules.isAllowed(PERMISSION,ACTION_SUBMIT)).thenReturn(true); Boolean result = permissionsServices.isAllowed(ITEM1_ID,USER1_ID,ACTION_SUBMIT); @@ -86,16 +90,15 @@ public class PermissionsServicesImplTest { @Test public void testUpdatePermissions(){ - Set<String> addedUsers = new HashSet<String>(); + Set<String> addedUsers = new HashSet<>(); addedUsers.add(USER2_ID); - permissionsServices.updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers, - new HashSet<String>()); + permissionsServices.updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers, new HashSet<>()); verify(permissionsRules).executeAction(ITEM1_ID,USER1_ID,CHANGE_PERMISSIONS); - verify(permissionsRules).updatePermission(ITEM1_ID,USER1_ID,PERMISSION,addedUsers,new HashSet<String>()); + verify(permissionsRules).updatePermission(ITEM1_ID,USER1_ID,PERMISSION,addedUsers, new HashSet<>()); verify(permissionsDaoMock).updateItemPermissions(ITEM1_ID,PERMISSION,addedUsers,new - HashSet<String>()); + HashSet<>()); } |