Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove TestHelperImportVmTemplateCommand
......................................................................
core: Remove TestHelperImportVmTemplateCommand
TestHelperImportVmTemplateCommand is an old helper class used to set up
mocking for ImportVmTemplateCommandTest.
Since all this mocking is already done in the test itself (albeit a
slight refactoring was required to make it available), this helper is no
longer needed, and should be removed.
Change-Id: I35bacd6bcd5fa7bbfd709ec2a8fbd0bb529536a3
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
D
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
2 files changed, 12 insertions(+), 124 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/15150/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
index 711a661..b0b8bad 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java
@@ -21,15 +21,15 @@
import org.ovirt.engine.core.common.action.ImportVmTemplateParameters;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
import org.ovirt.engine.core.common.businessentities.DiskImage;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.DiskImageList;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
@@ -109,14 +109,14 @@
VolumeType volumeType,
StorageType storageType) {
CanDoActionTestUtils.runAndAssertCanDoActionSuccess(
- setupVolumeFormatAndTypeTest(volumeFormat, volumeType,
storageType));
+ setupVolumeFormatAndTypeTest(volumeFormat, volumeType,
storageType, 0));
}
private void assertInvalidVolumeInfoCombination(VolumeFormat volumeFormat,
VolumeType volumeType,
StorageType storageType) {
CanDoActionTestUtils.runAndAssertCanDoActionFailure(
- setupVolumeFormatAndTypeTest(volumeFormat, volumeType,
storageType),
+ setupVolumeFormatAndTypeTest(volumeFormat, volumeType,
storageType, 0),
VdcBllMessages.ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED);
}
@@ -134,8 +134,9 @@
private ImportVmTemplateCommand setupVolumeFormatAndTypeTest(
VolumeFormat volumeFormat,
VolumeType volumeType,
- StorageType storageType) {
- mcr.mockConfigValue(ConfigValues.FreeSpaceCriticalLowInGB, 0);
+ StorageType storageType,
+ int freeSpaceCritical) {
+ mcr.mockConfigValue(ConfigValues.FreeSpaceCriticalLowInGB,
freeSpaceCritical);
ImportVmTemplateCommand command =
spy(new ImportVmTemplateCommand(createParameters()));
@@ -216,8 +217,10 @@
}
private ImportVmTemplateCommand setupDiskSpaceTest(final int
extraDiskSpaceRequired) {
- mcr.mockConfigValue(ConfigValues.FreeSpaceCriticalLowInGB,
extraDiskSpaceRequired);
- return new TestHelperImportVmTemplateCommand(createParameters());
+ return setupVolumeFormatAndTypeTest(VolumeFormat.RAW,
+ VolumeType.Preallocated,
+ StorageType.NFS,
+ extraDiskSpaceRequired);
}
protected ImportVmTemplateParameters createParameters() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
deleted file mode 100644
index 3d58088..0000000
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmTemplateCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.ovirt.engine.core.bll.interfaces.BackendInternal;
-import org.ovirt.engine.core.common.action.ImportVmTemplateParameters;
-import org.ovirt.engine.core.common.businessentities.DiskImage;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
-import org.ovirt.engine.core.common.businessentities.StorageDomainType;
-import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
-import org.ovirt.engine.core.common.queries.DiskImageList;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
-import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dao.BusinessEntitySnapshotDAO;
-import org.ovirt.engine.core.dao.StorageDomainDAO;
-import org.ovirt.engine.core.dao.StorageDomainStaticDAO;
-import org.ovirt.engine.core.dao.VmTemplateDAO;
-
-public class TestHelperImportVmTemplateCommand extends ImportVmTemplateCommand
{
-
- public TestHelperImportVmTemplateCommand(final ImportVmTemplateParameters
p) {
- super(p);
- }
-
- @Override
- protected BusinessEntitySnapshotDAO getBusinessEntitySnapshotDAO() {
- return null;
- }
-
- @Override
- public StorageDomainDAO getStorageDomainDAO() {
- final StorageDomain destination = new StorageDomain();
- destination.setStorageDomainType(StorageDomainType.Data);
- destination.setStatus(StorageDomainStatus.Active);
-
- final StorageDomainDAO d = mock(StorageDomainDAO.class);
- when(d.getForStoragePool(any(Guid.class),
any(Guid.class))).thenReturn(destination);
- StorageDomainDynamic dy = new StorageDomainDynamic();
- dy.setAvailableDiskSize(10);
- dy.setUsedDiskSize(0);
- destination.setStorageDynamicData(dy);
- return d;
- }
-
- @Override
- protected StorageDomainStaticDAO getStorageDomainStaticDAO() {
- StorageDomainStaticDAO d = mock(StorageDomainStaticDAO.class);
- when(d.get(any(Guid.class))).thenReturn(new StorageDomainStatic());
- return d;
- }
-
- @Override
- public VmTemplateDAO getVmTemplateDAO() {
- VmTemplateDAO d = mock(VmTemplateDAO.class);
- return d;
- }
-
- @Override
- public StoragePool getStoragePool() {
- return new StoragePool();
- }
-
- @Override
- public BackendInternal getBackend() {
- BackendInternal backend = mock(BackendInternal.class);
-
when(backend.runInternalQuery(eq(VdcQueryType.GetTemplatesFromExportDomain),
any(VdcQueryParametersBase.class))).thenReturn(createDiskImageQueryResult());
- return backend;
- }
-
- @Override
- protected StorageDomain getSourceDomain() {
- StorageDomain source = new StorageDomain();
- source.setStorageDomainType(StorageDomainType.ImportExport);
- source.setStatus(StorageDomainStatus.Active);
- return source;
- }
-
- @Override
- protected boolean isVmTemplateWithSameNameExist() {
- return false;
- }
-
- @Override
- protected boolean validateNoDuplicateDiskImages(Iterable<DiskImage>
images) {
- return true;
- }
-
- private static VdcQueryReturnValue createDiskImageQueryResult() {
- final VdcQueryReturnValue v = new VdcQueryReturnValue();
- Map<VmTemplate, DiskImageList> m = new HashMap<VmTemplate,
DiskImageList>();
- VmTemplate t = new VmTemplate();
- DiskImage i = new DiskImage();
- i.setActualSizeInBytes(2);
- ArrayList<DiskImage> ial = new ArrayList<DiskImage>();
- ial.add(i);
- DiskImageList il = new DiskImageList(ial);
- m.put(t, il);
- v.setReturnValue(m);
- v.setSucceeded(true);
- return v;
- }
-}
--
To view, visit http://gerrit.ovirt.org/15150
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35bacd6bcd5fa7bbfd709ec2a8fbd0bb529536a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
