Skip to content

Commit 3499240

Browse files
committed
Fix ut failure after event logging
1 parent 6854ff4 commit 3499240

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Map;
2828

29+
import com.cloud.event.ActionEventUtils;
2930
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
3031
import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
3132
import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
@@ -514,7 +515,13 @@ public void validateAndUpdatApiAndSecretKeyIfNeededTest() {
514515
@Test
515516
public void validateAndUpdatUserApiKeyAccess() {
516517
Mockito.doReturn("Enabled").when(UpdateUserCmdMock).getApiKeyAccess();
517-
accountManagerImpl.validateAndUpdateUserApiKeyAccess(UpdateUserCmdMock, userVoMock, accountMock);
518+
try (MockedStatic<ActionEventUtils> eventUtils = Mockito.mockStatic(ActionEventUtils.class)) {
519+
Mockito.when(ActionEventUtils.onActionEvent(Mockito.anyLong(), Mockito.anyLong(),
520+
Mockito.anyLong(),
521+
Mockito.anyString(), Mockito.anyString(),
522+
Mockito.anyLong(), Mockito.anyString())).thenReturn(1L);
523+
accountManagerImpl.validateAndUpdateUserApiKeyAccess(UpdateUserCmdMock, userVoMock, accountMock);
524+
}
518525

519526
Mockito.verify(userVoMock).setApiKeyAccess(true);
520527
}
@@ -528,7 +535,13 @@ public void validateAndUpdatUserApiKeyAccessInvalidParameter() {
528535
@Test
529536
public void validateAndUpdatAccountApiKeyAccess() {
530537
Mockito.doReturn("Inherit").when(UpdateAccountCmdMock).getApiKeyAccess();
531-
accountManagerImpl.validateAndUpdateAccountApiKeyAccess(UpdateAccountCmdMock, accountVoMock);
538+
try (MockedStatic<ActionEventUtils> eventUtils = Mockito.mockStatic(ActionEventUtils.class)) {
539+
Mockito.when(ActionEventUtils.onActionEvent(Mockito.anyLong(), Mockito.anyLong(),
540+
Mockito.anyLong(),
541+
Mockito.anyString(), Mockito.anyString(),
542+
Mockito.anyLong(), Mockito.anyString())).thenReturn(1L);
543+
accountManagerImpl.validateAndUpdateAccountApiKeyAccess(UpdateAccountCmdMock, accountVoMock);
544+
}
532545

533546
Mockito.verify(accountVoMock).setApiKeyAccess(null);
534547
}

0 commit comments

Comments
 (0)