Adding EB/PB/TB per IO-287 and Ron Kuris' patch

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

Author: hen

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

@@ -352,14 +352,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) {
+        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) {
             displaySize = String.valueOf(size / ONE_MB) + " MB";

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

@@ -324,10 +324,10 @@ public void testByteCountToDisplaySize() {
         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");
+        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");