From 256ba24dd08b593dcf6d78769f7f292aa78ed594 Mon Sep 17 00:00:00 2001 From: Pasquale Andriani Date: Thu, 25 Oct 2012 01:04:19 +0200 Subject: [PATCH] added test for allowing ',' decimal separator --- .../java/org/jclouds/cloudstack/domain/VirtualMachine.java | 2 +- .../org/jclouds/cloudstack/domain/VirtualMachineTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java index dca59fc620..0ccd08fc04 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java @@ -667,7 +667,7 @@ public class VirtualMachine { * @return the amount of the vm's CPU currently used */ public float getCpuUsed() { - return cpuUsed != null ? Float.parseFloat(cpuUsed.substring(0, cpuUsed.length() - 1)) : 0.0f; + return cpuUsed != null ? Float.parseFloat(cpuUsed.substring(0, cpuUsed.length() - 1).replace(',', '.')) : 0.0f; } private String getCpuUsedAsString() { diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java index 95db9e170d..9299c8224a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java @@ -47,6 +47,10 @@ public class VirtualMachineTest { // Retrieving CpuUsed should just give us a straightforward float vm = VirtualMachine.builder().id("3").cpuUsed("23.4%").build(); assertEquals(vm.getCpuUsed(), 23.4, 0.01); + + //Allow ',' as decimal separator + vm = VirtualMachine.builder().id("4").cpuUsed("23,4%").build(); + assertEquals(vm.getCpuUsed(), 23.4, 0.01); } }