Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove StoragePool ctor only used in tests
......................................................................
core: Remove StoragePool ctor only used in tests
Removed the ctor that isn't used anywhere in production code.
This in fact also makes the tests easier to understand, as now the test
StoragePools instances only have the relevant field values and not all
the values demanded by this useless constructor.
Change-Id: Ib9000d4ec5f8109744b33e6e50a688d114b71049
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
5 files changed, 26 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/18108/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
index c431c12..5820cb9 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java
@@ -134,20 +134,15 @@
executedUpdatedOvfGenerationIdsInDb = new HashMap<Guid, Map<Guid,
Long>>();
vms = new HashMap<Guid, VM>();
templates = new HashMap<Guid, VmTemplate>();
- pool1 =
- new StoragePool("first sp",
- "",
- Guid.newGuid(),
- "storage_pool1",
- StorageType.NFS.getValue(),
- StoragePoolStatus.Up.getValue());
- pool2 =
- new StoragePool("second sp",
- "",
- Guid.newGuid(),
- "storage_pool2",
- StorageType.NFS.getValue(),
- StoragePoolStatus.Up.getValue());
+ pool1 = new StoragePool();
+ pool1.setId(Guid.newGuid());
+ pool1.setStorageType(StorageType.NFS);
+ pool1.setstatus(StoragePoolStatus.Up);
+
+ pool2 = new StoragePool();
+ pool2.setId(Guid.newGuid());
+ pool2.setStorageType(StorageType.NFS);
+ pool2.setstatus(StoragePoolStatus.Up);
performStoragePoolInitOps(pool1);
performStoragePoolInitOps(pool2);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
index 8eb553f..f551a29 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
@@ -16,7 +16,6 @@
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
-import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -38,13 +37,8 @@
@Before
public void setup() {
- storagePool =
- new StoragePool("test",
- "",
- Guid.newGuid(),
- "test",
- StorageType.UNKNOWN.getValue(),
- StoragePoolStatus.Up.getValue());
+ storagePool = new StoragePool();
+ storagePool.setstatus(StoragePoolStatus.Up);
validator = spy(new StoragePoolValidator(storagePool));
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
index b78be94..460612a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
@@ -20,7 +20,6 @@
import org.mockito.runners.MockitoJUnitRunner;
import org.ovirt.engine.core.bll.utils.VersionSupport;
import org.ovirt.engine.core.common.action.StoragePoolManagementParameter;
-import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
@@ -146,8 +145,7 @@
}
private void newPoolNameIsAlreadyTaken() {
- when(spDao.get(any(Guid.class))).thenReturn(new StoragePool("foo", "",
Guid.Empty, "foo",
- StorageType.NFS.getValue(), StoragePoolStatus.Up.getValue()));
+ when(spDao.get(any(Guid.class))).thenReturn(new StoragePool());
when(spDao.getByName(anyString())).thenReturn(createDefaultStoragePool());
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java
index 12d1e28..473922f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java
@@ -10,6 +10,7 @@
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
+
public class StoragePool extends IVdcQueryable implements
BusinessEntity<Guid>, Nameable, Commented {
private static final long serialVersionUID = 6162262095329980112L;
@@ -53,16 +54,6 @@
description = "";
comment = "";
masterDomainVersion = 0;
- }
-
- public StoragePool(String description, String comment, Guid id, String
name, int storage_pool_type, int status) {
- this();
- this.description = description;
- this.comment = comment;
- this.id = id;
- this.name = name;
- setStorageType(StorageType.forValue(storage_pool_type));
- this.status = StoragePoolStatus.forValue(status);
}
public String getdescription() {
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
index defe37b..d741bd5 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
@@ -110,12 +110,7 @@
random.nextInt(StorageDomainType.values().length),
random.nextString(10), random.nextString(10))
},
{ new StorageDomainDynamic(random.nextInt(),
Guid.newGuid(), random.nextInt()) },
- { new StoragePool(random.nextString(10),
- "",
- Guid.newGuid(),
- random.nextString(10),
- random.nextEnum(StorageType.class).getValue(),
-
random.nextInt(StoragePoolStatus.values().length)) },
+ { randomStoragePool() },
{ new StoragePoolIsoMap(Guid.newGuid(),
Guid.newGuid(),
random.nextEnum(StorageDomainStatus.class)) },
@@ -128,6 +123,18 @@
return Arrays.asList(data);
}
+ private static StoragePool randomStoragePool() {
+ RandomUtils random = RandomUtils.instance();
+ StoragePool sp = new StoragePool();
+ sp.setdescription(random.nextString(10));
+ sp.setComment(random.nextString(10));
+ sp.setName(random.nextString(10));
+ sp.setId(Guid.newGuid());
+ sp.setStorageType(random.nextEnum(StorageType.class));
+ sp.setstatus(random.nextEnum(StoragePoolStatus.class));
+ return sp;
+ }
+
@Test
public void serializeAndDesrializeEntity() throws Exception {
String serializedEntity = new JsonObjectSerializer().serialize(entity);
--
To view, visit http://gerrit.ovirt.org/18108
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9000d4ec5f8109744b33e6e50a688d114b71049
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
