fix tests

Author: joao-r-reis

marshal.go

@@ -434,7 +434,7 @@ func (smallIntTypeInfo) Marshal(value interface{}) ([]byte, error) {
 func (s smallIntTypeInfo) Unmarshal(data []byte, value interface{}) error {
 	decodedData, err := decShort(data)
 	if err != nil {
-		return err
+		return unmarshalErrorf("%s", err.Error())
 	}
 	if iptr, ok := value.(*interface{}); ok && iptr != nil {
 		var v int16
@@ -546,7 +546,7 @@ func (tinyIntTypeInfo) Marshal(value interface{}) ([]byte, error) {
 func (t tinyIntTypeInfo) Unmarshal(data []byte, value interface{}) error {
 	decodedData, err := decTiny(data)
 	if err != nil {
-		return err
+		return unmarshalErrorf("%s", err.Error())
 	}
 	if iptr, ok := value.(*interface{}); ok && iptr != nil {
 		var v int8
@@ -646,7 +646,7 @@ func (intTypeInfo) Marshal(value interface{}) ([]byte, error) {
 func (i intTypeInfo) Unmarshal(data []byte, value interface{}) error {
 	decodedData, err := decInt(data)
 	if err != nil {
-		return err
+		return unmarshalErrorf("%s", err.Error())
 	}
 	if iptr, ok := value.(*interface{}); ok && iptr != nil {
 		var v int
@@ -1328,23 +1328,21 @@ func (decimalTypeInfo) Marshal(value interface{}) ([]byte, error) {
 
 // Unmarshal unmarshals the byte slice into the value.
 func (decimalTypeInfo) Unmarshal(data []byte, value interface{}) error {
+	if len(data) < 4 {
+		return unmarshalErrorf("inf.Dec needs at least 4 bytes, while value has only %d", len(data))
+	}
+
 	decodedData, err := decInt(data[0:4])
 	if err != nil {
 		return err
 	}
 	switch v := value.(type) {
 	case *inf.Dec:
-		if len(data) < 4 {
-			return unmarshalErrorf("inf.Dec needs at least 4 bytes, while value has only %d", len(data))
-		}
 		scale := decodedData
 		unscaled := decBigInt2C(data[4:], nil)
 		*v = *inf.NewDecBig(unscaled, inf.Scale(scale))
 		return nil
 	case *interface{}:
-		if len(data) < 4 {
-			return unmarshalErrorf("inf.Dec needs at least 4 bytes, while value has only %d", len(data))
-		}
 		scale := decodedData
 		unscaled := decBigInt2C(data[4:], nil)
 		*v = inf.NewDecBig(unscaled, inf.Scale(scale))

marshal_test.go

@@ -604,7 +604,7 @@ var marshalTests = []struct {
 		[]byte(nil),
 		nil,
 		nil,
-		UnmarshalError("can not unmarshal into non-pointer <nil>"),
+		UnmarshalError("expected 4 bytes decoding int but got 0"),
 	},
 	{
 		varcharLikeTypeInfo{typ: TypeVarchar},
@@ -1704,10 +1704,7 @@ func TestMarshalTime(t *testing.T) {
 			t.Errorf("marshalTest[%d]: %v", i, err)
 			continue
 		}
-		decoded, err := decInt(test.Data)
-		if err != nil {
-			t.Error(err)
-		}
+		decoded := decBigInt(test.Data)
 		if !bytes.Equal(data, test.Data) {
 			t.Errorf("marshalTest[%d]: expected %x (%v), got %x (%v) for time %s", i,
 				test.Data, decoded, data, decoded, test.Value)
@@ -2390,13 +2387,9 @@ func TestMarshalDuration(t *testing.T) {
 			t.Errorf("marshalTest[%d]: %v", i, err)
 			continue
 		}
-		decoded, err := decInt(test.Data)
-		if err != nil {
-			t.Error(err)
-		}
 		if !bytes.Equal(data, test.Data) {
-			t.Errorf("marshalTest[%d]: expected %x (%v), got %x (%v) for time %s", i,
-				test.Data, decoded, data, decoded, test.Value)
+			t.Errorf("marshalTest[%d]: expected %x, got %x for time %s", i,
+				test.Data, data, test.Value)
 		}
 	}
 }