Skip to content

Commit ffc8f62

Browse files
committed
fix test
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent d748e4b commit ffc8f62

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,18 +570,19 @@ public void updateRegisteredTemplateDetails_UpdatesTemplateSuccessfully() {
570570
SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails =
571571
Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class);
572572
VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
573+
String templateName = "templateName";
574+
when(templateVO.getName()).thenReturn(templateName);
573575
GuestOSVO guestOS = Mockito.mock(GuestOSVO.class);
574576

575577
when(templateDetails.getGuestOs()).thenReturn("Debian");
576578
when(templateDetails.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
577-
when(templateDetails.getName()).thenReturn("templateName");
578579
when(vmTemplateDao.findById(templateId)).thenReturn(templateVO);
579580
when(guestOSDao.findOneByDisplayName("Debian")).thenReturn(guestOS);
580581
when(guestOS.getId()).thenReturn(10L);
581582
when(vmTemplateDao.update(templateVO.getId(), templateVO)).thenReturn(true);
582583
doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId, Hypervisor.HypervisorType.KVM);
583584
doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
584-
"templateName", zoneId);
585+
templateName, zoneId);
585586

586587
systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, templateDetails, zoneId);
587588

@@ -590,7 +591,7 @@ public void updateRegisteredTemplateDetails_UpdatesTemplateSuccessfully() {
590591
verify(vmTemplateDao).update(templateVO.getId(), templateVO);
591592
verify(systemVmTemplateRegistration).updateSystemVMEntries(templateId, Hypervisor.HypervisorType.KVM);
592593
verify(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
593-
"templateName", zoneId);
594+
templateName, zoneId);
594595
}
595596

596597
@Test
@@ -620,24 +621,25 @@ public void updateRegisteredTemplateDetails_SkipsGuestOSUpdateWhenNotFound() {
620621
SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails =
621622
Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class);
622623
VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
624+
String templateName = "templateName";
625+
when(templateVO.getName()).thenReturn(templateName);
623626

624627
when(templateDetails.getGuestOs()).thenReturn("NonExistentOS");
625628
when(templateDetails.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
626-
when(templateDetails.getName()).thenReturn("templateName");
627629
when(vmTemplateDao.findById(templateId)).thenReturn(templateVO);
628630
when(guestOSDao.findOneByDisplayName("NonExistentOS")).thenReturn(null);
629631
when(vmTemplateDao.update(templateVO.getId(), templateVO)).thenReturn(true);
630632
doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId, Hypervisor.HypervisorType.KVM);
631633
doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
632-
"templateName", zoneId);
634+
templateName, zoneId);
633635

634636
systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, templateDetails, zoneId);
635637

636638
verify(templateVO, never()).setGuestOSId(anyInt());
637639
verify(vmTemplateDao).update(templateVO.getId(), templateVO);
638640
verify(systemVmTemplateRegistration).updateSystemVMEntries(templateId, Hypervisor.HypervisorType.KVM);
639641
verify(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
640-
"templateName", zoneId);
642+
templateName, zoneId);
641643
}
642644

643645
@Test

0 commit comments

Comments
 (0)