Merge pull request #3 from usk81/fix_test

fix test

.travis.yml

@@ -1,8 +1,9 @@
 language: go
 go:
-    - "1.4"
-    - "1.5"
-    - "1.6"
+    - "1.7"
+    - "1.8"
+    - "1.9"
+    - "1.10"
     - tip
 before_install:
     - go get github.com/axw/gocov/gocov

type_string.go

@@ -11,6 +11,13 @@ type String struct {
 	string string
 }
 
+// MarshalString return generic.String converting of request data
+func MarshalString(x interface{}) (String, error) {
+	v := String{}
+	err := v.Scan(x)
+	return v, err
+}
+
 // Value implements the driver Valuer interface.
 func (v String) Value() (driver.Value, error) {
 	if !v.Valid() {

type_string_test.go

@@ -14,6 +14,22 @@ type TestStringStruct struct {
 	NullValue String `json:"null_value"`
 }
 
+func TestMarshalString(t *testing.T) {
+	expected := String{
+		ValidFlag: true,
+		string:    "foobar",
+	}
+
+	s := "foobar"
+	actual, err := MarshalString(s)
+	if err != nil {
+		t.Errorf("Not Expected error when MarshalString. error:%v", err.Error())
+	}
+	if actual != expected {
+		t.Errorf("actual:%v, expected:%v", actual, expected)
+	}
+}
+
 func TestStringJsonUnmarshalAndMarshal(t *testing.T) {
 	var ts TestStringStruct
 	jstr := `{"int":10,"float":1.1,"bool":false,"string":"qwertyuiopkjhgv876","html":"https://golang.org/src/encoding/json/encode.go?h=float64Encoder&foo=bar#L409","null_value":null}`

type_time_test.go

@@ -47,7 +47,7 @@ func TestTimeJsonUnmarshal(t *testing.T) {
 	if !tt.Valid() {
 		t.Error("ValidFlag should be TRUE")
 	}
-	if tt.Time().String() != v.String() {
+	if tt.Time().Format(time.RFC3339) != v.Format(time.RFC3339) {
 		t.Errorf("actual:%v, expected:%v", tt.Time(), v)
 	}
 }

type_timestamp_nanoseconds_test.go

@@ -90,7 +90,7 @@ func TestTimestampNanoSetTime(t *testing.T) {
 		t.Errorf("Not Expected error. error:%s", err.Error())
 	}
 	if tn.Weak() != expected.UnixNano() {
-		t.Errorf("actual:%d, expected:%d", tn.Weak(), expected)
+		t.Errorf("actual:%v, expected:%v", tn.Weak(), expected)
 	}
 }