Files
gf/util/gconv/gconv_z_unit_int_test.go
hailaz ee24da4e72 refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.

**Type alias migration to `any`:**

* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)

**Generated code and templates:**

* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)

**Container and utility updates:**

* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)

These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
2025-08-28 16:53:19 +08:00

296 lines
7.4 KiB
Go

// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
//
// This Source Code Form is subject to the terms of the MIT License.
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://github.com/gogf/gf.
package gconv_test
import (
"reflect"
"testing"
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
)
var (
intTestValue = 123
int8TestValue = int8(123)
int16TestValue = int16(123)
int32TestValue = int32(123)
int64TestValue = int64(123)
)
var intTests = []struct {
value any
expect int
expect8 int8
expect16 int16
expect32 int32
expect64 int64
}{
{true, 1, 1, 1, 1, 1},
{false, 0, 0, 0, 0, 0},
{int(0), 0, 0, 0, 0, 0},
{int(123), 123, 123, 123, 123, 123},
{int8(123), 123, 123, 123, 123, 123},
{int16(123), 123, 123, 123, 123, 123},
{int32(123), 123, 123, 123, 123, 123},
{int64(123), 123, 123, 123, 123, 123},
{uint(0), 0, 0, 0, 0, 0},
{uint(123), 123, 123, 123, 123, 123},
{uint8(123), 123, 123, 123, 123, 123},
{uint16(123), 123, 123, 123, 123, 123},
{uint32(123), 123, 123, 123, 123, 123},
{uint64(123), 123, 123, 123, 123, 123},
{uintptr(0), 0, 0, 0, 0, 0},
{uintptr(123), 123, 123, 123, 123, 123},
{rune(0), 0, 0, 0, 0, 0},
{rune(49), 49, 49, 49, 49, 49},
{float32(123), 123, 123, 123, 123, 123},
{float64(123.456), 123, 123, 123, 123, 123},
{[]byte(""), 0, 0, 0, 0, 0},
{"", 0, 0, 0, 0, 0},
{"0", 0, 0, 0, 0, 0},
{"1", 1, 1, 1, 1, 1},
{"+1", 1, 1, 1, 1, 1},
{"-1", -1, -1, -1, -1, -1},
{"0xA", 10, 10, 10, 10, 10},
{"-0xA", -10, -10, -10, -10, -10},
{"0XA", 10, 10, 10, 10, 10},
{"-0XA", -10, -10, -10, -10, -10},
{"123.456", 123, 123, 123, 123, 123},
{"-123.456", -123, -123, -123, -123, -123},
{"true", 0, 0, 0, 0, 0},
{"false", 0, 0, 0, 0, 0},
{"on", 0, 0, 0, 0, 0},
{"off", 0, 0, 0, 0, 0},
{"NaN", 0, 0, 0, 0, 0},
{complex(1, 2), 0, 0, 0, 0, 0},
{complex(123.456, 789.123), 0, 0, 0, 0, 0},
{[3]int{1, 2, 3}, 0, 0, 0, 0, 0},
{[]int{1, 2, 3}, 0, 0, 0, 0, 0},
{map[int]int{1: 1}, 0, 0, 0, 0, 0},
{map[string]string{"Earth": "大西洋"}, 0, 0, 0, 0, 0},
{struct{}{}, 0, 0, 0, 0, 0},
{nil, 0, 0, 0, 0, 0},
{(*int)(nil), 0, 0, 0, 0, 0},
{(*int8)(nil), 0, 0, 0, 0, 0},
{(*int16)(nil), 0, 0, 0, 0, 0},
{(*int32)(nil), 0, 0, 0, 0, 0},
{(*int64)(nil), 0, 0, 0, 0, 0},
{gvar.New(123), 123, 123, 123, 123, 123},
{gvar.New(123.456), 123, 123, 123, 123, 123},
{&intTestValue, 123, 123, 123, 123, 123},
{&int8TestValue, 123, 123, 123, 123, 123},
{&int16TestValue, 123, 123, 123, 123, 123},
{&int32TestValue, 123, 123, 123, 123, 123},
{&int64TestValue, 123, 123, 123, 123, 123},
{(myInt)(intTestValue), 123, 123, 123, 123, 123},
{(myInt8)(int8TestValue), 123, 123, 123, 123, 123},
{(myInt16)(int16TestValue), 123, 123, 123, 123, 123},
{(myInt32)(int32TestValue), 123, 123, 123, 123, 123},
{(myInt64)(int64TestValue), 123, 123, 123, 123, 123},
{(*myInt)(&intTestValue), 123, 123, 123, 123, 123},
{(*myInt8)(&int8TestValue), 123, 123, 123, 123, 123},
{(*myInt16)(&int16TestValue), 123, 123, 123, 123, 123},
{(*myInt32)(&int32TestValue), 123, 123, 123, 123, 123},
{(*myInt64)(&int64TestValue), 123, 123, 123, 123, 123},
{(*myInt)(nil), 0, 0, 0, 0, 0},
{(*myInt8)(nil), 0, 0, 0, 0, 0},
{(*myInt16)(nil), 0, 0, 0, 0, 0},
{(*myInt32)(nil), 0, 0, 0, 0, 0},
{(*myInt64)(nil), 0, 0, 0, 0, 0},
}
func TestInt(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
t.AssertEQ(gconv.Int(test.value), test.expect)
}
})
}
func TestInt8(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
t.AssertEQ(gconv.Int8(test.value), test.expect8)
}
})
}
func TestInt16(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
t.AssertEQ(gconv.Int16(test.value), test.expect16)
}
})
}
func TestInt32(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
t.AssertEQ(gconv.Int32(test.value), test.expect32)
}
})
}
func TestInt64(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
t.AssertEQ(gconv.Int64(test.value), test.expect64)
}
})
}
func TestInts(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
if test.value == nil {
t.AssertNil(gconv.Ints(test.value))
continue
}
var (
sliceType = reflect.SliceOf(reflect.TypeOf(test.value))
ints = reflect.MakeSlice(sliceType, 0, 0)
expects = []int{
test.expect, test.expect,
}
)
ints = reflect.Append(ints, reflect.ValueOf(test.value))
ints = reflect.Append(ints, reflect.ValueOf(test.value))
t.AssertEQ(gconv.Ints(ints.Interface()), expects)
t.AssertEQ(gconv.SliceInt(ints.Interface()), expects)
}
})
// Test for special types.
gtest.C(t, func(t *gtest.T) {
// string
t.AssertEQ(gconv.Ints(""), []int{})
t.AssertEQ(gconv.Ints("123"), []int{123})
// []int8 json
t.AssertEQ(gconv.Ints([]uint8(`{"Name":"Earth"}`)),
[]int{123, 34, 78, 97, 109, 101, 34, 58, 34, 69, 97, 114, 116, 104, 34, 125})
// []interface
t.AssertEQ(gconv.Ints([]any{1, 2, 3}), []int{1, 2, 3})
// gvar.Var
t.AssertEQ(gconv.Ints(
gvar.New([]int{1, 2, 3}),
), []int{1, 2, 3})
// array
t.AssertEQ(gconv.Ints("[1, 2]"), []int{1, 2})
})
}
func TestInt32s(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
if test.value == nil {
t.AssertNil(gconv.Int32s(test.value))
continue
}
var (
sliceType = reflect.SliceOf(reflect.TypeOf(test.value))
int32s = reflect.MakeSlice(sliceType, 0, 0)
expects = []int32{
test.expect32, test.expect32,
}
)
int32s = reflect.Append(int32s, reflect.ValueOf(test.value))
int32s = reflect.Append(int32s, reflect.ValueOf(test.value))
t.AssertEQ(gconv.Int32s(int32s.Interface()), expects)
t.AssertEQ(gconv.SliceInt32(int32s.Interface()), expects)
}
})
// Test for special types.
gtest.C(t, func(t *gtest.T) {
// string
t.AssertEQ(gconv.Int32s(""), []int32{})
t.AssertEQ(gconv.Int32s("123"), []int32{123})
// []int8 json
t.AssertEQ(gconv.Int32s([]uint8(`{"Name":"Earth"}"`)),
[]int32{123, 34, 78, 97, 109, 101, 34, 58, 34, 69, 97, 114, 116, 104, 34, 125, 34})
// []interface
t.AssertEQ(gconv.Int32s([]any{1, 2, 3}), []int32{1, 2, 3})
// gvar.Var
t.AssertEQ(gconv.Int32s(
gvar.New([]int32{1, 2, 3}),
), []int32{1, 2, 3})
})
}
func TestInt64s(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
for _, test := range intTests {
if test.value == nil {
t.AssertNil(gconv.Int64s(test.value))
continue
}
var (
sliceType = reflect.SliceOf(reflect.TypeOf(test.value))
int64s = reflect.MakeSlice(sliceType, 0, 0)
expects = []int64{
test.expect64, test.expect64,
}
)
int64s = reflect.Append(int64s, reflect.ValueOf(test.value))
int64s = reflect.Append(int64s, reflect.ValueOf(test.value))
t.AssertEQ(gconv.Int64s(int64s.Interface()), expects)
t.AssertEQ(gconv.SliceInt64(int64s.Interface()), expects)
}
})
// Test for special types.
gtest.C(t, func(t *gtest.T) {
// string
t.AssertEQ(gconv.Int64s(""), []int64{})
t.AssertEQ(gconv.Int64s("123"), []int64{123})
// []int8 json
t.AssertEQ(gconv.Int64s([]uint8(`{"Name":"Earth"}"`)),
[]int64{123, 34, 78, 97, 109, 101, 34, 58, 34, 69, 97, 114, 116, 104, 34, 125, 34})
// []interface
t.AssertEQ(gconv.Int64s([]any{1, 2, 3}), []int64{1, 2, 3})
// gvar.Var
t.AssertEQ(gconv.Int64s(
gvar.New([]int64{1, 2, 3}),
), []int64{1, 2, 3})
})
}