Shahar Havivi has uploaded a new change for review. Change subject: test: fix osRepository NPE in AddVmCommandTest ......................................................................
test: fix osRepository NPE in AddVmCommandTest Change-Id: I3b56cdb63a903a6b9c5ccc8ea1f9af0f1ad0f046 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/28306/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index da9ae09..7eb40fc 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -115,9 +116,13 @@ @Mock OsRepository osRepository; + @Before + public void InitTest() { + mockOsRepository(); + } + @Test public void create10GBVmWith11GbAvailableAndA5GbBuffer() throws Exception { - mockOsRepository(); VM vm = createVm(); AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd = createVmFromTemplateCommand(vm); @@ -199,7 +204,6 @@ VDSGroup vdsGroup = createVdsGroup(); - mockOsRepository(); mockStorageDomainDAOGetForStoragePool(); mockVmTemplateDAOReturnVmTemplate(); mockDiskImageDAOGetSnapshotById(); @@ -224,7 +228,6 @@ @Test public void isVirtioScsiEnabledDefaultedToTrue() { - mockOsRepository(); AddVmCommand<VmManagementParametersBase> cmd = setupCanAddVmTests(0, 0); doReturn(createVdsGroup()).when(cmd).getVdsGroup(); when(osRepository.getDiskInterfaces(any(Integer.class), any(Version.class))).thenReturn( @@ -620,13 +623,11 @@ @Test public void testBeanValidations() { - mockOsRepository(); assertTrue(createCommand(initializeMock(1, 1)).validateInputs()); } @Test public void testPatternBasedNameFails() { - mockOsRepository(); AddVmCommand<VmManagementParametersBase> cmd = createCommand(initializeMock(1, 1)); cmd.getParameters().getVm().setName("aa-??bb"); assertFalse("Pattern-based name should not be supported for VM", cmd.validateInputs()); -- To view, visit http://gerrit.ovirt.org/28306 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b56cdb63a903a6b9c5ccc8ea1f9af0f1ad0f046 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
