Skip to content

Commit e29b752

Browse files
committed
fix tests
1 parent 7a73ebe commit e29b752

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ public class SnapshotManagerImplTest {
106106
@Before
107107
public void setUp() {
108108
snapshotManager._snapshotPolicyDao = snapshotPolicyDao;
109+
snapshotManager._volsDao = volumeDao;
110+
snapshotManager._accountMgr = accountManager;
109111
}
110112

111113
@After
@@ -435,11 +437,14 @@ public void testListSnapshotPolicies() {
435437
List<SnapshotPolicyVO> mockPolicies = List.of(policy1, policy2);
436438

437439
SearchBuilder<SnapshotPolicyVO> mockSearchBuilder = Mockito.mock(SearchBuilder.class);
440+
SearchBuilder<VolumeVO> mockVolumeSearchBuilder = Mockito.mock(SearchBuilder.class);
438441
SearchCriteria<SnapshotPolicyVO> mockSearchCriteria = Mockito.mock(SearchCriteria.class);
439442

440443
Mockito.when(snapshotPolicyDao.createSearchBuilder()).thenReturn(mockSearchBuilder);
441444
Mockito.when(mockSearchBuilder.entity()).thenReturn(Mockito.mock(SnapshotPolicyVO.class));
442445
Mockito.when(mockSearchBuilder.create()).thenReturn(mockSearchCriteria);
446+
Mockito.when(volumeDao.createSearchBuilder()).thenReturn(mockVolumeSearchBuilder);
447+
Mockito.when(mockVolumeSearchBuilder.entity()).thenReturn(Mockito.mock(VolumeVO.class));
443448
Mockito.when(snapshotPolicyDao.searchAndCount(Mockito.any(), Mockito.any())).thenReturn(new Pair<>(mockPolicies, 2));
444449

445450
Pair<List<? extends SnapshotPolicy>, Integer> result = snapshotManager.listSnapshotPolicies(cmd);
@@ -467,11 +472,14 @@ public void testListSnapshotPolicies_NonRootAdmin() {
467472
List<SnapshotPolicyVO> mockPolicies = List.of(policy1, policy2);
468473

469474
SearchBuilder<SnapshotPolicyVO> mockSearchBuilder = Mockito.mock(SearchBuilder.class);
475+
SearchBuilder<VolumeVO> mockVolumeSearchBuilder = Mockito.mock(SearchBuilder.class);
470476
SearchCriteria<SnapshotPolicyVO> mockSearchCriteria = Mockito.mock(SearchCriteria.class);
471477

472478
Mockito.when(snapshotPolicyDao.createSearchBuilder()).thenReturn(mockSearchBuilder);
473479
Mockito.when(mockSearchBuilder.entity()).thenReturn(Mockito.mock(SnapshotPolicyVO.class));
474480
Mockito.when(mockSearchBuilder.create()).thenReturn(mockSearchCriteria);
481+
Mockito.when(volumeDao.createSearchBuilder()).thenReturn(mockVolumeSearchBuilder);
482+
Mockito.when(mockVolumeSearchBuilder.entity()).thenReturn(Mockito.mock(VolumeVO.class));
475483
Mockito.when(snapshotPolicyDao.searchAndCount(Mockito.any(), Mockito.any())).thenReturn(new Pair<>(mockPolicies, 2));
476484

477485
Pair<List<? extends SnapshotPolicy>, Integer> result = snapshotManager.listSnapshotPolicies(cmd);
@@ -496,11 +504,14 @@ public void testListSnapshotPolicies_RootAdmin() {
496504

497505
SnapshotPolicyVO policy = Mockito.mock(SnapshotPolicyVO.class);
498506
SearchBuilder<SnapshotPolicyVO> mockSearchBuilder = Mockito.mock(SearchBuilder.class);
507+
SearchBuilder<VolumeVO> mockVolumeSearchBuilder = Mockito.mock(SearchBuilder.class);
499508
SearchCriteria<SnapshotPolicyVO> mockSearchCriteria = Mockito.mock(SearchCriteria.class);
500509

501510
Mockito.when(snapshotPolicyDao.createSearchBuilder()).thenReturn(mockSearchBuilder);
502511
Mockito.when(mockSearchBuilder.entity()).thenReturn(Mockito.mock(SnapshotPolicyVO.class));
503512
Mockito.when(mockSearchBuilder.create()).thenReturn(mockSearchCriteria);
513+
Mockito.when(volumeDao.createSearchBuilder()).thenReturn(mockVolumeSearchBuilder);
514+
Mockito.when(mockVolumeSearchBuilder.entity()).thenReturn(Mockito.mock(VolumeVO.class));
504515
Mockito.when(snapshotPolicyDao.searchAndCount(Mockito.any(), Mockito.any())).thenReturn(new Pair<>(List.of(policy), 1));
505516

506517
Pair<List<? extends SnapshotPolicy>, Integer> result = snapshotManager.listSnapshotPolicies(cmd);

0 commit comments

Comments
 (0)