From d478706cb635090ecfaad849471b11d469a18f84 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 4 Oct 2023 15:37:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=20=D0=9F=D0=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/schema/field/number.go | 2 +-
pkg/schema/field/number_test.go | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/pkg/schema/field/number.go b/pkg/schema/field/number.go
index 22e6bb71..00c264a2 100644
--- a/pkg/schema/field/number.go
+++ b/pkg/schema/field/number.go
@@ -89,7 +89,7 @@ func (NumberType) decode(_ context.Context, field *Field, v interface{}) (interf
return i, nil
case float64:
if i >= math.MaxInt64 || i <= math.MinInt64 {
- return nil, errors.Errorf("the passed value must be no more than %d and no less than %d", math.MaxInt64, math.MinInt64)
+ return nil, errors.Errorf("the passed value %f must be no more than %d and no less than %d", i, math.MaxInt64, math.MinInt64)
}
return int64(math.Round(i)), nil
}
diff --git a/pkg/schema/field/number_test.go b/pkg/schema/field/number_test.go
index c9739a75..82a4c219 100644
--- a/pkg/schema/field/number_test.go
+++ b/pkg/schema/field/number_test.go
@@ -14,21 +14,25 @@ func TestNumberField_Decode(t *testing.T) {
want interface{}
wantErr bool
}{
- {"Correct", Number("int"), int64(2), int64(2), false}, // #0
- {"Correct", Number("int"), 2.2, int64(2), false}, // #1
- {"Correct", Number("int"), 2, int64(2), false}, // #2
- {"Correct", Number("int"), float32(2.2), int64(2), false}, // #3
- {"Correct", Number("int"), float64(2.6), int64(3), false}, // #4
- {"Correct", Number("int"), 2.6, int64(3), false}, // #5
- {"Convert error", Number(NumberFormatInt), math.MaxFloat64, nil, true}, // #6
- {"Convert error", Number(NumberFormatInt), float64(-9223372036854776000.0), nil, true}, // #7
- {"Convert error", Number(NumberFormatInt), float64(9223372036854776000.0), nil, true}, // #8
+ {"Correct", Number("int"), int64(2), int64(2), false}, // #0
+ {"Correct", Number("int"), 2.2, int64(2), false}, // #1
+ {"Correct", Number("int"), 2, int64(2), false}, // #2
+ {"Correct", Number("int"), float32(2.2), int64(2), false}, // #3
+ {"Correct", Number("int"), float64(2.6), int64(3), false}, // #4
+ {"Correct", Number("int"), 2.6, int64(3), false}, // #5
+ {"MaxInt64", Number(NumberFormatInt), int64(math.MaxInt64), int64(math.MaxInt64), false}, // #6
+ {"MinInt64", Number(NumberFormatInt), int64(math.MinInt64), int64(math.MinInt64), false}, // #7
+ {"Convert error", Number(NumberFormatInt), math.MaxFloat64, nil, true}, // #8
+ {"Convert error", Number(NumberFormatInt), -9223372036854776000.0, nil, true}, // #9
+ {"Convert error", Number(NumberFormatInt), 9223372036854776000.0, nil, true}, // #10
+ {"Convert error", Number(NumberFormatInt), float64(math.MaxInt64), nil, true}, // #11
+ {"Convert error", Number(NumberFormatInt), float64(math.MinInt64), nil, true}, // #12
- {"Correct", Number("float"), int8(2), 2.0, false}, // #9
- {"Correct", Number("float"), 2.2, 2.2, false}, // #10
- {"Correct", Number("float"), 2, 2.0, false}, // #11
- {"Correct", Number("float"), float32(2.2), 2.200000047683716, false}, // #12
- {"Correct", Number("float"), int64(2), 2.0, false}, // #13
+ {"Correct", Number("float"), int8(2), 2.0, false}, // #13
+ {"Correct", Number("float"), 2.2, 2.2, false}, // #14
+ {"Correct", Number("float"), 2, 2.0, false}, // #15
+ {"Correct", Number("float"), float32(2.2), 2.200000047683716, false}, // #16
+ {"Correct", Number("float"), int64(2), 2.0, false}, // #17
{"Wrong data", Number("int"), "", nil, true}, // #0
{"Wrong data", Number("int"), []byte(""), nil, true}, // #1
--
GitLab