Merge branch '4.18'
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index 1c7f165..e08e3775 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -1298,50 +1298,6 @@
Assert.assertEquals(expectedIsNotPossibleToResize, result);
}
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestDifferentOfferings() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 2l, false, true, false);
- }
-
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestDifferentOfferingsCustom() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 2l, true, true, false);
- }
-
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestSameOfferingsCustom() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 1l, true, true, true);
- }
-
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestSameOfferingsNotCustom() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 1l, false, true, false);
- }
-
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestDifferentOfferingsAndNullOffering() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 2l, true, false, false);
- }
- @Test
- public void isNewDiskOfferingTheSameAndCustomServiceOfferingTestSameOfferingsNullOffering() {
- prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(1l, 1l, false, false, false);
- }
-
- private void prepareAndRunIsNewDiskOfferingTheSameAndCustomServiceOffering(long existingDiskOfferingId, long newDiskOfferingId, boolean isCustomized,
- boolean isNotNullServiceOffering, boolean expectedResult) {
- DiskOfferingVO existingDiskOffering = Mockito.mock(DiskOfferingVO.class);
- when(existingDiskOffering.getId()).thenReturn(existingDiskOfferingId);
- DiskOfferingVO newDiskOffering = Mockito.mock(DiskOfferingVO.class);
- when(newDiskOffering.getId()).thenReturn(newDiskOfferingId);
- if(isNotNullServiceOffering) {
- ServiceOfferingVO serviceOfferingVO = Mockito.mock(ServiceOfferingVO.class);
- when(serviceOfferingVO.isCustomized()).thenReturn(isCustomized);
- when(serviceOfferingDao.findServiceOfferingByComputeOnlyDiskOffering(anyLong())).thenReturn(serviceOfferingVO);
- }
- boolean result = volumeApiServiceImpl.isNewDiskOfferingTheSameAndCustomServiceOffering(existingDiskOffering, newDiskOffering);
- Assert.assertEquals(expectedResult, result);
- }
-
@Test (expected = InvalidParameterValueException.class)
public void checkIfVolumeCanBeReassignedTestNullVolume() {
volumeApiServiceImpl.validateVolume(volumeVoMock.getUuid(), null);
