Allon Mureinik has uploaded a new change for review. Change subject: core: Speed up RemoveSnapshotCommandTest ......................................................................
core: Speed up RemoveSnapshotCommandTest Increased the performance of RemoveSnapshotCommandTest by eliminating the use of Mockito Matchers. Change-Id: I4c007059237e0dc4f8631f7e33feff9f41ef2368 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java 1 file changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/13733/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java index 1c4fe4d..36fb47a 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java @@ -15,7 +15,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; @@ -31,7 +30,6 @@ import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dao.DiskImageDAO; import org.ovirt.engine.core.dao.StorageDomainDAO; @@ -66,6 +64,7 @@ private static final Guid STORAGE_DOMAIN_ID = Guid.NewGuid(); private static final Guid STORAGE_DOMAIN_ID2 = Guid.NewGuid(); + private static final Guid STORAGE_POOLD_ID = Guid.NewGuid(); private static final int USED_SPACE_GB = 4; private static final int IMAGE_ACTUAL_SIZE_GB = 4; @@ -80,8 +79,9 @@ doReturn(spDao).when(cmd).getStoragePoolDAO(); doReturn(vmTemplateDAO).when(cmd).getVmTemplateDAO(); doReturn(diskImageDAO).when(cmd).getDiskImageDao(); + doReturn(sdDAO).when(cmd).getStorageDomainDAO(); doReturn(snapshotValidator).when(cmd).createSnapshotValidator(); - mockDAOs(cmd); + doReturn(STORAGE_POOLD_ID).when(cmd).getStoragePoolId(); mockConfigSizeDefaults(); } @@ -94,12 +94,8 @@ mockConfigSizeRequirements(requiredSpaceBufferInGB); } - private void mockDAOs(RemoveSnapshotCommand<?> cmd) { - doReturn(sdDAO).when(cmd).getStorageDomainDAO(); - } - private void mockStorageDomainDAOGetForStoragePool(int domainSpaceGB, Guid storageDomainId) { - when(sdDAO.getForStoragePool(Matchers.<Guid> eq(storageDomainId), Matchers.<NGuid> any(NGuid.class))).thenReturn(createStorageDomain(domainSpaceGB, + when(sdDAO.getForStoragePool(storageDomainId, STORAGE_POOLD_ID)).thenReturn(createStorageDomain(domainSpaceGB, storageDomainId)); } @@ -207,14 +203,13 @@ @Test public void testCanDoActionVmUp() { - Guid spId = Guid.NewGuid(); VM vm = new VM(); vm.setId(Guid.NewGuid()); vm.setStatus(VMStatus.Up); - vm.setStoragePoolId(spId); + vm.setStoragePoolId(STORAGE_POOLD_ID); storage_pool sp = new storage_pool(); - sp.setId(spId); + sp.setId(STORAGE_POOLD_ID); sp.setstatus(StoragePoolStatus.Up); cmd.setSnapshotName("someSnapshot"); @@ -223,7 +218,7 @@ doReturn(ValidationResult.VALID).when(snapshotValidator).snapshotExists(any(Guid.class), any(Guid.class)); doReturn(true).when(cmd).validateImages(); doReturn(vm).when(cmd).getVm(); - doReturn(sp).when(spDao).get(spId); + doReturn(sp).when(spDao).get(STORAGE_POOLD_ID); doReturn(Collections.emptyList()).when(cmd).getSourceImages(); CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd, VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN); } @@ -264,6 +259,7 @@ sd.setStatus(StorageDomainStatus.Active); sd.setAvailableDiskSize(availableSpace); sd.setUsedDiskSize(USED_SPACE_GB); + sd.setStoragePoolId(STORAGE_POOLD_ID); sd.setId(storageDomainId); return sd; } -- To view, visit http://gerrit.ovirt.org/13733 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c007059237e0dc4f8631f7e33feff9f41ef2368 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
