Merge branch 'develop' of https://github.com/tgerring/go-ethereum

ethutil/size_test.go

@@ -1,12 +1,23 @@
 package ethutil
 
 import (
-	"fmt"
-	"testing"
+	checker "gopkg.in/check.v1"
 )
 
-func TestSize(t *testing.T) {
-	fmt.Println(StorageSize(2381273))
-	fmt.Println(StorageSize(2192))
-	fmt.Println(StorageSize(12))
+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)
 }