fixing tests

Author: klaus.freitas.scclouds

server/src/test/java/com/cloud/user/AccountManagerImplTest.java

@@ -1303,8 +1303,6 @@ public void createApiKeyAndSecretKeyTestAllowedOnAccount() {
         Mockito.when(registerUserKeysCmdMock.getRules()).thenReturn(rules);
         Mockito.when(registerUserKeysCmdMock.getUserId()).thenReturn(userId);
 
-
-        UserVO mockUser = new UserVO(userId);
         ApiKeyPairPermissionVO permissionVO = new ApiKeyPairPermissionVO();
         ApiKeyPairVO apiKeyPairVO = new ApiKeyPairVO();
         apiKeyPairVO.setUserId(userId);
@@ -1319,6 +1317,8 @@ public void createApiKeyAndSecretKeyTestAllowedOnAccount() {
                 new RolePermissionVO(1L, "api", RolePermissionEntity.Permission.ALLOW, "description")
         ));
         Mockito.when(roleServiceMock.findRole(Mockito.anyLong())).thenReturn(new RoleVO());
+        Mockito.doReturn(true).when(roleServiceMock).roleHasPermission(Mockito.any(), Mockito.any());
+
 
         Assert.assertEquals((long) accountManagerImpl.createApiKeyAndSecretKey(registerUserKeysCmdMock).getUserId(), userId);
         Mockito.verify(keyPairPermissionsDaoMock, Mockito.times(1)).persist(Mockito.any(ApiKeyPairPermissionVO.class));
@@ -1359,6 +1359,8 @@ public void createApiAndSecretKeyTestWithNonEmptyDates() {
                 new RolePermissionVO(1L, "api", RolePermissionEntity.Permission.ALLOW, "description")
         ));
         Mockito.when(roleServiceMock.findRole(Mockito.anyLong())).thenReturn(new RoleVO());
+        Mockito.doReturn(true).when(roleServiceMock).roleHasPermission(Mockito.any(), Mockito.any());
+
 
         ApiKeyPair response = accountManagerImpl.createApiKeyAndSecretKey(registerUserKeysCmdMock);
         Mockito.verify(keyPairDaoMock, Mockito.times(1)).persist(Mockito.any(ApiKeyPairVO.class));

server/src/test/java/org/apache/cloudstack/acl/RoleManagerImplTest.java

@@ -90,17 +90,17 @@ public void setUpRoleVisibilityTests() {
         Mockito.doReturn(RolePermissionEntity.Permission.ALLOW).when(rolePermission1Mock).getPermission();
         Mockito.doReturn(RolePermissionEntity.Permission.ALLOW).when(rolePermission2Mock).getPermission();
 
-        List<RolePermission> lessPermissionsRolePermissions = Collections.singletonList(rolePermission1Mock);
+        List<RolePermissionEntity> lessPermissionsRolePermissions = Collections.singletonList(rolePermission1Mock);
         Mockito.doReturn(1L).when(lessPermissionsRoleMock).getId();
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(1L)).thenReturn(lessPermissionsRolePermissions);
+        Mockito.when(roleManagerImpl.findAllRolePermissionsEntityBy(lessPermissionsRoleMock.getId())).thenReturn(lessPermissionsRolePermissions);
 
-        List<RolePermission> morePermissionsRolePermissions = List.of(rolePermission1Mock, rolePermission2Mock);
+        List<RolePermissionEntity> morePermissionsRolePermissions = List.of(rolePermission1Mock, rolePermission2Mock);
         Mockito.doReturn(2L).when(morePermissionsRoleMock).getId();
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(morePermissionsRoleMock.getId())).thenReturn(morePermissionsRolePermissions);
+        Mockito.when(roleManagerImpl.findAllRolePermissionsEntityBy(morePermissionsRoleMock.getId())).thenReturn(morePermissionsRolePermissions);
 
-        List<RolePermission> differentPermissionsRolePermissions = Collections.singletonList(rolePermission2Mock);
+        List<RolePermissionEntity> differentPermissionsRolePermissions = Collections.singletonList(rolePermission2Mock);
         Mockito.doReturn(3L).when(differentPermissionsRoleMock).getId();
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(differentPermissionsRoleMock.getId())).thenReturn(differentPermissionsRolePermissions);
+        Mockito.when(roleManagerImpl.findAllRolePermissionsEntityBy(differentPermissionsRoleMock.getId())).thenReturn(differentPermissionsRolePermissions);
     }
 
     @Before
@@ -226,7 +226,6 @@ public void removeRolesIfNeededTestRoleWithMoreAndSamePermissionsKeepRoles() {
         List<Role> roles = new ArrayList<>();
 
         List<RolePermission> callerAccountRolePermissions = List.of(rolePermission1Mock, rolePermission2Mock);
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(callerAccountRoleMock.getId())).thenReturn(callerAccountRolePermissions);
 
         roles.add(callerAccountRoleMock);
         roles.add(lessPermissionsRoleMock);
@@ -243,9 +242,8 @@ public void removeRolesIfNeededTestRoleWithLessPermissionsRemoveRoles() {
         setUpRoleVisibilityTests();
         List<Role> roles = new ArrayList<>();
 
-        List<RolePermission> callerAccountRolePermissions = Collections.singletonList(rolePermission1Mock);
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(callerAccountRoleMock.getId())).thenReturn(callerAccountRolePermissions);
-
+        List<RolePermissionEntity> callerAccountRolePermissions = Collections.singletonList(rolePermission1Mock);
+        Mockito.when(roleManagerImpl.findAllRolePermissionsEntityBy(callerAccountRoleMock.getId())).thenReturn(callerAccountRolePermissions);
 
         roles.add(callerAccountRoleMock);
         roles.add(morePermissionsRoleMock);
@@ -261,8 +259,8 @@ public void removeRolesIfNeededTestRoleWithDifferentPermissionsRemoveRoles() {
         setUpRoleVisibilityTests();
         List<Role> roles = new ArrayList<>();
 
-        List<RolePermission> callerAccountRolePermissions = Collections.singletonList(rolePermission1Mock);
-        Mockito.when(roleManagerImpl.findAllPermissionsBy(callerAccountRoleMock.getId())).thenReturn(callerAccountRolePermissions);
+        List<RolePermissionEntity> callerAccountRolePermissions = Collections.singletonList(rolePermission1Mock);
+        Mockito.when(roleManagerImpl.findAllRolePermissionsEntityBy(callerAccountRoleMock.getId())).thenReturn(callerAccountRolePermissions);
 
         roles.add(callerAccountRoleMock);
         roles.add(differentPermissionsRoleMock);
@@ -301,7 +299,7 @@ public void roleHasPermissionTestRolePermissionsDeniedApiContainRoleToAccessAllo
         rolePermissions.put("api1", Permission.ALLOW);
         rolePermissions.put("api2", Permission.DENY);
 
-        boolean result = roleManagerImpl.roleHasPermission(rolePermissions, Collections.singletonList(rolePermission1Mock));
+        boolean result = roleManagerImpl.roleHasPermission(rolePermissions, List.of(rolePermission1Mock, rolePermission2Mock));
 
         Assert.assertFalse(result);
     }