Skip to content

test: upgraded tests to use generics #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredbi merged 1 commit into from
Feb 11, 2026
Merged

test: upgraded tests to use generics #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions conv/convert_format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ func TestConvertBool(t *testing.T) {
for k := range evaluatesAsTrue {
r, err := ConvertBool(k)
require.NoError(t, err)
assert.True(t, r)
assert.TrueT(t, r)
}
for _, k := range []string{"a", "", "0", "false", "unchecked", "anythingElse"} {
r, err := ConvertBool(k)
require.NoError(t, err)
assert.False(t, r)
assert.FalseT(t, r)
}
}

func TestFormatBool(t *testing.T) {
assert.Equal(t, "true", FormatBool(true))
assert.Equal(t, "false", FormatBool(false))
assert.EqualT(t, "true", FormatBool(true))
assert.EqualT(t, "false", FormatBool(false))
}

func TestConvertFloat(t *testing.T) {
Expand All @@ -58,11 +58,11 @@ func TestConvertFloat(t *testing.T) {
str := FormatFloat(f)
c1, err := ConvertFloat32(str)
require.NoError(t, err)
assert.InDelta(t, f, c1, 1e-6)
assert.InDeltaT(t, f, c1, 1e-6)

c2, err := ConvertFloat[float32](str)
require.NoError(t, err)
assert.InDelta(t, c1, c2, 1e-6)
assert.InDeltaT(t, c1, c2, 1e-6)
}

for _, f := range invalidFloats {
Expand All @@ -82,11 +82,11 @@ func TestConvertFloat(t *testing.T) {
str := FormatFloat(f)
c1, err := ConvertFloat64(str)
require.NoError(t, err)
assert.InDelta(t, f, c1, 1e-6)
assert.InDeltaT(t, f, c1, 1e-6)

c2, err := ConvertFloat64(str)
require.NoError(t, err)
assert.InDelta(t, c1, c2, 1e-6)
assert.InDeltaT(t, c1, c2, 1e-6)
}

for _, f := range invalidFloats {
Expand All @@ -108,11 +108,11 @@ func TestConvertInteger(t *testing.T) {
str := FormatInteger(f)
c1, err := ConvertInt8(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertInteger[int8](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidInts {
Expand All @@ -132,11 +132,11 @@ func TestConvertInteger(t *testing.T) {
str := FormatInteger(f)
c1, err := ConvertInt16(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertInteger[int16](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidInts {
Expand All @@ -156,11 +156,11 @@ func TestConvertInteger(t *testing.T) {
str := FormatInteger(f)
c1, err := ConvertInt32(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertInteger[int32](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidInts {
Expand All @@ -180,11 +180,11 @@ func TestConvertInteger(t *testing.T) {
str := FormatInteger(f)
c1, err := ConvertInt64(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertInt64(str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidInts {
Expand All @@ -206,11 +206,11 @@ func TestConvertUinteger(t *testing.T) {
str := FormatUinteger(f)
c1, err := ConvertUint8(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertUinteger[uint8](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidInts {
Expand All @@ -230,11 +230,11 @@ func TestConvertUinteger(t *testing.T) {
str := FormatUinteger(f)
c1, err := ConvertUint16(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertUinteger[uint16](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidUints {
Expand All @@ -254,11 +254,11 @@ func TestConvertUinteger(t *testing.T) {
str := FormatUinteger(f)
c1, err := ConvertUint32(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertUint32(str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}

for _, f := range invalidUints {
Expand All @@ -278,11 +278,11 @@ func TestConvertUinteger(t *testing.T) {
str := FormatUinteger(f)
c1, err := ConvertUint64(str)
require.NoError(t, err)
assert.Equal(t, f, c1)
assert.EqualT(t, f, c1)

c2, err := ConvertUinteger[uint64](str)
require.NoError(t, err)
assert.Equal(t, c1, c2)
assert.EqualT(t, c1, c2)
}
for _, f := range invalidUints {
_, err := ConvertUint64(f)
Expand Down Expand Up @@ -323,35 +323,35 @@ func testNotIntegers(fn func(float64) bool, skipKnownFailure bool) func(*testing
_ = skipKnownFailure

return func(t *testing.T) {
assert.False(t, fn(math.Inf(1)))
assert.False(t, fn(maxJSONFloat+1))
assert.False(t, fn(minJSONFloat-1))
assert.False(t, fn(math.SmallestNonzeroFloat64))
assert.False(t, fn(0.5))
assert.False(t, fn(0.25))
assert.False(t, fn(1.00/func() float64 { return 2.00 }()))
assert.False(t, fn(1.00/func() float64 { return 4.00 }()))
assert.False(t, fn(epsilon))
assert.FalseT(t, fn(math.Inf(1)))
assert.FalseT(t, fn(maxJSONFloat+1))
assert.FalseT(t, fn(minJSONFloat-1))
assert.FalseT(t, fn(math.SmallestNonzeroFloat64))
assert.FalseT(t, fn(0.5))
assert.FalseT(t, fn(0.25))
assert.FalseT(t, fn(1.00/func() float64 { return 2.00 }()))
assert.FalseT(t, fn(1.00/func() float64 { return 4.00 }()))
assert.FalseT(t, fn(epsilon))
}
}

func testIntegers(fn func(float64) bool, skipKnownFailure bool) func(*testing.T) {
// wrapping in a function forces non-constant evaluation to test float64 rounding behavior
return func(t *testing.T) {
assert.True(t, fn(0.0))
assert.True(t, fn(1.0))
assert.True(t, fn(maxJSONFloat))
assert.True(t, fn(minJSONFloat))
assert.TrueT(t, fn(0.0))
assert.TrueT(t, fn(1.0))
assert.TrueT(t, fn(maxJSONFloat))
assert.TrueT(t, fn(minJSONFloat))
if !skipKnownFailure {
assert.True(t, fn(1/0.01*67.15000001))
assert.TrueT(t, fn(1/0.01*67.15000001))
}
if !skipKnownFailure {
assert.True(t, fn(1.00/func() float64 { return 0.01 }()*4643.4))
assert.TrueT(t, fn(1.00/func() float64 { return 0.01 }()*4643.4))
}
assert.True(t, fn(1.00/func() float64 { return 1.00 / 3.00 }()))
assert.True(t, fn(math.SmallestNonzeroFloat64/2))
assert.True(t, fn(math.SmallestNonzeroFloat64/3))
assert.True(t, fn(math.SmallestNonzeroFloat64/4))
assert.TrueT(t, fn(1.00/func() float64 { return 1.00 / 3.00 }()))
assert.TrueT(t, fn(math.SmallestNonzeroFloat64/2))
assert.TrueT(t, fn(math.SmallestNonzeroFloat64/3))
assert.TrueT(t, fn(math.SmallestNonzeroFloat64/4))
}
}

Expand Down
8 changes: 4 additions & 4 deletions conv/convert_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func TestPointer(t *testing.T) {
}

func assertSingleValue(t *testing.T, inElem, elem reflect.Value, expectPointer bool, idx int) {
require.Equalf(t,
require.EqualTf(t,
expectPointer, (elem.Kind() == reflect.Ptr),
"unexpected expectPointer=%t value type %T at idx %d", expectPointer, elem, idx,
)
Expand All @@ -144,7 +144,7 @@ func assertSingleValue(t *testing.T, inElem, elem reflect.Value, expectPointer b
elem = reflect.Indirect(elem)
}

require.Truef(t,
require.TrueTf(t,
(elem.Kind() == reflect.Ptr && elem.IsNil()) ||
typeutils.IsZero(elem.Interface()) == (inElem.Kind() == reflect.Ptr && inElem.IsNil()) ||
typeutils.IsZero(inElem.Interface()),
Expand All @@ -168,10 +168,10 @@ func assertValues(t *testing.T, in, out any, expectPointer bool, idx int) {

switch vin.Kind() { //nolint:exhaustive
case reflect.Slice, reflect.Map:
require.Equalf(t, vin.Kind(), vout.Kind(),
require.EqualTf(t, vin.Kind(), vout.Kind(),
"unexpected output type at idx %d", idx,
)
require.Equalf(t, vin.Len(), vout.Len(),
require.EqualTf(t, vin.Len(), vout.Len(),
"unexpected len at idx %d", idx,
)

Expand Down
66 changes: 33 additions & 33 deletions conv_iface_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,109 +16,109 @@ func TestConvIface(t *testing.T) {

t.Run("deprecated Convert functions should work", func(t *testing.T) {
// only check happy path - more comprehensive testing is carried out inside the called package
assert.True(t, IsFloat64AJSONInteger(1.00))
assert.TrueT(t, IsFloat64AJSONInteger(1.00))

b, err := ConvertBool("true")
require.NoError(t, err)
assert.True(t, b)
assert.TrueT(t, b)

f32, err := ConvertFloat32("1.05")
require.NoError(t, err)
assert.InDelta(t, float32(1.05), f32, epsilon)
assert.InDeltaT(t, float32(1.05), f32, epsilon)

f64, err := ConvertFloat64("1.05")
require.NoError(t, err)
assert.InDelta(t, float32(1.05), f64, epsilon)

i8, err := ConvertInt8("2")
require.NoError(t, err)
assert.Equal(t, int8(2), i8)
assert.EqualT(t, int8(2), i8)

i16, err := ConvertInt16("2")
require.NoError(t, err)
assert.Equal(t, int16(2), i16)
assert.EqualT(t, int16(2), i16)

i32, err := ConvertInt32("2")
require.NoError(t, err)
assert.Equal(t, int32(2), i32)
assert.EqualT(t, int32(2), i32)

i64, err := ConvertInt64("2")
require.NoError(t, err)
assert.Equal(t, int64(2), i64)
assert.EqualT(t, int64(2), i64)

u8, err := ConvertUint8("2")
require.NoError(t, err)
assert.Equal(t, uint8(2), u8)
assert.EqualT(t, uint8(2), u8)

u16, err := ConvertUint16("2")
require.NoError(t, err)
assert.Equal(t, uint16(2), u16)
assert.EqualT(t, uint16(2), u16)

u32, err := ConvertUint32("2")
require.NoError(t, err)
assert.Equal(t, uint32(2), u32)
assert.EqualT(t, uint32(2), u32)

u64, err := ConvertUint64("2")
require.NoError(t, err)
assert.Equal(t, uint64(2), u64)
assert.EqualT(t, uint64(2), u64)
})

t.Run("deprecated Format functions should work", func(t *testing.T) {
assert.Equal(t, "true", FormatBool(true))
assert.Equal(t, "1.05", FormatFloat32(1.05))
assert.Equal(t, "1.05", FormatFloat64(1.05))
assert.Equal(t, "1", FormatInt8(1))
assert.Equal(t, "1", FormatInt16(1))
assert.Equal(t, "1", FormatInt32(1))
assert.Equal(t, "1", FormatInt64(1))
assert.Equal(t, "1", FormatUint8(1))
assert.Equal(t, "1", FormatUint16(1))
assert.Equal(t, "1", FormatUint32(1))
assert.Equal(t, "1", FormatUint64(1))
assert.EqualT(t, "true", FormatBool(true))
assert.EqualT(t, "1.05", FormatFloat32(1.05))
assert.EqualT(t, "1.05", FormatFloat64(1.05))
assert.EqualT(t, "1", FormatInt8(1))
assert.EqualT(t, "1", FormatInt16(1))
assert.EqualT(t, "1", FormatInt32(1))
assert.EqualT(t, "1", FormatInt64(1))
assert.EqualT(t, "1", FormatUint8(1))
assert.EqualT(t, "1", FormatUint16(1))
assert.EqualT(t, "1", FormatUint32(1))
assert.EqualT(t, "1", FormatUint64(1))
})

t.Run("deprecated pointer functions should work", func(t *testing.T) {
assert.Equal(t, "a", StringValue(String("a")))
assert.EqualT(t, "a", StringValue(String("a")))
assert.Equal(t, []string{"a"}, StringValueSlice(StringSlice([]string{"a"})))
assert.Equal(t, map[string]string{"1": "a"}, StringValueMap(StringMap(map[string]string{"1": "a"})))

assert.True(t, BoolValue(Bool(true)))
assert.TrueT(t, BoolValue(Bool(true)))
assert.Equal(t, []bool{true}, BoolValueSlice(BoolSlice([]bool{true})))
assert.Equal(t, map[string]bool{"1": true}, BoolValueMap(BoolMap(map[string]bool{"1": true})))

assert.Equal(t, 1, IntValue(Int(1)))
assert.EqualT(t, 1, IntValue(Int(1)))
assert.Equal(t, []int{1}, IntValueSlice(IntSlice([]int{1})))
assert.Equal(t, map[string]int{"1": 1}, IntValueMap(IntMap(map[string]int{"1": 1})))

assert.Equal(t, int32(1), Int32Value(Int32(1)))
assert.EqualT(t, int32(1), Int32Value(Int32(1)))
assert.Equal(t, []int32{1}, Int32ValueSlice(Int32Slice([]int32{1})))
assert.Equal(t, map[string]int32{"1": 1}, Int32ValueMap(Int32Map(map[string]int32{"1": 1})))

assert.Equal(t, int64(1), Int64Value(Int64(1)))
assert.EqualT(t, int64(1), Int64Value(Int64(1)))
assert.Equal(t, []int64{1}, Int64ValueSlice(Int64Slice([]int64{1})))
assert.Equal(t, map[string]int64{"1": 1}, Int64ValueMap(Int64Map(map[string]int64{"1": 1})))

assert.Equal(t, uint16(1), Uint16Value(Uint16(1)))
assert.EqualT(t, uint16(1), Uint16Value(Uint16(1)))
assert.Equal(t, []uint16{1}, Uint16ValueSlice(Uint16Slice([]uint16{1})))
assert.Equal(t, map[string]uint16{"1": 1}, Uint16ValueMap(Uint16Map(map[string]uint16{"1": 1})))

assert.Equal(t, uint32(1), Uint32Value(Uint32(1)))
assert.EqualT(t, uint32(1), Uint32Value(Uint32(1)))
assert.Equal(t, []uint32{1}, Uint32ValueSlice(Uint32Slice([]uint32{1})))
assert.Equal(t, map[string]uint32{"1": 1}, Uint32ValueMap(Uint32Map(map[string]uint32{"1": 1})))

assert.Equal(t, uint64(1), Uint64Value(Uint64(1)))
assert.EqualT(t, uint64(1), Uint64Value(Uint64(1)))
assert.Equal(t, []uint64{1}, Uint64ValueSlice(Uint64Slice([]uint64{1})))
assert.Equal(t, map[string]uint64{"1": 1}, Uint64ValueMap(Uint64Map(map[string]uint64{"1": 1})))

assert.Equal(t, uint(1), UintValue(Uint(1)))
assert.EqualT(t, uint(1), UintValue(Uint(1)))
assert.Equal(t, []uint{1}, UintValueSlice(UintSlice([]uint{1})))
assert.Equal(t, map[string]uint{"1": 1}, UintValueMap(UintMap(map[string]uint{"1": 1})))

assert.InDelta(t, float32(1.00), Float32Value(Float32(1.00)), epsilon)
assert.InDeltaT(t, float32(1.00), Float32Value(Float32(1.00)), epsilon)
assert.Equal(t, []float32{1.00}, Float32ValueSlice(Float32Slice([]float32{1.00})))
assert.Equal(t, map[string]float32{"1": 1.00}, Float32ValueMap(Float32Map(map[string]float32{"1": 1.00})))

assert.InDelta(t, float64(1.00), Float64Value(Float64(1)), epsilon)
assert.InDeltaT(t, float64(1.00), Float64Value(Float64(1)), epsilon)
assert.Equal(t, []float64{1.00}, Float64ValueSlice(Float64Slice([]float64{1.00})))
assert.Equal(t, map[string]float64{"1": 1.00}, Float64ValueMap(Float64Map(map[string]float64{"1": 1.00})))

Expand Down
Loading
Loading