Fix tests

converter.go

@@ -23,12 +23,27 @@ func ToJSON(obj interface{}) (string, error) {
 }
 
 // ToFloat convert the input string to a float, or 0.0 if the input is not a float.
-func ToFloat(str string) (float64, error) {
-	res, err := strconv.ParseFloat(str, 64)
-	if err != nil {
-		res = 0.0
+func ToFloat(value interface{}) (res float64, err error) {
+	val := reflect.ValueOf(value)
+
+	switch value.(type) {
+	case int, int8, int16, int32, int64:
+		res = float64(val.Int())
+	case uint, uint8, uint16, uint32, uint64:
+		res = float64(val.Uint())
+	case float32, float64:
+		res = val.Float()
+	case string:
+		res, err = strconv.ParseFloat(val.String(), 64)
+		if err != nil {
+			res = 0
+		}
+	default:
+		err = fmt.Errorf("ToInt: unknown interface type %T", value)
+		res = 0
 	}
-	return res, err
+
+	return
 }
 
 // ToInt convert the input string or any int type to an integer type 64, or 0 if the input is not an integer.
@@ -40,6 +55,8 @@ func ToInt(value interface{}) (res int64, err error) {
 		res = val.Int()
 	case uint, uint8, uint16, uint32, uint64:
 		res = int64(val.Uint())
+	case float32, float64:
+		res = int64(val.Float())
 	case string:
 		if IsInt(val.String()) {
 			res, err = strconv.ParseInt(val.String(), 0, 64)

numerics.go

@@ -73,11 +73,15 @@ func InRangeFloat64(value, left, right float64) bool {
 func InRange(value interface{}, left interface{}, right interface{}) bool {
 	switch value.(type) {
 	case int:
-		return InRangeInt(value.(int), left.(int), right.(int))
-	case float32:
-		return InRangeFloat32(value.(float32), left.(float32), right.(float32))
-	case float64:
-		return InRangeFloat64(value.(float64), left.(float64), right.(float64))
+		intValue, _ := ToInt(value)
+		intLeft, _ := ToInt(left)
+		intRight, _ := ToInt(right)
+		return InRangeInt(intValue, intLeft, intRight)
+	case float32, float64:
+		intValue, _ := ToFloat(value)
+		intLeft, _ := ToFloat(left)
+		intRight, _ := ToFloat(right)
+		return InRangeFloat64(intValue, intLeft, intRight)
 	case string:
 		return value.(string) >= left.(string) && value.(string) <= right.(string)
 	default:

numerics_test.go

@@ -531,13 +531,13 @@ func TestInRange(t *testing.T) {
 		right    float64
 		expected bool
 	}{
-		{0, 0, 0, false},
+		{0, 0, 0, true},
 		{1, 0, 0, false},
 		{-1, 0, 0, false},
-		{0, -1, 1, false},
-		{0, 0, 1, false},
-		{0, -1, 0, false},
-		{0, 0, -1, false},
+		{0, -1, 1, true},
+		{0, 0, 1, true},
+		{0, -1, 0, true},
+		{0, 0, -1, true},
 		{0, 10, 5, false},
 	}
 	for _, test := range testsTypeMix {