bug fix in the parsing method

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24792 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java

@@ -118,13 +118,13 @@ import org.kohsuke.stapler.export.Exported;
             for (int i=0; i<suffix.length(); i++) {
                 if (size.endsWith(suffix.substring(i,i+1))) {
                     multiplier = 1;
-                    for (int j=0; j<i; j++ )
+                    for (int j=0; j<=i; j++ )
                         multiplier*=1024;
                     size = size.substring(0,size.length()-1);
                 }
             }
 
-            return new DiskSpace((long)Double.parseDouble(size.trim())*multiplier);
+            return new DiskSpace((long)(Double.parseDouble(size.trim())*multiplier));
         }
 
         private static final long serialVersionUID = 2L;

test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java

@@ -25,4 +25,14 @@ public class DiskSpaceMonitorDescriptorTest extends HudsonTestCase {
         du.toHtml();
         assertTrue(du.size>0);
     }
+
+    public void testParse() throws Exception {
+        assertEquals(1,DiskSpace.parse("1").size);
+        assertEquals(1024,DiskSpace.parse("1KB").size);
+        assertEquals(1024,DiskSpace.parse("1K").size);
+        assertEquals(1024,DiskSpace.parse("1kb").size);
+        assertEquals(1024*1024,DiskSpace.parse("1MB").size);
+        assertEquals(1024*1024*1024,DiskSpace.parse("1GB").size);
+        assertEquals(512*1024*1024,DiskSpace.parse("0.5GB").size);
+    }
 }