Merge lp:~ralsina/ubuntuone-control-panel/fix_804271 into lp:ubuntuone-control-panel

[Roberto Alsina]

Fix corner cases for humanize, add tests.

Fix corner cases for humanize:

humanize(0) was "0.0 bytes" should be "0 bytes"

Added some minimal tests.

[lp:~ralsina/ubuntuone-control-panel/fix_804271]

180. By Roberto Alsina on 2011-07-04

Chipaca's needsfixing

181. By Roberto Alsina on 2011-07-04

Use floating point division

182. By Roberto Alsina on 2011-07-04

Improve tests

[John Lenton (chipaca)]

A small nit in that the docstring of test_decimal doesn't have much relation to what it's testing (what it's testing is unclear to me, however).

review: Approve

[Roberto Alsina (ralsina)]

It's testing that we keep one decimal when we should (in this case, 12.1 KiB instead of 12 KiB).
This is a test that failed with the original code that did integer divisions.

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2011-06-28 22:07:59 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2011-07-04 11:10:00 +0000
@@ -166,6 +166,9 @@
              5: 'PiB', 6: 'Eib', 7: 'ZiB', 8: 'YiB'}
     unit = 0
     while int_bytes >= KILOBYTES:
-        int_bytes = int_bytes / KILOBYTES
+        int_bytes = int_bytes / float(KILOBYTES)
         unit += 1
-    return '%.1f %s' % (int_bytes, units[unit])
+    str_bytes = "%.1f" % int_bytes
+    str_bytes = str_bytes.rstrip('0')
+    str_bytes = str_bytes.rstrip('.')
+    return '%s %s' % (str_bytes, units[unit])

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_humanize.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_humanize.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_humanize.py	2011-07-04 11:10:00 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the humanize function."""
+
+from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.gui import humanize
+
+
+class HumanizeTestCase(TestCase):
+
+    """Test cases for the humanize function."""
+
+    def test_zero(self):
+        """Humanize zero bytes."""
+        self.assertEquals(humanize(0), "0 bytes")
+
+    def test_exact(self):
+        """Humanize should not show unnecesary digits."""
+        self.assertEquals(humanize(1024), "1 KiB")
+
+    def test_huge(self):
+        """Humanize should work for big numbers."""
+        self.assertEquals(humanize(2 ** 40), "1 TiB")
+
+    def test_decimal(self):
+        """Humanize should work for numbers ending in 0."""
+        self.assertEquals(humanize(12400), "12.1 KiB")
+        
+    def test_trailing_zero(self):
+        """Humanize should work for numbers ending in 0."""
+        self.assertEquals(humanize(102400), "100 KiB")