[IO-226] question with byteCountToDisplaySize(long size). Add more tests. Add commented out code for processing terabyte, petabyte and exabyte. Add constants for terabyte, petabyte and exabyte, zettabyte, and yottabyte.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1153952 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/io/FileUtils.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigInteger;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
@@ -109,6 +110,31 @@ public FileUtils() {
      */
     public static final long ONE_GB = ONE_KB * ONE_MB;
 
+    /**
+     * The number of bytes in a terabyte.
+     */
+    public static final long ONE_TB = ONE_KB * ONE_GB;
+
+    /**
+     * The number of bytes in a petabyte.
+     */
+    public static final long ONE_PB = ONE_KB * ONE_TB;
+
+    /**
+     * The number of bytes in an exabyte.
+     */
+    public static final long ONE_EB = ONE_KB * ONE_PB;
+
+    /**
+     * The number of bytes in a zettabyte.
+     */
+    public static final BigInteger ONE_ZB = BigInteger.valueOf(ONE_KB).multiply(BigInteger.valueOf(ONE_EB));
+
+    /**
+     * The number of bytes in a yottabyte.
+     */
+    public static final BigInteger ONE_YB = ONE_ZB.multiply(BigInteger.valueOf(ONE_EB));
+
     /**
      * An empty array of type <code>File</code>.
      */
@@ -324,6 +350,13 @@ public static FileOutputStream openOutputStream(File file, boolean append) throw
     public static String byteCountToDisplaySize(long size) {
         String displaySize;
 
+//        if (size / ONE_EB > 0) {
+//            displaySize = String.valueOf(size / ONE_EB) + " EB";
+//        } else if (size / ONE_PB > 0) {
+//            displaySize = String.valueOf(size / ONE_PB) + " PB";
+//        } else if (size / ONE_TB > 0) {
+//            displaySize = String.valueOf(size / ONE_TB) + " TB";
+//        } else 
         if (size / ONE_GB > 0) {
             displaySize = String.valueOf(size / ONE_GB) + " GB";
         } else if (size / ONE_MB > 0) {

src/test/java/org/apache/commons/io/FileUtilsTestCase.java

@@ -311,11 +311,25 @@ public void test_openOutputStream_notExistsCannotCreate() throws Exception {
     // byteCountToDisplaySize
     public void testByteCountToDisplaySize() {
         assertEquals(FileUtils.byteCountToDisplaySize(0), "0 bytes");
+        assertEquals(FileUtils.byteCountToDisplaySize(1), "1 bytes");
+        assertEquals(FileUtils.byteCountToDisplaySize(1023), "1023 bytes");
         assertEquals(FileUtils.byteCountToDisplaySize(1024), "1 KB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1025), "1 KB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1023), "1023 KB");
         assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024), "1 MB");
-        assertEquals(
-            FileUtils.byteCountToDisplaySize(1024 * 1024 * 1024),
-            "1 GB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1025), "1 MB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024 * 1023), "1023 MB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024 * 1024), "1 GB");
+        assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024 * 1025), "1 GB");
+        assertEquals(FileUtils.byteCountToDisplaySize((1024 * 1024 * 1024 * 2) - 1), "1 GB");
+//        assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 * 1024), "1 TB");
+//        assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 * 1024 * 1024), "1 PB");
+//        assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 * 1024 * 1024 * 1024), "1 EB");
+//        assertEquals(FileUtils.byteCountToDisplaySize(Long.MAX_VALUE), "7 EB");
+        // Other MAX_VALUEs
+        assertEquals(FileUtils.byteCountToDisplaySize(Character.MAX_VALUE), "63 KB");
+        assertEquals(FileUtils.byteCountToDisplaySize(Short.MAX_VALUE), "31 KB");
+        assertEquals(FileUtils.byteCountToDisplaySize(Integer.MAX_VALUE), "1 GB");
     }
 
     //-----------------------------------------------------------------------