Allon Mureinik has uploaded a new change for review.
Change subject: core: ImportVm cleanup: Remove TestHelperImportVm
......................................................................
core: ImportVm cleanup: Remove TestHelperImportVm
Removed the TestHelperImportVmCommand and replaced it with easier to
read/user inline spying of the actual ImportVmCommand object.
Change-Id: Ie7b54ff40c65dfe20a1dd0d239dcb04882fecde7
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
D
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmCommand.java
2 files changed, 28 insertions(+), 80 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/9627/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
index 0af0937..beee638 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java
@@ -3,9 +3,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import java.util.Collections;
import java.util.Set;
import javax.validation.ConstraintViolation;
@@ -15,7 +16,12 @@
import org.junit.Test;
import org.ovirt.engine.core.common.action.ImportVmParameters;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
+import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.VM;
+import org.ovirt.engine.core.common.businessentities.VmTemplate;
+import org.ovirt.engine.core.common.businessentities.storage_domains;
+import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.compat.Guid;
@@ -50,8 +56,19 @@
private ImportVmCommand setupDiskSpaceTest(final int diskSpaceRequired,
final int diskSpacePct) {
mcr.mockConfigValue(ConfigValues.FreeSpaceCriticalLowInGB,
diskSpaceRequired);
mcr.mockConfigValue(ConfigValues.FreeSpaceLow, diskSpacePct);
- mcr.mockConfigValue(eq(ConfigValues.LimitNumberOfNetworkInterfaces),
anyString(), Boolean.TRUE);
- return new TestHelperImportVmCommand(createParameters());
+
+ ImportVmCommand cmd = spy(new ImportVmCommand(createParameters()));
+ doReturn(true).when(cmd).validateNoDuplicateVm();
+ doReturn(true).when(cmd).validateNumberOfNics();
+ doReturn(true).when(cmd).validateVdsCluster();
+ doReturn(true).when(cmd).validateUsbPolicy();
+ doReturn(true).when(cmd).canAddVm();
+ doReturn(createSourceDomain()).when(cmd).getSourceDomain();
+ doReturn(Collections.<VM>
singletonList(createVM())).when(cmd).getVmsFromExportDomain();
+ doReturn(new VmTemplate()).when(cmd).getVmTemplate();
+ doReturn(new storage_pool()).when(cmd).getStoragePool();
+
+ return cmd;
}
protected ImportVmParameters createParameters() {
@@ -69,6 +86,13 @@
return v;
}
+ protected storage_domains createSourceDomain() {
+ storage_domains sd = new storage_domains();
+ sd.setstorage_domain_type(StorageDomainType.ImportExport);
+ sd.setstatus(StorageDomainStatus.Active);
+ return sd;
+ }
+
private static final String string100 = "0987654321" +
"0987654321" +
"0987654321" +
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmCommand.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmCommand.java
deleted file mode 100644
index b36b4d2..0000000
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.ovirt.engine.core.common.action.ImportVmParameters;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
-import org.ovirt.engine.core.common.businessentities.StorageDomainType;
-import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.storage_domains;
-import org.ovirt.engine.core.common.businessentities.storage_pool;
-
-public class TestHelperImportVmCommand extends ImportVmCommand {
-
- private static final long serialVersionUID = 1L;
-
- public TestHelperImportVmCommand(final ImportVmParameters p) {
- super(p);
- }
-
- @Override
- protected boolean validateNoDuplicateVm() {
- return true;
- }
-
- @Override
- public storage_pool getStoragePool() {
- return new storage_pool();
- }
-
- @Override
- protected boolean validateVdsCluster() {
- return true;
- }
-
- @Override
- protected boolean validateNumberOfNics() {
- return true;
- }
-
- @Override
- protected boolean validateUsbPolicy() {
- return true;
- }
-
- @Override
- protected storage_domains getSourceDomain() {
- storage_domains sd = new storage_domains();
- sd.setstorage_domain_type(StorageDomainType.ImportExport);
- sd.setstatus(StorageDomainStatus.Active);
- return sd;
- }
-
- @Override
- public VmTemplate getVmTemplate() {
- return new VmTemplate();
- }
-
- @Override
- protected boolean canAddVm() {
- return true;
- }
-
- @Override
- protected List<VM> getVmsFromExportDomain() {
- return Collections.singletonList(createVM());
- }
-
- protected VM createVM() {
- final VM v = new VM();
- v.setId(getParameters().getVm().getId());
- v.setDiskSize(2);
- return v;
- }
-}
--
To view, visit http://gerrit.ovirt.org/9627
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7b54ff40c65dfe20a1dd0d239dcb04882fecde7
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
