Skip to content

Commit b5d7f59

Browse files
authored
Merge pull request #2190 from smallstep/herman/fix-cast-test-32bit
Fix `cast` package tests on `linux/arm32`
2 parents 7efdfe5 + 8609012 commit b5d7f59

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

internal/cast/cast.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ func Int32[T signed](x T) int32 {
6868
return i32
6969
}
7070

71-
func SafeUint32(x int) (uint32, error) {
71+
func SafeUint32[T signed](x T) (uint32, error) {
7272
return safecast.ToUint32(x)
7373
}
7474

75-
func Uint32(x int) uint32 {
75+
func Uint32[T signed](x T) uint32 {
7676
u32, err := SafeUint32(x)
7777
if err != nil {
7878
panic(err)

internal/cast/cast_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestInt64ConvertsValues(t *testing.T) {
2424
}
2525

2626
func TestInt64PanicsOnLargeValue(t *testing.T) {
27-
require.Panics(t, func() { Int64(uint64(math.MaxInt + 1)) })
27+
require.Panics(t, func() { Int64(uint64(math.MaxInt64 + 1)) })
2828
}
2929

3030
func TestUint64ConvertsValues(t *testing.T) {
@@ -44,16 +44,16 @@ func TestInt32ConvertsValues(t *testing.T) {
4444
}
4545

4646
func TestInt32PanicsOnTooSmallValue(t *testing.T) {
47-
require.Panics(t, func() { Int32(math.MinInt32 - 1) })
47+
require.Panics(t, func() { Int32(int64(math.MinInt32 - 1)) })
4848
}
4949

5050
func TestInt32PanicsOnLargeValue(t *testing.T) {
51-
require.Panics(t, func() { Int32(math.MaxInt32 + 1) })
51+
require.Panics(t, func() { Int32(int64(math.MaxInt32 + 1)) })
5252
}
5353

5454
func TestUint32ConvertsValues(t *testing.T) {
5555
require.Equal(t, uint32(0), Uint32(0))
56-
require.Equal(t, uint32(math.MaxUint32), Uint32(math.MaxUint32))
56+
require.Equal(t, uint32(math.MaxUint32), Uint32(int64(math.MaxUint32)))
5757
require.Equal(t, uint32(42), Uint32(42))
5858
}
5959

@@ -62,8 +62,9 @@ func TestUint32PanicsOnNegativeValue(t *testing.T) {
6262
}
6363

6464
func TestUint32PanicsOnLargeValue(t *testing.T) {
65-
require.Panics(t, func() { Uint32(math.MaxUint32 + 1) })
65+
require.Panics(t, func() { Uint32(int64(math.MaxUint32 + 1)) })
6666
}
67+
6768
func TestUint16ConvertsValues(t *testing.T) {
6869
require.Equal(t, uint16(0), Uint16(0))
6970
require.Equal(t, uint16(math.MaxUint16), Uint16(math.MaxUint16))
@@ -75,5 +76,5 @@ func TestUint16PanicsOnNegativeValue(t *testing.T) {
7576
}
7677

7778
func TestUint16PanicsOnLargeValue(t *testing.T) {
78-
require.Panics(t, func() { Uint16(math.MaxUint32 + 1) })
79+
require.Panics(t, func() { Uint16(math.MaxUint16 + 1) })
7980
}

0 commit comments

Comments
 (0)