Use FileUtils constants intead of hardcode values

Author: Daniel Augusto Veronezi Salvador

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

@@ -190,6 +190,7 @@
 import com.cloud.vm.VirtualMachine.PowerState;
 import com.cloud.vm.VirtualMachine.Type;
 import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
+import org.apache.commons.io.FileUtils;
 import org.libvirt.VcpuInfo;
 
 @RunWith(PowerMockRunner.class)
@@ -5280,7 +5281,7 @@ public void validateCreateGuestResourceDefWithVcpuMaxLimitAsNull(){
 
     @Test
     public void validateGetDomainMemory() throws LibvirtException{
-        long valueExpected = ByteScaleUtils.KiB;
+        long valueExpected = FileUtils.ONE_KB;
 
         Mockito.doReturn(valueExpected).when(domainMock).getMaxMemory();
         Assert.assertEquals(valueExpected, LibvirtComputingResource.getDomainMemory(domainMock));

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVmMemoryDeviceDefTest.java

@@ -16,7 +16,7 @@
 
 package com.cloud.hypervisor.kvm.resource;
 
-import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
+import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,7 +27,7 @@ public class LibvirtVmMemoryDeviceDefTest {
 
     @Test
     public void validateToString(){
-        long memorySize = ByteScaleUtils.KiB;
+        long memorySize = FileUtils.ONE_KB;
 
         StringBuilder expectedToString = new StringBuilder();
         expectedToString.append("<memory model='dimm'>");

utils/src/main/java/org/apache/cloudstack/utils/bytescale/ByteScaleUtils.java

@@ -16,15 +16,14 @@
 
 package org.apache.cloudstack.utils.bytescale;
 
+import org.apache.commons.io.FileUtils;
+
 /**
  * This class provides a facility to convert bytes through his scales (b, Kib, Kb, Mib, Mb...).
  *
  */
 public class ByteScaleUtils {
 
-    public static final long KiB = 1024;
-    public static final long MiB = KiB * 1024;
-
     private ByteScaleUtils() {}
 
     /**
@@ -34,7 +33,7 @@ private ByteScaleUtils() {}
      * @return The parameter multiplied by 1048576 (1024 * 1024, 1 MiB).
      */
     public static long mibToBytes(long mib) {
-        return mib * MiB;
+        return mib * FileUtils.ONE_MB;
     }
 
     /**
@@ -44,6 +43,6 @@ public static long mibToBytes(long mib) {
      * @return The parameter divided by 1024 (1 KiB).
      */
     public static long bytesToKib(long b) {
-        return b / KiB;
+        return b / FileUtils.ONE_KB;
     }
 }

utils/src/test/java/org/apache/cloudstack/utils/bytescale/ByteScaleUtilsTest.java

@@ -17,6 +17,7 @@
 package org.apache.cloudstack.utils.bytescale;
 
 import junit.framework.TestCase;
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -27,27 +28,27 @@ public class ByteScaleUtilsTest extends TestCase {
     @Test
     public void validateMibToBytes() {
         long mib = 3000L;
-        long b = 1024L * 1024L * mib;
+        long b = FileUtils.ONE_MB * mib;
         assertEquals(b, ByteScaleUtils.mibToBytes(mib));
     }
 
     @Test
     public void validateBytesToKib() {
-        long kib = 1024L * 3000L;
-        long b = 1024 * kib;
+        long kib = FileUtils.ONE_KB * 3000L;
+        long b = FileUtils.ONE_KB * kib;
         assertEquals(kib, ByteScaleUtils.bytesToKib(b));
     }
 
     @Test
     public void validateMibToBytesIfIntTimesIntThenMustExtrapolateIntMaxValue() {
         int mib = 3000;
-        long b = 1024L * 1024L * mib;
+        long b = FileUtils.ONE_MB * mib;
         assertEquals(b, ByteScaleUtils.mibToBytes(mib));
     }
 
     @Test
     public void validateBytesToKibIfIntByIntThenMustExtrapolateIntMaxValue(){
         int b = Integer.MAX_VALUE;
-        assertEquals(b, ByteScaleUtils.bytesToKib(b * 1024L));
+        assertEquals(b, ByteScaleUtils.bytesToKib(b * FileUtils.ONE_KB));
     }
 }