From 42a617b552335b38792f24e60dce8b58aaafbae2 Mon Sep 17 00:00:00 2001
From: Ivan Daniluk <ivan.daniluk@gmail.com>
Date: Sat, 12 Nov 2016 14:02:16 +0100
Subject: [PATCH] Add tests for vars

---
 var.go      |  9 ++++--
 var_test.go | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/var.go b/var.go
index f69bb29..b797c42 100644
--- a/var.go
+++ b/var.go
@@ -46,10 +46,10 @@ func (v *Number) String() string {
 	return fmt.Sprintf("%.02f", v.val)
 }
 func (v *Number) Set(j *jason.Value) {
-	if n, err := j.Int64(); err == nil {
-		v.val = float64(n)
-	} else if n, err := j.Float64(); err == nil {
+	if n, err := j.Float64(); err == nil {
 		v.val = n
+	} else if n, err := j.Int64(); err == nil {
+		v.val = float64(n)
 	} else {
 		v.val = 0
 	}
@@ -211,6 +211,9 @@ func roundDuration(d time.Duration) time.Duration {
 	if d < time.Millisecond {
 		r = time.Microsecond
 	}
+	if d < time.Microsecond {
+		r = time.Nanosecond
+	}
 	if r <= 0 {
 		return d
 	}
diff --git a/var_test.go b/var_test.go
index 3d56bf1..327ee8d 100644
--- a/var_test.go
+++ b/var_test.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+	"github.com/antonholmquist/jason"
+	"strings"
 	"testing"
 )
 
@@ -90,3 +92,82 @@ func TestVarName(t *testing.T) {
 		t.Fatalf("ToSlice failed: %v", slice)
 	}
 }
+
+func str2val(t *testing.T, s string) *jason.Value {
+	val, err := jason.NewValueFromReader(strings.NewReader(s))
+	if err != nil {
+		t.Fatal(err)
+	}
+	return val
+}
+
+func TestVarNumber(t *testing.T) {
+	v := &Number{}
+	testNumber := func(t *testing.T, v *Number, json string, intval int, str string) {
+		v.Set(str2val(t, json))
+		if want := intval; v.Value() != want {
+			t.Fatalf("Expect value to be %d, got %d", want, v.Value())
+		}
+		if want := str; v.String() != want {
+			t.Fatalf("Expect value to be %s, got %s", want, v.String())
+		}
+	}
+
+	testNumber(t, v, "142", 142, "142.00")
+	testNumber(t, v, "13.24", 13, "13.24")
+	testNumber(t, v, "true", 0, "0.00")
+}
+
+func TestVarMemory(t *testing.T) {
+	v := &Memory{}
+	testMemory := func(t *testing.T, v *Memory, json string, intval int, str string) {
+		v.Set(str2val(t, json))
+		if want := intval; v.Value() != want {
+			t.Fatalf("Expect value to be %d, got %d", want, v.Value())
+		}
+		if want := str; v.String() != want {
+			t.Fatalf("Expect value to be %s, got %s", want, v.String())
+		}
+	}
+
+	testMemory(t, v, "12", 12, "12B")
+	testMemory(t, v, "1024", 1024, "1.0KB")
+	testMemory(t, v, "1048576", 1048576, "1.0MB")
+	testMemory(t, v, "1073741824", 1073741824, "1.0GB")
+	testMemory(t, v, "6815744", 6815744, "6.5MB")
+	testMemory(t, v, "128849018880", 128849018880, "120GB")
+}
+
+func TestVarDuration(t *testing.T) {
+	v := &Duration{}
+	testDuration := func(t *testing.T, v *Duration, json string, intval int, str string) {
+		v.Set(str2val(t, json))
+		if want := intval; v.Value() != want {
+			t.Fatalf("Expect value to be %d, got %d", want, v.Value())
+		}
+		if want := str; v.String() != want {
+			t.Fatalf("Expect value to be %s, got %s", want, v.String())
+		}
+	}
+
+	testDuration(t, v, "12", 12, "12ns")
+	testDuration(t, v, "1000", 1e3, "1µs")
+	testDuration(t, v, "2000", 2*1e3, "2µs")
+	testDuration(t, v, "1000000", 1e6, "1ms")
+	testDuration(t, v, "2000000", 2*1e6, "2ms")
+	testDuration(t, v, "155000000", 155*1e6, "155ms")
+	testDuration(t, v, "1000000000", 1e9, "1s")
+	testDuration(t, v, "13000000000", 13*1e9, "13s")
+	testDuration(t, v, "60000000000", 60*1e9, "1m0s")
+	testDuration(t, v, "90000000000", 90*1e9, "1m30s")
+	testDuration(t, v, "172800000000000", 48*3600*1e9, "48h0m0s")
+	testDuration(t, v, "63072000000000000", 2*365*24*3600*1e9, "17520h0m0s")
+}
+
+func TestVarString(t *testing.T) {
+	v := &String{}
+	v.Set(str2val(t, "\"success\""))
+	if want := "success"; v.String() != want {
+		t.Fatalf("Expect value to be %s, got %s", want, v.String())
+	}
+}