Change TestNG scope

[sdc.git] / openecomp-be / lib / openecomp-item-permissions-lib / openecomp-item-permissions-core / src / test / java / org / openecomp / sdc / itempermissions / dao / impl / PermissionsServicesImplTest.java

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
similarity index 87%
rename from openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
rename to openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
index 0a87c29..a4fcd24 100644 (file)
--- 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<>());
   }