From be938a4814825dc3e022c7217cb3ecaa1063b8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Wed, 26 Aug 2026 17:41:19 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20unroll-variadic?= =?UTF-8?q?=20=E9=87=87=E7=94=A8=20mockery=20v3=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84=E5=8F=AF=E5=8F=98=E5=8F=82=E6=95=B0=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- .mockery.yaml | 2 - mocks/biz/AppRepo.go | 41 +++++++++---------- mocks/biz/CacheRepo.go | 22 ++++------ mocks/biz/SettingRepo.go | 88 ++++++++++++++++------------------------ 4 files changed, 64 insertions(+), 89 deletions(-) diff --git a/.mockery.yaml b/.mockery.yaml index e5741945..8f05b3e2 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -1,6 +1,4 @@ template: testify -template-data: - unroll-variadic: true dir: mocks/biz structname: "{{.InterfaceName}}" pkgname: "{{.SrcPackageName}}" diff --git a/mocks/biz/AppRepo.go b/mocks/biz/AppRepo.go index b8148a41..919d5b19 100644 --- a/mocks/biz/AppRepo.go +++ b/mocks/biz/AppRepo.go @@ -298,15 +298,13 @@ func (_c *AppRepo_GetInstalled_Call) RunAndReturn(run func(slug string) (*biz.Ap // GetInstalledAll provides a mock function for the type AppRepo func (_mock *AppRepo) GetInstalledAll(query string, cond ...string) ([]*biz.App, error) { - // string - _va := make([]any, len(cond)) - for _i := range cond { - _va[_i] = cond[_i] + var tmpRet mock.Arguments + if len(cond) > 0 { + tmpRet = _mock.Called(query, cond) + } else { + tmpRet = _mock.Called(query) } - var _ca []any - _ca = append(_ca, query) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for GetInstalledAll") @@ -352,11 +350,9 @@ func (_c *AppRepo_GetInstalledAll_Call) Run(run func(query string, cond ...strin arg0 = args[0].(string) } var arg1 []string - variadicArgs := make([]string, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(string) - } + var variadicArgs []string + if len(args) > 1 { + variadicArgs = args[1].([]string) } arg1 = variadicArgs run( @@ -434,10 +430,13 @@ func (_c *AppRepo_Installed_Call) RunAndReturn(run func() ([]*biz.App, error)) * // IsInstalled provides a mock function for the type AppRepo func (_mock *AppRepo) IsInstalled(query string, cond ...any) (bool, error) { - var _ca []any - _ca = append(_ca, query) - _ca = append(_ca, cond...) - ret := _mock.Called(_ca...) + var tmpRet mock.Arguments + if len(cond) > 0 { + tmpRet = _mock.Called(query, cond) + } else { + tmpRet = _mock.Called(query) + } + ret := tmpRet if len(ret) == 0 { panic("no return value specified for IsInstalled") @@ -481,11 +480,9 @@ func (_c *AppRepo_IsInstalled_Call) Run(run func(query string, cond ...any)) *Ap arg0 = args[0].(string) } var arg1 []any - variadicArgs := make([]any, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(any) - } + var variadicArgs []any + if len(args) > 1 { + variadicArgs = args[1].([]any) } arg1 = variadicArgs run( diff --git a/mocks/biz/CacheRepo.go b/mocks/biz/CacheRepo.go index 83af3e27..7c350fe8 100644 --- a/mocks/biz/CacheRepo.go +++ b/mocks/biz/CacheRepo.go @@ -259,15 +259,13 @@ func (_c *CacheRepo_FetchTemplates_Call) RunAndReturn(run func() (*api.Templates // Get provides a mock function for the type CacheRepo func (_mock *CacheRepo) Get(key biz.CacheKey, defaultValue ...string) (string, error) { - // string - _va := make([]any, len(defaultValue)) - for _i := range defaultValue { - _va[_i] = defaultValue[_i] + var tmpRet mock.Arguments + if len(defaultValue) > 0 { + tmpRet = _mock.Called(key, defaultValue) + } else { + tmpRet = _mock.Called(key) } - var _ca []any - _ca = append(_ca, key) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for Get") @@ -311,11 +309,9 @@ func (_c *CacheRepo_Get_Call) Run(run func(key biz.CacheKey, defaultValue ...str arg0 = args[0].(biz.CacheKey) } var arg1 []string - variadicArgs := make([]string, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(string) - } + var variadicArgs []string + if len(args) > 1 { + variadicArgs = args[1].([]string) } arg1 = variadicArgs run( diff --git a/mocks/biz/SettingRepo.go b/mocks/biz/SettingRepo.go index cd4180f1..8af5491e 100644 --- a/mocks/biz/SettingRepo.go +++ b/mocks/biz/SettingRepo.go @@ -90,15 +90,13 @@ func (_c *SettingRepo_Delete_Call) RunAndReturn(run func(key biz.SettingKey) err // Get provides a mock function for the type SettingRepo func (_mock *SettingRepo) Get(key biz.SettingKey, defaultValue ...string) (string, error) { - // string - _va := make([]any, len(defaultValue)) - for _i := range defaultValue { - _va[_i] = defaultValue[_i] + var tmpRet mock.Arguments + if len(defaultValue) > 0 { + tmpRet = _mock.Called(key, defaultValue) + } else { + tmpRet = _mock.Called(key) } - var _ca []any - _ca = append(_ca, key) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for Get") @@ -142,11 +140,9 @@ func (_c *SettingRepo_Get_Call) Run(run func(key biz.SettingKey, defaultValue .. arg0 = args[0].(biz.SettingKey) } var arg1 []string - variadicArgs := make([]string, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(string) - } + var variadicArgs []string + if len(args) > 1 { + variadicArgs = args[1].([]string) } arg1 = variadicArgs run( @@ -169,15 +165,13 @@ func (_c *SettingRepo_Get_Call) RunAndReturn(run func(key biz.SettingKey, defaul // GetBool provides a mock function for the type SettingRepo func (_mock *SettingRepo) GetBool(key biz.SettingKey, defaultValue ...bool) (bool, error) { - // bool - _va := make([]any, len(defaultValue)) - for _i := range defaultValue { - _va[_i] = defaultValue[_i] + var tmpRet mock.Arguments + if len(defaultValue) > 0 { + tmpRet = _mock.Called(key, defaultValue) + } else { + tmpRet = _mock.Called(key) } - var _ca []any - _ca = append(_ca, key) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for GetBool") @@ -221,11 +215,9 @@ func (_c *SettingRepo_GetBool_Call) Run(run func(key biz.SettingKey, defaultValu arg0 = args[0].(biz.SettingKey) } var arg1 []bool - variadicArgs := make([]bool, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(bool) - } + var variadicArgs []bool + if len(args) > 1 { + variadicArgs = args[1].([]bool) } arg1 = variadicArgs run( @@ -248,15 +240,13 @@ func (_c *SettingRepo_GetBool_Call) RunAndReturn(run func(key biz.SettingKey, de // GetInt provides a mock function for the type SettingRepo func (_mock *SettingRepo) GetInt(key biz.SettingKey, defaultValue ...int) (int, error) { - // int - _va := make([]any, len(defaultValue)) - for _i := range defaultValue { - _va[_i] = defaultValue[_i] + var tmpRet mock.Arguments + if len(defaultValue) > 0 { + tmpRet = _mock.Called(key, defaultValue) + } else { + tmpRet = _mock.Called(key) } - var _ca []any - _ca = append(_ca, key) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for GetInt") @@ -300,11 +290,9 @@ func (_c *SettingRepo_GetInt_Call) Run(run func(key biz.SettingKey, defaultValue arg0 = args[0].(biz.SettingKey) } var arg1 []int - variadicArgs := make([]int, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.(int) - } + var variadicArgs []int + if len(args) > 1 { + variadicArgs = args[1].([]int) } arg1 = variadicArgs run( @@ -382,15 +370,13 @@ func (_c *SettingRepo_GetPanel_Call) RunAndReturn(run func() (*request.SettingPa // GetSlice provides a mock function for the type SettingRepo func (_mock *SettingRepo) GetSlice(key biz.SettingKey, defaultValue ...[]string) ([]string, error) { - // []string - _va := make([]any, len(defaultValue)) - for _i := range defaultValue { - _va[_i] = defaultValue[_i] + var tmpRet mock.Arguments + if len(defaultValue) > 0 { + tmpRet = _mock.Called(key, defaultValue) + } else { + tmpRet = _mock.Called(key) } - var _ca []any - _ca = append(_ca, key) - _ca = append(_ca, _va...) - ret := _mock.Called(_ca...) + ret := tmpRet if len(ret) == 0 { panic("no return value specified for GetSlice") @@ -436,11 +422,9 @@ func (_c *SettingRepo_GetSlice_Call) Run(run func(key biz.SettingKey, defaultVal arg0 = args[0].(biz.SettingKey) } var arg1 [][]string - variadicArgs := make([][]string, len(args)-1) - for i, a := range args[1:] { - if a != nil { - variadicArgs[i] = a.([]string) - } + var variadicArgs [][]string + if len(args) > 1 { + variadicArgs = args[1].([][]string) } arg1 = variadicArgs run(