knownvalue: address failing tests

Author: bschaatsbergen

knownvalue/bool_func_test.go

@@ -28,7 +28,7 @@ func TestBoolFunc_CheckValue(t *testing.T) {
 		"wrong-type": {
 			self:          knownvalue.BoolFunc(func(bool) error { return nil }),
 			other:         json.Number("1.234"),
-			expectedError: fmt.Errorf("expected bool value for BoolFunc check, got: float64"),
+			expectedError: fmt.Errorf("expected bool value for BoolFunc check, got: json.Number"),
 		},
 		"failure": {
 			self: knownvalue.BoolFunc(func(b bool) error {

knownvalue/float32_func_test.go

@@ -30,6 +30,11 @@ func TestFloat32Func_CheckValue(t *testing.T) {
 			other:         "wrongtype",
 			expectedError: fmt.Errorf("expected json.Number value for Float32Func check, got: string"),
 		},
+		"no-digits": {
+			self:          knownvalue.Float32Func(func(float32) error { return nil }),
+			other:         json.Number("str"),
+			expectedError: fmt.Errorf("expected json.Number to be parseable as float32 value for Float32Func check: strconv.ParseFloat: parsing \"str\": invalid syntax"),
+		},
 		"failure": {
 			self: knownvalue.Float32Func(func(f float32) error {
 				if f != 1.1 {

knownvalue/float64_func_test.go

@@ -30,6 +30,11 @@ func TestFloat64Func_CheckValue(t *testing.T) {
 			other:         "wrongtype",
 			expectedError: fmt.Errorf("expected json.Number value for Float64Func check, got: string"),
 		},
+		"no-digits": {
+			self:          knownvalue.Float64Func(func(float64) error { return nil }),
+			other:         json.Number("str"),
+			expectedError: fmt.Errorf("expected json.Number to be parseable as float64 value for Float64Func check: strconv.ParseFloat: parsing \"str\": invalid syntax"),
+		},
 		"failure": {
 			self: knownvalue.Float64Func(func(f float64) error {
 				if f != 1.1 {

knownvalue/int32_func_test.go

@@ -30,6 +30,11 @@ func TestInt32Func_CheckValue(t *testing.T) {
 			other:         "wrongtype",
 			expectedError: fmt.Errorf("expected json.Number value for Int32Func check, got: string"),
 		},
+		"no-digits": {
+			self:          knownvalue.Int32Func(func(int32) error { return nil }),
+			other:         json.Number("str"),
+			expectedError: fmt.Errorf("expected json.Number to be parseable as int32 value for Int32Func check: strconv.ParseInt: parsing \"str\": invalid syntax"),
+		},
 		"failure": {
 			self: knownvalue.Int32Func(func(i int32) error {
 				if i != 1 {

knownvalue/int64_func_test.go

@@ -23,12 +23,17 @@ func TestInt64Func_CheckValue(t *testing.T) {
 	}{
 		"nil": {
 			self:          knownvalue.Int64Func(func(int64) error { return nil }),
-			expectedError: fmt.Errorf("expected json.Number value for Int32Func check, got: <nil>"),
+			expectedError: fmt.Errorf("expected json.Number value for Int64Func check, got: <nil>"),
 		},
 		"wrong-type": {
 			self:          knownvalue.Int64Func(func(int64) error { return nil }),
 			other:         "wrongtype",
-			expectedError: fmt.Errorf("expected json.Number value for Int32Func check, got: string"),
+			expectedError: fmt.Errorf("expected json.Number value for Int64Func check, got: string"),
+		},
+		"no-digits": {
+			self:          knownvalue.Int64Func(func(int64) error { return nil }),
+			other:         json.Number("str"),
+			expectedError: fmt.Errorf("expected json.Number to be parseable as int64 value for Int64Func check: strconv.ParseInt: parsing \"str\": invalid syntax"),
 		},
 		"failure": {
 			self: knownvalue.Int64Func(func(i int64) error {

knownvalue/number_func.go

@@ -26,7 +26,7 @@ func (v numberFunc) CheckValue(other any) error {
 
 	otherVal, _, err := big.ParseFloat(jsonNum.String(), 10, 512, big.ToNearestEven)
 	if err != nil {
-		return fmt.Errorf("expected json.Number to be parseable as int64 value for NumberFunc check: %s", err)
+		return fmt.Errorf("expected json.Number to be parseable as big.Float value for NumberFunc check: %s", err)
 	}
 
 	return v.checkFunc(otherVal)

knownvalue/number_func_test.go

@@ -17,6 +17,11 @@ import (
 func TestNumberFunc_CheckValue(t *testing.T) {
 	t.Parallel()
 
+	expected, _, err := big.ParseFloat("1.797693134862315797693134862315797693134862315", 10, 512, big.ToNearestEven)
+	if err != nil {
+		t.Errorf("%s", err)
+	}
+
 	testCases := map[string]struct {
 		self          knownvalue.Check
 		other         any
@@ -31,24 +36,29 @@ func TestNumberFunc_CheckValue(t *testing.T) {
 			other:         "wrongtype",
 			expectedError: fmt.Errorf("expected json.Number value for NumberFunc check, got: string"),
 		},
+		"no-digits": {
+			self:          knownvalue.NumberFunc(func(*big.Float) error { return nil }),
+			other:         json.Number("str"),
+			expectedError: fmt.Errorf("expected json.Number to be parseable as big.Float value for NumberFunc check: number has no digits"),
+		},
 		"failure": {
 			self: knownvalue.NumberFunc(func(i *big.Float) error {
-				if i != big.NewFloat(1.667114241575161769818551140818851511176942075) {
-					return fmt.Errorf("%f was not 1.667114241575161769818551140818851511176942075", i)
+				if i.Cmp(expected) != 0 {
+					return fmt.Errorf("%s was not %s", i.Text('f', -1), expected.Text('f', -1))
 				}
 				return nil
 			}),
-			other:         json.Number("1.797693134862315797693134862315797693134862315"),
-			expectedError: fmt.Errorf("%f was not 1.667114241575161769818551140818851511176942075", 1.797693134862315797693134862315797693134862315),
+			other:         json.Number("1.667114241575161769818551140818851511176942075"),
+			expectedError: fmt.Errorf("1.667114241575161769818551140818851511176942075 was not 1.797693134862315797693134862315797693134862315"),
 		},
 		"success": {
 			self: knownvalue.NumberFunc(func(i *big.Float) error {
-				if i != big.NewFloat(1.667114241575161769818551140818851511176942075) {
-					return fmt.Errorf("%f was not 1.667114241575161769818551140818851511176942075", i)
+				if i.Cmp(expected) != 0 {
+					return fmt.Errorf("%s was not %s", i.Text('f', -1), expected.Text('f', -1))
 				}
 				return nil
 			}),
-			other: json.Number("1.667114241575161769818551140818851511176942075"),
+			other: json.Number("1.797693134862315797693134862315797693134862315"),
 		},
 	}
 

knownvalue/string_func_test.go

@@ -70,7 +70,7 @@ func TestStringFunc_String(t *testing.T) {
 
 	got := knownvalue.StringFunc(func(string) error { return nil }).String()
 
-	if diff := cmp.Diff(got, "stringFunc"); diff != "" {
+	if diff := cmp.Diff(got, "StringFunc"); diff != "" {
 		t.Errorf("unexpected difference: %s", diff)
 	}
 }