Skip to content

Commit d46b59e

Browse files
committed
fix tests
1 parent c6ff0f2 commit d46b59e

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

server/src/test/java/com/cloud/template/HypervisorTemplateAdapterTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
import org.apache.cloudstack.framework.events.Event;
5050
import org.apache.cloudstack.framework.events.EventDistributor;
5151
import org.apache.cloudstack.framework.messagebus.MessageBus;
52+
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
53+
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
5254
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
5355
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
5456
import org.apache.cloudstack.storage.heuristics.HeuristicRuleHelper;
@@ -137,6 +139,9 @@ public class HypervisorTemplateAdapterTest {
137139
@Mock
138140
StatsCollector statsCollectorMock;
139141

142+
@Mock
143+
ImageStoreDao _imgStoreDao;
144+
140145
@Mock
141146
Logger loggerMock;
142147

@@ -458,11 +463,13 @@ public void isZoneAndImageStoreAvailableTestZoneIsDisabledShouldReturnFalse() {
458463
@Test
459464
public void isZoneAndImageStoreAvailableTestImageStoreDoesNotHaveEnoughCapacityShouldReturnFalse() {
460465
DataStore dataStoreMock = Mockito.mock(DataStore.class);
466+
ImageStoreVO ImageStoreVOMock = Mockito.mock(ImageStoreVO.class);
461467
Long zoneId = 1L;
462468
Set<Long> zoneSet = null;
463469
boolean isTemplatePrivate = false;
464470
DataCenterVO dataCenterVOMock = Mockito.mock(DataCenterVO.class);
465471

472+
Mockito.when(_imgStoreDao.findById(Mockito.anyLong())).thenReturn(ImageStoreVOMock);
466473
Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dataCenterVOMock);
467474
Mockito.when(dataCenterVOMock.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled);
468475
Mockito.when(statsCollectorMock.imageStoreHasEnoughCapacity(any(DataStore.class))).thenReturn(false);
@@ -477,11 +484,13 @@ public void isZoneAndImageStoreAvailableTestImageStoreDoesNotHaveEnoughCapacityS
477484
@Test
478485
public void isZoneAndImageStoreAvailableTestImageStoreHasEnoughCapacityAndZoneSetIsNullShouldReturnTrue() {
479486
DataStore dataStoreMock = Mockito.mock(DataStore.class);
487+
ImageStoreVO ImageStoreVOMock = Mockito.mock(ImageStoreVO.class);
480488
Long zoneId = 1L;
481489
Set<Long> zoneSet = null;
482490
boolean isTemplatePrivate = false;
483491
DataCenterVO dataCenterVOMock = Mockito.mock(DataCenterVO.class);
484492

493+
Mockito.when(_imgStoreDao.findById(Mockito.anyLong())).thenReturn(ImageStoreVOMock);
485494
Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dataCenterVOMock);
486495
Mockito.when(dataCenterVOMock.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled);
487496
Mockito.when(statsCollectorMock.imageStoreHasEnoughCapacity(any(DataStore.class))).thenReturn(true);
@@ -496,11 +505,13 @@ public void isZoneAndImageStoreAvailableTestImageStoreHasEnoughCapacityAndZoneSe
496505
@Test
497506
public void isZoneAndImageStoreAvailableTestTemplateIsPrivateAndItIsAlreadyAllocatedToTheSameZoneShouldReturnFalse() {
498507
DataStore dataStoreMock = Mockito.mock(DataStore.class);
508+
ImageStoreVO ImageStoreVOMock = Mockito.mock(ImageStoreVO.class);
499509
Long zoneId = 1L;
500510
Set<Long> zoneSet = Set.of(1L);
501511
boolean isTemplatePrivate = true;
502512
DataCenterVO dataCenterVOMock = Mockito.mock(DataCenterVO.class);
503513

514+
Mockito.when(_imgStoreDao.findById(Mockito.anyLong())).thenReturn(ImageStoreVOMock);
504515
Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dataCenterVOMock);
505516
Mockito.when(dataCenterVOMock.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled);
506517
Mockito.when(statsCollectorMock.imageStoreHasEnoughCapacity(any(DataStore.class))).thenReturn(true);
@@ -515,11 +526,13 @@ public void isZoneAndImageStoreAvailableTestTemplateIsPrivateAndItIsAlreadyAlloc
515526
@Test
516527
public void isZoneAndImageStoreAvailableTestTemplateIsPrivateAndItIsNotAlreadyAllocatedToTheSameZoneShouldReturnTrue() {
517528
DataStore dataStoreMock = Mockito.mock(DataStore.class);
529+
ImageStoreVO ImageStoreVOMock = Mockito.mock(ImageStoreVO.class);
518530
Long zoneId = 1L;
519531
Set<Long> zoneSet = new HashSet<>();
520532
boolean isTemplatePrivate = true;
521533
DataCenterVO dataCenterVOMock = Mockito.mock(DataCenterVO.class);
522534

535+
Mockito.when(_imgStoreDao.findById(Mockito.anyLong())).thenReturn(ImageStoreVOMock);
523536
Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dataCenterVOMock);
524537
Mockito.when(dataCenterVOMock.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled);
525538
Mockito.when(statsCollectorMock.imageStoreHasEnoughCapacity(any(DataStore.class))).thenReturn(true);

0 commit comments

Comments
 (0)