adding KB to StringUtil

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/util/StringUtil.java

@@ -233,16 +233,19 @@ static public String normalize(String sentence) {
         return sentence;
     }
 
-    public static final long BYTES_PER_MB = 1024L * 1024L;
+    public static final long BYTES_PER_KB = 1024L;
+    public static final long BYTES_PER_MB = BYTES_PER_KB * 1024L;
     public static final long BYTES_PER_GB = BYTES_PER_MB * 1024L;
     public static final long BYTES_PER_TB = BYTES_PER_GB * 1024L;
     static public String formatBytes(long bytes) {
-        if (bytes < BYTES_PER_MB) {
+        if (bytes < BYTES_PER_KB) {
             return NumberFormat.getNumberInstance().format(bytes) + " bytes";
         } else {
             double dBytes = bytes;
             NumberFormat formatter = new DecimalFormat("#,##0.00");
-            if (bytes < BYTES_PER_GB) {
+            if (bytes < BYTES_PER_MB) {
+                return formatter.format(dBytes / BYTES_PER_KB) + " KB";
+            } else if (bytes < BYTES_PER_GB) {
                 return formatter.format(dBytes / BYTES_PER_MB) + " MB";
             } else if (bytes < BYTES_PER_TB) {
                 return formatter.format(dBytes / BYTES_PER_GB) + " GB";

src/test/java/edu/harvard/iq/dataverse/util/StringUtilTest.java

@@ -242,7 +242,8 @@ public void testNormalize() {
 
         @Test
         public void testFormatBytes() {
-            assertEquals("1,048,575 bytes", StringUtil.formatBytes(StringUtil.BYTES_PER_MB - 1));
+            assertEquals("1,023 bytes", StringUtil.formatBytes(StringUtil.BYTES_PER_KB - 1));
+            assertEquals("1,024.00 KB", StringUtil.formatBytes(StringUtil.BYTES_PER_MB - 1));
             assertEquals("1,024.00 MB", StringUtil.formatBytes(StringUtil.BYTES_PER_GB - 1));
             assertEquals("1.00 GB", StringUtil.formatBytes(StringUtil.BYTES_PER_GB));
             assertEquals("341.33 GB", StringUtil.formatBytes(StringUtil.BYTES_PER_TB / 3));