mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
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.
408 lines
11 KiB
Go
408 lines
11 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 gtest
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/gogf/gf/v2/debug/gdebug"
|
|
"github.com/gogf/gf/v2/internal/empty"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
const (
|
|
pathFilterKey = "/test/gtest/gtest"
|
|
)
|
|
|
|
// C creates a unit testing case.
|
|
// The parameter `t` is the pointer to testing.T of stdlib (*testing.T).
|
|
// The parameter `f` is the closure function for unit testing case.
|
|
func C(t *testing.T, f func(t *T)) {
|
|
defer func() {
|
|
if err := recover(); err != nil {
|
|
_, _ = fmt.Fprintf(os.Stderr, "%v\n%s", err, gdebug.StackWithFilter([]string{pathFilterKey}))
|
|
t.Fail()
|
|
}
|
|
}()
|
|
f(&T{t})
|
|
}
|
|
|
|
// Assert checks `value` and `expect` EQUAL.
|
|
func Assert(value, expect any) {
|
|
rvExpect := reflect.ValueOf(expect)
|
|
if empty.IsNil(value) {
|
|
value = nil
|
|
}
|
|
if rvExpect.Kind() == reflect.Map {
|
|
if err := compareMap(value, expect); err != nil {
|
|
panic(err)
|
|
}
|
|
return
|
|
}
|
|
var (
|
|
strValue = gconv.String(value)
|
|
strExpect = gconv.String(expect)
|
|
)
|
|
if strValue != strExpect {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v == %v`, strValue, strExpect))
|
|
}
|
|
}
|
|
|
|
// AssertEQ checks `value` and `expect` EQUAL, including their TYPES.
|
|
func AssertEQ(value, expect any) {
|
|
// Value assert.
|
|
rvExpect := reflect.ValueOf(expect)
|
|
if empty.IsNil(value) {
|
|
value = nil
|
|
}
|
|
if rvExpect.Kind() == reflect.Map {
|
|
if err := compareMap(value, expect); err != nil {
|
|
panic(err)
|
|
}
|
|
return
|
|
}
|
|
strValue := gconv.String(value)
|
|
strExpect := gconv.String(expect)
|
|
if strValue != strExpect {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v == %v`, strValue, strExpect))
|
|
}
|
|
// Type assert.
|
|
t1 := reflect.TypeOf(value)
|
|
t2 := reflect.TypeOf(expect)
|
|
if t1 != t2 {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT TYPE %v[%v] == %v[%v]`, strValue, t1, strExpect, t2))
|
|
}
|
|
}
|
|
|
|
// AssertNE checks `value` and `expect` NOT EQUAL.
|
|
func AssertNE(value, expect any) {
|
|
rvExpect := reflect.ValueOf(expect)
|
|
if empty.IsNil(value) {
|
|
value = nil
|
|
}
|
|
if rvExpect.Kind() == reflect.Map {
|
|
if err := compareMap(value, expect); err == nil {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v != %v`, value, expect))
|
|
}
|
|
return
|
|
}
|
|
var (
|
|
strValue = gconv.String(value)
|
|
strExpect = gconv.String(expect)
|
|
)
|
|
if strValue == strExpect {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v != %v`, strValue, strExpect))
|
|
}
|
|
}
|
|
|
|
// AssertNQ checks `value` and `expect` NOT EQUAL, including their TYPES.
|
|
func AssertNQ(value, expect any) {
|
|
// Type assert.
|
|
t1 := reflect.TypeOf(value)
|
|
t2 := reflect.TypeOf(expect)
|
|
if t1 == t2 {
|
|
panic(
|
|
fmt.Sprintf(
|
|
`[ASSERT] EXPECT TYPE %v[%v] != %v[%v]`,
|
|
gconv.String(value), t1, gconv.String(expect), t2,
|
|
),
|
|
)
|
|
}
|
|
// Value assert.
|
|
AssertNE(value, expect)
|
|
}
|
|
|
|
// AssertGT checks `value` is GREATER THAN `expect`.
|
|
// Notice that, only string, integer and float types can be compared by AssertGT,
|
|
// others are invalid.
|
|
func AssertGT(value, expect any) {
|
|
passed := false
|
|
switch reflect.ValueOf(expect).Kind() {
|
|
case reflect.String:
|
|
passed = gconv.String(value) > gconv.String(expect)
|
|
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
passed = gconv.Int(value) > gconv.Int(expect)
|
|
|
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
passed = gconv.Uint(value) > gconv.Uint(expect)
|
|
|
|
case reflect.Float32, reflect.Float64:
|
|
passed = gconv.Float64(value) > gconv.Float64(expect)
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v > %v`, value, expect))
|
|
}
|
|
}
|
|
|
|
// AssertGE checks `value` is GREATER OR EQUAL THAN `expect`.
|
|
// Notice that, only string, integer and float types can be compared by AssertGTE,
|
|
// others are invalid.
|
|
func AssertGE(value, expect any) {
|
|
passed := false
|
|
switch reflect.ValueOf(expect).Kind() {
|
|
case reflect.String:
|
|
passed = gconv.String(value) >= gconv.String(expect)
|
|
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
passed = gconv.Int64(value) >= gconv.Int64(expect)
|
|
|
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
passed = gconv.Uint64(value) >= gconv.Uint64(expect)
|
|
|
|
case reflect.Float32, reflect.Float64:
|
|
passed = gconv.Float64(value) >= gconv.Float64(expect)
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(
|
|
`[ASSERT] EXPECT %v(%v) >= %v(%v)`,
|
|
value, reflect.ValueOf(value).Kind(),
|
|
expect, reflect.ValueOf(expect).Kind(),
|
|
))
|
|
}
|
|
}
|
|
|
|
// AssertLT checks `value` is LESS EQUAL THAN `expect`.
|
|
// Notice that, only string, integer and float types can be compared by AssertLT,
|
|
// others are invalid.
|
|
func AssertLT(value, expect any) {
|
|
passed := false
|
|
switch reflect.ValueOf(expect).Kind() {
|
|
case reflect.String:
|
|
passed = gconv.String(value) < gconv.String(expect)
|
|
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
passed = gconv.Int(value) < gconv.Int(expect)
|
|
|
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
passed = gconv.Uint(value) < gconv.Uint(expect)
|
|
|
|
case reflect.Float32, reflect.Float64:
|
|
passed = gconv.Float64(value) < gconv.Float64(expect)
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v < %v`, value, expect))
|
|
}
|
|
}
|
|
|
|
// AssertLE checks `value` is LESS OR EQUAL THAN `expect`.
|
|
// Notice that, only string, integer and float types can be compared by AssertLTE,
|
|
// others are invalid.
|
|
func AssertLE(value, expect any) {
|
|
passed := false
|
|
switch reflect.ValueOf(expect).Kind() {
|
|
case reflect.String:
|
|
passed = gconv.String(value) <= gconv.String(expect)
|
|
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
passed = gconv.Int(value) <= gconv.Int(expect)
|
|
|
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
passed = gconv.Uint(value) <= gconv.Uint(expect)
|
|
|
|
case reflect.Float32, reflect.Float64:
|
|
passed = gconv.Float64(value) <= gconv.Float64(expect)
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v <= %v`, value, expect))
|
|
}
|
|
}
|
|
|
|
// AssertIN checks `value` is IN `expect`.
|
|
// The `expect` should be a slice,
|
|
// but the `value` can be a slice or a basic type variable.
|
|
// TODO: gconv.Strings(0) is not [0]
|
|
func AssertIN(value, expect any) {
|
|
var (
|
|
passed = true
|
|
expectKind = reflect.ValueOf(expect).Kind()
|
|
)
|
|
switch expectKind {
|
|
case reflect.Slice, reflect.Array:
|
|
expectSlice := gconv.Strings(expect)
|
|
for _, v1 := range gconv.Strings(value) {
|
|
result := false
|
|
for _, v2 := range expectSlice {
|
|
if v1 == v2 {
|
|
result = true
|
|
break
|
|
}
|
|
}
|
|
if !result {
|
|
passed = false
|
|
break
|
|
}
|
|
}
|
|
case reflect.String:
|
|
var (
|
|
valueStr = gconv.String(value)
|
|
expectStr = gconv.String(expect)
|
|
)
|
|
passed = gstr.Contains(expectStr, valueStr)
|
|
case reflect.Map:
|
|
expectMap := gconv.Map(expect)
|
|
for _, v1 := range gconv.Strings(value) {
|
|
if _, exists := expectMap[v1]; !exists {
|
|
passed = false
|
|
break
|
|
}
|
|
}
|
|
default:
|
|
panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind))
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v IN %v`, value, expect))
|
|
}
|
|
}
|
|
|
|
// AssertNI checks `value` is NOT IN `expect`.
|
|
// The `expect` should be a slice,
|
|
// but the `value` can be a slice or a basic type variable.
|
|
func AssertNI(value, expect any) {
|
|
var (
|
|
passed = true
|
|
expectKind = reflect.ValueOf(expect).Kind()
|
|
)
|
|
switch expectKind {
|
|
case reflect.Slice, reflect.Array:
|
|
for _, v1 := range gconv.Strings(value) {
|
|
result := true
|
|
for _, v2 := range gconv.Strings(expect) {
|
|
if v1 == v2 {
|
|
result = false
|
|
break
|
|
}
|
|
}
|
|
if !result {
|
|
passed = false
|
|
break
|
|
}
|
|
}
|
|
case reflect.String:
|
|
var (
|
|
valueStr = gconv.String(value)
|
|
expectStr = gconv.String(expect)
|
|
)
|
|
passed = !gstr.Contains(expectStr, valueStr)
|
|
case reflect.Map:
|
|
expectMap := gconv.Map(expect)
|
|
for _, v1 := range gconv.Strings(value) {
|
|
if _, exists := expectMap[v1]; exists {
|
|
passed = false
|
|
break
|
|
}
|
|
}
|
|
default:
|
|
panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind))
|
|
}
|
|
if !passed {
|
|
panic(fmt.Sprintf(`[ASSERT] EXPECT %v NOT IN %v`, value, expect))
|
|
}
|
|
}
|
|
|
|
// Error panics with given `message`.
|
|
func Error(message ...any) {
|
|
panic(fmt.Sprintf("[ERROR] %s", fmt.Sprint(message...)))
|
|
}
|
|
|
|
// Fatal prints `message` to stderr and exit the process.
|
|
func Fatal(message ...any) {
|
|
_, _ = fmt.Fprintf(
|
|
os.Stderr, "[FATAL] %s\n%s", fmt.Sprint(message...),
|
|
gdebug.StackWithFilter([]string{pathFilterKey}),
|
|
)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// compareMap compares two maps, returns nil if they are equal, or else returns error.
|
|
func compareMap(value, expect any) error {
|
|
var (
|
|
rvValue = reflect.ValueOf(value)
|
|
rvExpect = reflect.ValueOf(expect)
|
|
)
|
|
|
|
if rvExpect.Kind() != reflect.Map {
|
|
return nil
|
|
}
|
|
|
|
if rvValue.Kind() != reflect.Map {
|
|
return fmt.Errorf(`[ASSERT] EXPECT VALUE TO BE A MAP, BUT GIVEN "%s"`, rvValue.Kind())
|
|
}
|
|
|
|
if rvExpect.Len() != rvValue.Len() {
|
|
return fmt.Errorf(`[ASSERT] EXPECT MAP LENGTH %d == %d`, rvValue.Len(), rvExpect.Len())
|
|
}
|
|
|
|
// Turn two interface maps to the same type for comparison.
|
|
// Direct use of rvValue.MapIndex(key).Interface() will panic
|
|
// when the key types are inconsistent.
|
|
var (
|
|
mValue = make(map[string]string)
|
|
mExpect = make(map[string]string)
|
|
ksValue = rvValue.MapKeys()
|
|
ksExpect = rvExpect.MapKeys()
|
|
)
|
|
|
|
for _, key := range ksValue {
|
|
mValue[gconv.String(key.Interface())] = gconv.String(rvValue.MapIndex(key).Interface())
|
|
}
|
|
|
|
for _, key := range ksExpect {
|
|
mExpect[gconv.String(key.Interface())] = gconv.String(rvExpect.MapIndex(key).Interface())
|
|
}
|
|
|
|
for k, v := range mExpect {
|
|
if v != mValue[k] {
|
|
return fmt.Errorf(`[ASSERT] EXPECT VALUE map["%v"]:%v == map["%v"]:%v`+
|
|
"\nGIVEN : %v\nEXPECT: %v", k, mValue[k], k, v, mValue, mExpect)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// AssertNil asserts `value` is nil.
|
|
func AssertNil(value any) {
|
|
if empty.IsNil(value) {
|
|
return
|
|
}
|
|
if err, ok := value.(error); ok {
|
|
panic(fmt.Sprintf(`%+v`, err))
|
|
}
|
|
Assert(value, nil)
|
|
}
|
|
|
|
// DataPath retrieves and returns the testdata path of current package,
|
|
// which is used for unit testing cases only.
|
|
// The optional parameter `names` specifies the sub-folders/sub-files,
|
|
// which will be joined with current system separator and returned with the path.
|
|
func DataPath(names ...string) string {
|
|
_, path, _ := gdebug.CallerWithFilter([]string{pathFilterKey})
|
|
path = filepath.Join(filepath.Dir(path), "testdata")
|
|
for _, name := range names {
|
|
path = filepath.Join(path, name)
|
|
}
|
|
return filepath.FromSlash(path)
|
|
}
|
|
|
|
// DataContent retrieves and returns the file content for specified testdata path of current package
|
|
func DataContent(names ...string) string {
|
|
path := DataPath(names...)
|
|
if path != "" {
|
|
data, err := os.ReadFile(path)
|
|
if err == nil {
|
|
return string(data)
|
|
}
|
|
}
|
|
return ""
|
|
}
|