Allon Mureinik has uploaded a new change for review. Change subject: core: Remove VdsStatistics ctor used in test ......................................................................
core: Remove VdsStatistics ctor used in test Removed the ctor that isn't used anywhere in production code. Change-Id: I417a9cf34a98361067becf319d2797c831abd8f3 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java 2 files changed, 17 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/18119/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java index afa007a..ec57abe 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java @@ -32,22 +32,6 @@ this.cpu_user = BigDecimal.ZERO; } - public VdsStatistics(Double cpu_idle, Double cpu_load, Double cpu_sys, - Double cpu_user, Long mem_available, Long memFree, Long mem_shared, Integer usage_cpu_percent, - Integer usage_mem_percent, Integer usage_network_percent, Guid vds_id) { - this.cpu_idle = BigDecimal.valueOf(cpu_idle); - this.cpu_load = BigDecimal.valueOf(cpu_load); - this.cpu_sys = BigDecimal.valueOf(cpu_sys); - this.cpu_user = BigDecimal.valueOf(cpu_user); - this.mem_available = mem_available; - this.memFree = memFree; - this.mem_shared = mem_shared; - this.usage_cpu_percent = usage_cpu_percent; - this.usage_mem_percent = usage_mem_percent; - this.usage_network_percent = usage_network_percent; - // this.vds_id = vds_id; - } - @Override public int hashCode() { final int prime = 31; 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 2f48183..f4147f7 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 @@ -61,17 +61,7 @@ new Object[][] { { vdsStatic }, { randomVdsDynamic() }, - { new VdsStatistics(random.nextDouble(), - random.nextDouble(), - random.nextDouble(), - random.nextDouble(), - random.nextLong(), - random.nextLong(), - random.nextLong(), - random.nextInt(), - random.nextInt(), - random.nextInt(), - Guid.newGuid()) }, + { randomVdsStatistics() }, { new vds_spm_id_map(Guid.newGuid(), Guid.newGuid(), random.nextInt()) }, { randomStorageDomainStatic() }, { new StorageDomainDynamic(random.nextInt(), Guid.newGuid(), random.nextInt()) }, @@ -147,6 +137,22 @@ return vdsDynamic; } + private static VdsStatistics randomVdsStatistics() { + RandomUtils random = RandomUtils.instance(); + VdsStatistics vdsStatistics = new VdsStatistics(); + vdsStatistics.setcpu_idle(random.nextDouble()); + vdsStatistics.setcpu_load(random.nextDouble()); + vdsStatistics.setcpu_sys(random.nextDouble()); + vdsStatistics.setcpu_user(random.nextDouble()); + vdsStatistics.setmem_available(random.nextLong()); + vdsStatistics.setMemFree(random.nextLong()); + vdsStatistics.setmem_shared(random.nextLong()); + vdsStatistics.setusage_cpu_percent(random.nextInt()); + vdsStatistics.setusage_mem_percent(random.nextInt()); + vdsStatistics.setusage_network_percent(random.nextInt()); + return vdsStatistics; + } + @Test public void serializeAndDesrializeEntity() throws Exception { String serializedEntity = new JsonObjectSerializer().serialize(entity); -- To view, visit http://gerrit.ovirt.org/18119 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I417a9cf34a98361067becf319d2797c831abd8f3 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
