Merge remote-tracking branch 'upstream/develop' into frontier/js

Conflicts:
	cmd/ethereum/js.go
	javascript/types.go

1 files changed, 23 insertions, 0 deletions

diff --git a/common/size_test.go b/common/size_test.go
new file mode 100644
index 000000000..c90eabc26
--- /dev/null
+++ b/common/size_test.go
@@ -0,0 +1,23 @@
+package common
+
+import (
+	checker "gopkg.in/check.v1"
+)
+
+type SizeSuite struct{}
+
+var _ = checker.Suite(&SizeSuite{})
+
+func (s *SizeSuite) TestStorageSizeString(c *checker.C) {
+	data1 := 2381273
+	data2 := 2192
+	data3 := 12
+
+	exp1 := "2.38 mB"
+	exp2 := "2.19 kB"
+	exp3 := "12.00 B"
+
+	c.Assert(StorageSize(data1).String(), checker.Equals, exp1)
+	c.Assert(StorageSize(data2).String(), checker.Equals, exp2)
+	c.Assert(StorageSize(data3).String(), checker.Equals, exp3)
+}