Skip to content

Commit def6dad

Browse files
committed
fix test
1 parent 5b8e568 commit def6dad

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,6 @@ public void testListSnapshotPolicies() {
430430
Mockito.when(caller.getId()).thenReturn(1L);
431431
CallContext.register(Mockito.mock(User.class), caller);
432432

433-
Mockito.when(accountManager.isRootAdmin(1L)).thenReturn(true);
434-
435433
SnapshotPolicyVO policy1 = Mockito.mock(SnapshotPolicyVO.class);
436434
SnapshotPolicyVO policy2 = Mockito.mock(SnapshotPolicyVO.class);
437435
List<SnapshotPolicyVO> mockPolicies = List.of(policy1, policy2);
@@ -464,8 +462,6 @@ public void testListSnapshotPolicies_NonRootAdmin() {
464462
Mockito.when(caller.getId()).thenReturn(2L);
465463
CallContext.register(Mockito.mock(User.class), caller);
466464

467-
Mockito.when(accountManager.isRootAdmin(2L)).thenReturn(false);
468-
469465
SnapshotPolicyVO policy1 = Mockito.mock(SnapshotPolicyVO.class);
470466
SnapshotPolicyVO policy2 = Mockito.mock(SnapshotPolicyVO.class);
471467
List<SnapshotPolicyVO> mockPolicies = List.of(policy1, policy2);
@@ -498,8 +494,6 @@ public void testListSnapshotPolicies_RootAdmin() {
498494
Mockito.when(caller.getId()).thenReturn(1L);
499495
CallContext.register(Mockito.mock(User.class), caller);
500496

501-
Mockito.when(accountManager.isRootAdmin(1L)).thenReturn(true);
502-
503497
SnapshotPolicyVO policy = Mockito.mock(SnapshotPolicyVO.class);
504498
SearchBuilder<SnapshotPolicyVO> mockSearchBuilder = Mockito.mock(SearchBuilder.class);
505499
SearchCriteria<SnapshotPolicyVO> mockSearchCriteria = Mockito.mock(SearchCriteria.class);

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,6 @@ public void testListBackupSchedulesAsRootAdmin() {
18351835
BackupScheduleVO schedule2 = Mockito.mock(BackupScheduleVO.class);
18361836
List<BackupScheduleVO> schedules = List.of(schedule1, schedule2);
18371837

1838-
Mockito.lenient().when(accountManager.isRootAdmin(1L)).thenReturn(true);
18391838
SearchBuilder<BackupScheduleVO> searchBuilder = Mockito.mock(SearchBuilder.class);
18401839
SearchCriteria<BackupScheduleVO> searchCriteria = Mockito.mock(SearchCriteria.class);
18411840
BackupScheduleVO entity = Mockito.mock(BackupScheduleVO.class);

0 commit comments

Comments
 (0)