Merge branch 'tests' into poc8

1 files changed, 52 insertions, 28 deletions

diff --git a/ethutil/common_test.go b/ethutil/common_test.go
index 2667eaf3a..c2b6077e9 100644
--- a/ethutil/common_test.go
+++ b/ethutil/common_test.go
@@ -2,43 +2,67 @@ package ethutil
 
 import (
 	"math/big"
-	"testing"
+	"os"
+
+	checker "gopkg.in/check.v1"
 )
 
-func TestCommon(t *testing.T) {
-	ether := CurrencyToString(BigPow(10, 19))
-	finney := CurrencyToString(BigPow(10, 16))
-	szabo := CurrencyToString(BigPow(10, 13))
-	vito := CurrencyToString(BigPow(10, 10))
-	turing := CurrencyToString(BigPow(10, 7))
-	eins := CurrencyToString(BigPow(10, 4))
-	wei := CurrencyToString(big.NewInt(10))
+type CommonSuite struct{}
 
-	if ether != "10 Ether" {
-		t.Error("Got", ether)
-	}
+var _ = checker.Suite(&CommonSuite{})
 
-	if finney != "10 Finney" {
-		t.Error("Got", finney)
-	}
+func (s *CommonSuite) TestOS(c *checker.C) {
+	expwin := (os.PathSeparator == '\\' && os.PathListSeparator == ';')
+	res := IsWindows()
 
-	if szabo != "10 Szabo" {
-		t.Error("Got", szabo)
+	if !expwin {
+		c.Assert(res, checker.Equals, expwin, checker.Commentf("IsWindows is", res, "but path is", os.PathSeparator))
+	} else {
+		c.Assert(res, checker.Not(checker.Equals), expwin, checker.Commentf("IsWindows is", res, "but path is", os.PathSeparator))
 	}
+}
 
-	if vito != "10 Shannon" {
-		t.Error("Got", vito)
-	}
+func (s *CommonSuite) TestWindonziePath(c *checker.C) {
+	iswindowspath := os.PathSeparator == '\\'
+	path := "/opt/eth/test/file.ext"
+	res := WindonizePath(path)
+	ressep := string(res[0])
 
-	if turing != "10 Babbage" {
-		t.Error("Got", turing)
+	if !iswindowspath {
+		c.Assert(ressep, checker.Equals, "/")
+	} else {
+		c.Assert(ressep, checker.Not(checker.Equals), "/")
 	}
+}
 
-	if eins != "10 Ada" {
-		t.Error("Got", eins)
-	}
+func (s *CommonSuite) TestCommon(c *checker.C) {
+	douglas := CurrencyToString(BigPow(10, 43))
+	einstein := CurrencyToString(BigPow(10, 22))
+	ether := CurrencyToString(BigPow(10, 19))
+	finney := CurrencyToString(BigPow(10, 16))
+	szabo := CurrencyToString(BigPow(10, 13))
+	shannon := CurrencyToString(BigPow(10, 10))
+	babbage := CurrencyToString(BigPow(10, 7))
+	ada := CurrencyToString(BigPow(10, 4))
+	wei := CurrencyToString(big.NewInt(10))
 
-	if wei != "10 Wei" {
-		t.Error("Got", wei)
-	}
+	c.Assert(douglas, checker.Equals, "10 Douglas")
+	c.Assert(einstein, checker.Equals, "10 Einstein")
+	c.Assert(ether, checker.Equals, "10 Ether")
+	c.Assert(finney, checker.Equals, "10 Finney")
+	c.Assert(szabo, checker.Equals, "10 Szabo")
+	c.Assert(shannon, checker.Equals, "10 Shannon")
+	c.Assert(babbage, checker.Equals, "10 Babbage")
+	c.Assert(ada, checker.Equals, "10 Ada")
+	c.Assert(wei, checker.Equals, "10 Wei")
+}
+
+func (s *CommonSuite) TestLarge(c *checker.C) {
+	douglaslarge := CurrencyToString(BigPow(100000000, 43))
+	adalarge := CurrencyToString(BigPow(100000000, 4))
+	weilarge := CurrencyToString(big.NewInt(100000000))
+
+	c.Assert(douglaslarge, checker.Equals, "10000E298 Douglas")
+	c.Assert(adalarge, checker.Equals, "10000E7 Einstein")
+	c.Assert(weilarge, checker.Equals, "100 Babbage")
 }