Allon Mureinik has uploaded a new change for review. Change subject: core: Remove StorageDomainStatic ctor used in test ......................................................................
core: Remove StorageDomainStatic ctor used in test 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 StorageDomainStatics instances only have the relevant field values and not all the values demanded by this useless constructor. Change-Id: I9d41209108011b2daacfb77d4ae4f2af09086938 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java 2 files changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/18117/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java index 5122587..4390ffb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java @@ -48,14 +48,6 @@ public StorageDomainStatic() { } - public StorageDomainStatic(Guid id, String storage, int storageDomainType, String storageName, String description) { - this.id = id; - this.storage = storage; - this.storageType = StorageDomainType.forValue(storageDomainType); - this.name = storageName; - this.description = description; - } - @Override public Guid getId() { return this.id; 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 7494dec..2f48183 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 @@ -17,7 +17,6 @@ import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic; 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.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; @@ -74,10 +73,7 @@ random.nextInt(), Guid.newGuid()) }, { new vds_spm_id_map(Guid.newGuid(), Guid.newGuid(), random.nextInt()) }, - { new StorageDomainStatic(Guid.newGuid(), - random.nextString(10), - random.nextInt(StorageDomainType.values().length), - random.nextString(10), random.nextString(10)) }, + { randomStorageDomainStatic() }, { new StorageDomainDynamic(random.nextInt(), Guid.newGuid(), random.nextInt()) }, { randomStoragePool() }, { new StoragePoolIsoMap(Guid.newGuid(), @@ -104,6 +100,17 @@ return sp; } + private static StorageDomainStatic randomStorageDomainStatic() { + RandomUtils random = RandomUtils.instance(); + StorageDomainStatic sds = new StorageDomainStatic(); + sds.setId(Guid.newGuid()); + sds.setStorage(random.nextString(10)); + sds.setStorageType(random.nextEnum(StorageType.class)); + sds.setStorageName(random.nextString(10)); + sds.setDescription(random.nextString(10)); + return sds; + } + private static VdsDynamic randomVdsDynamic() { RandomUtils random = RandomUtils.instance(); VdsDynamic vdsDynamic = new VdsDynamic(); -- To view, visit http://gerrit.ovirt.org/18117 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d41209108011b2daacfb77d4ae4f2af09086938 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
