From 50a3fadb6d54bcd850b1fe3faf882c3a6eb2554b Mon Sep 17 00:00:00 2001 From: wang yan Date: Wed, 9 Oct 2024 16:34:55 +0800 Subject: [PATCH] continue updating mock failures Signed-off-by: wang yan --- src/testing/controller/blob/controller.go | 46 +++++++++---------- src/testing/controller/quota/controller.go | 36 +++++++-------- src/testing/pkg/blob/manager.go | 33 +++++++------ src/testing/pkg/quota/manager.go | 38 +++++++-------- .../pkg/scan/export/filter_processor.go | 2 +- 5 files changed, 79 insertions(+), 76 deletions(-) diff --git a/src/testing/controller/blob/controller.go b/src/testing/controller/blob/controller.go index f4bc8eddf49..de097f96eef 100644 --- a/src/testing/controller/blob/controller.go +++ b/src/testing/controller/blob/controller.go @@ -11,7 +11,7 @@ import ( mock "github.com/stretchr/testify/mock" - models "github.com/goharbor/harbor/src/pkg/blob/models" + pkgblob "github.com/goharbor/harbor/src/pkg/blob" q "github.com/goharbor/harbor/src/lib/q" ) @@ -213,7 +213,7 @@ func (_m *Controller) Exist(ctx context.Context, digest string, options ...blob. } // Fail provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Fail(ctx context.Context, _a1 *models.Blob) error { +func (_m *Controller) Fail(ctx context.Context, _a1 *pkgblob.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -221,7 +221,7 @@ func (_m *Controller) Fail(ctx context.Context, _a1 *models.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) @@ -231,27 +231,27 @@ func (_m *Controller) Fail(ctx context.Context, _a1 *models.Blob) error { } // FindMissingAssociationsForProject provides a mock function with given fields: ctx, projectID, blobs -func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, projectID int64, blobs []*models.Blob) ([]*models.Blob, error) { +func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, projectID int64, blobs []*pkgblob.Blob) ([]*pkgblob.Blob, error) { ret := _m.Called(ctx, projectID, blobs) if len(ret) == 0 { panic("no return value specified for FindMissingAssociationsForProject") } - var r0 []*models.Blob + var r0 []*pkgblob.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) ([]*models.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*pkgblob.Blob) ([]*pkgblob.Blob, error)); ok { return rf(ctx, projectID, blobs) } - if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) []*models.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*pkgblob.Blob) []*pkgblob.Blob); ok { r0 = rf(ctx, projectID, blobs) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*models.Blob) + r0 = ret.Get(0).([]*pkgblob.Blob) } } - if rf, ok := ret.Get(1).(func(context.Context, int64, []*models.Blob) error); ok { + if rf, ok := ret.Get(1).(func(context.Context, int64, []*pkgblob.Blob) error); ok { r1 = rf(ctx, projectID, blobs) } else { r1 = ret.Error(1) @@ -261,7 +261,7 @@ func (_m *Controller) FindMissingAssociationsForProject(ctx context.Context, pro } // Get provides a mock function with given fields: ctx, digest, options -func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Option) (*models.Blob, error) { +func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Option) (*pkgblob.Blob, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -275,16 +275,16 @@ func (_m *Controller) Get(ctx context.Context, digest string, options ...blob.Op panic("no return value specified for Get") } - var r0 *models.Blob + var r0 *pkgblob.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) (*models.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) (*pkgblob.Blob, error)); ok { return rf(ctx, digest, options...) } - if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) *models.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, ...blob.Option) *pkgblob.Blob); ok { r0 = rf(ctx, digest, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Blob) + r0 = ret.Get(0).(*pkgblob.Blob) } } @@ -326,23 +326,23 @@ func (_m *Controller) GetAcceptedBlobSize(ctx context.Context, sessionID string) } // List provides a mock function with given fields: ctx, query -func (_m *Controller) List(ctx context.Context, query *q.Query) ([]*models.Blob, error) { +func (_m *Controller) List(ctx context.Context, query *q.Query) ([]*pkgblob.Blob, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*models.Blob + var r0 []*pkgblob.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*pkgblob.Blob, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*pkgblob.Blob); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*models.Blob) + r0 = ret.Get(0).([]*pkgblob.Blob) } } @@ -392,7 +392,7 @@ func (_m *Controller) Sync(ctx context.Context, references []distribution.Descri } // Touch provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Touch(ctx context.Context, _a1 *models.Blob) error { +func (_m *Controller) Touch(ctx context.Context, _a1 *pkgblob.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -400,7 +400,7 @@ func (_m *Controller) Touch(ctx context.Context, _a1 *models.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) @@ -410,7 +410,7 @@ func (_m *Controller) Touch(ctx context.Context, _a1 *models.Blob) error { } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Update(ctx context.Context, _a1 *models.Blob) error { +func (_m *Controller) Update(ctx context.Context, _a1 *pkgblob.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -418,7 +418,7 @@ func (_m *Controller) Update(ctx context.Context, _a1 *models.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *pkgblob.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/controller/quota/controller.go b/src/testing/controller/quota/controller.go index 406451e6c6e..911d34fcb9c 100644 --- a/src/testing/controller/quota/controller.go +++ b/src/testing/controller/quota/controller.go @@ -5,7 +5,7 @@ package quota import ( context "context" - models "github.com/goharbor/harbor/src/pkg/quota/models" + pkgquota "github.com/goharbor/harbor/src/pkg/quota" mock "github.com/stretchr/testify/mock" q "github.com/goharbor/harbor/src/lib/q" @@ -102,7 +102,7 @@ func (_m *Controller) Delete(ctx context.Context, id int64) error { } // Get provides a mock function with given fields: ctx, id, options -func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option) (*models.Quota, error) { +func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option) (*pkgquota.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -116,16 +116,16 @@ func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option panic("no return value specified for Get") } - var r0 *models.Quota + var r0 *pkgquota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) (*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) (*pkgquota.Quota, error)); ok { return rf(ctx, id, options...) } - if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) *models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, ...quota.Option) *pkgquota.Quota); ok { r0 = rf(ctx, id, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Quota) + r0 = ret.Get(0).(*pkgquota.Quota) } } @@ -139,7 +139,7 @@ func (_m *Controller) Get(ctx context.Context, id int64, options ...quota.Option } // GetByRef provides a mock function with given fields: ctx, reference, referenceID, options -func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceID string, options ...quota.Option) (*models.Quota, error) { +func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceID string, options ...quota.Option) (*pkgquota.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -153,16 +153,16 @@ func (_m *Controller) GetByRef(ctx context.Context, reference string, referenceI panic("no return value specified for GetByRef") } - var r0 *models.Quota + var r0 *pkgquota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) (*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) (*pkgquota.Quota, error)); ok { return rf(ctx, reference, referenceID, options...) } - if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) *models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string, ...quota.Option) *pkgquota.Quota); ok { r0 = rf(ctx, reference, referenceID, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Quota) + r0 = ret.Get(0).(*pkgquota.Quota) } } @@ -204,7 +204,7 @@ func (_m *Controller) IsEnabled(ctx context.Context, reference string, reference } // List provides a mock function with given fields: ctx, query, options -func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota.Option) ([]*models.Quota, error) { +func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota.Option) ([]*pkgquota.Quota, error) { _va := make([]interface{}, len(options)) for _i := range options { _va[_i] = options[_i] @@ -218,16 +218,16 @@ func (_m *Controller) List(ctx context.Context, query *q.Query, options ...quota panic("no return value specified for List") } - var r0 []*models.Quota + var r0 []*pkgquota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) ([]*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) ([]*pkgquota.Quota, error)); ok { return rf(ctx, query, options...) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) []*models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query, ...quota.Option) []*pkgquota.Quota); ok { r0 = rf(ctx, query, options...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*models.Quota) + r0 = ret.Get(0).([]*pkgquota.Quota) } } @@ -284,7 +284,7 @@ func (_m *Controller) Request(ctx context.Context, reference string, referenceID } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Controller) Update(ctx context.Context, _a1 *models.Quota) error { +func (_m *Controller) Update(ctx context.Context, _a1 *pkgquota.Quota) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -292,7 +292,7 @@ func (_m *Controller) Update(ctx context.Context, _a1 *models.Quota) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Quota) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *pkgquota.Quota) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/pkg/blob/manager.go b/src/testing/pkg/blob/manager.go index 6828e1a3cf0..78de29daceb 100644 --- a/src/testing/pkg/blob/manager.go +++ b/src/testing/pkg/blob/manager.go @@ -5,9 +5,12 @@ package blob import ( context "context" - models "github.com/goharbor/harbor/src/pkg/blob/models" + blob "github.com/goharbor/harbor/src/pkg/blob" + mock "github.com/stretchr/testify/mock" + models "github.com/goharbor/harbor/src/pkg/blob/models" + q "github.com/goharbor/harbor/src/lib/q" ) @@ -147,7 +150,7 @@ func (_m *Manager) CleanupAssociationsForArtifact(ctx context.Context, artifactD } // CleanupAssociationsForProject provides a mock function with given fields: ctx, projectID, blobs -func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID int64, blobs []*models.Blob) error { +func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID int64, blobs []*blob.Blob) error { ret := _m.Called(ctx, projectID, blobs) if len(ret) == 0 { @@ -155,7 +158,7 @@ func (_m *Manager) CleanupAssociationsForProject(ctx context.Context, projectID } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, int64, []*models.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, []*blob.Blob) error); ok { r0 = rf(ctx, projectID, blobs) } else { r0 = ret.Error(0) @@ -241,23 +244,23 @@ func (_m *Manager) FindBlobsShouldUnassociatedWithProject(ctx context.Context, p } // Get provides a mock function with given fields: ctx, digest -func (_m *Manager) Get(ctx context.Context, digest string) (*models.Blob, error) { +func (_m *Manager) Get(ctx context.Context, digest string) (*blob.Blob, error) { ret := _m.Called(ctx, digest) if len(ret) == 0 { panic("no return value specified for Get") } - var r0 *models.Blob + var r0 *blob.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*models.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string) (*blob.Blob, error)); ok { return rf(ctx, digest) } - if rf, ok := ret.Get(0).(func(context.Context, string) *models.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, string) *blob.Blob); ok { r0 = rf(ctx, digest) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Blob) + r0 = ret.Get(0).(*blob.Blob) } } @@ -301,23 +304,23 @@ func (_m *Manager) GetByArt(ctx context.Context, digest string) ([]*models.Blob, } // List provides a mock function with given fields: ctx, query -func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Blob, error) { +func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*blob.Blob, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*models.Blob + var r0 []*blob.Blob var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Blob, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*blob.Blob, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Blob); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*blob.Blob); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*models.Blob) + r0 = ret.Get(0).([]*blob.Blob) } } @@ -331,7 +334,7 @@ func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Blob, er } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Manager) Update(ctx context.Context, _a1 *models.Blob) error { +func (_m *Manager) Update(ctx context.Context, _a1 *blob.Blob) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -339,7 +342,7 @@ func (_m *Manager) Update(ctx context.Context, _a1 *models.Blob) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Blob) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *blob.Blob) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/pkg/quota/manager.go b/src/testing/pkg/quota/manager.go index 4cd95058cef..eef3b37375b 100644 --- a/src/testing/pkg/quota/manager.go +++ b/src/testing/pkg/quota/manager.go @@ -5,10 +5,10 @@ package quota import ( context "context" - models "github.com/goharbor/harbor/src/pkg/quota/models" + q "github.com/goharbor/harbor/src/lib/q" mock "github.com/stretchr/testify/mock" - q "github.com/goharbor/harbor/src/lib/q" + quota "github.com/goharbor/harbor/src/pkg/quota" types "github.com/goharbor/harbor/src/pkg/quota/types" ) @@ -100,23 +100,23 @@ func (_m *Manager) Delete(ctx context.Context, id int64) error { } // Get provides a mock function with given fields: ctx, id -func (_m *Manager) Get(ctx context.Context, id int64) (*models.Quota, error) { +func (_m *Manager) Get(ctx context.Context, id int64) (*quota.Quota, error) { ret := _m.Called(ctx, id) if len(ret) == 0 { panic("no return value specified for Get") } - var r0 *models.Quota + var r0 *quota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, int64) (*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64) (*quota.Quota, error)); ok { return rf(ctx, id) } - if rf, ok := ret.Get(0).(func(context.Context, int64) *models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64) *quota.Quota); ok { r0 = rf(ctx, id) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Quota) + r0 = ret.Get(0).(*quota.Quota) } } @@ -130,23 +130,23 @@ func (_m *Manager) Get(ctx context.Context, id int64) (*models.Quota, error) { } // GetByRef provides a mock function with given fields: ctx, reference, referenceID -func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID string) (*models.Quota, error) { +func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID string) (*quota.Quota, error) { ret := _m.Called(ctx, reference, referenceID) if len(ret) == 0 { panic("no return value specified for GetByRef") } - var r0 *models.Quota + var r0 *quota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*quota.Quota, error)); ok { return rf(ctx, reference, referenceID) } - if rf, ok := ret.Get(0).(func(context.Context, string, string) *models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, string, string) *quota.Quota); ok { r0 = rf(ctx, reference, referenceID) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*models.Quota) + r0 = ret.Get(0).(*quota.Quota) } } @@ -160,23 +160,23 @@ func (_m *Manager) GetByRef(ctx context.Context, reference string, referenceID s } // List provides a mock function with given fields: ctx, query -func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Quota, error) { +func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*quota.Quota, error) { ret := _m.Called(ctx, query) if len(ret) == 0 { panic("no return value specified for List") } - var r0 []*models.Quota + var r0 []*quota.Quota var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*models.Quota, error)); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) ([]*quota.Quota, error)); ok { return rf(ctx, query) } - if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*models.Quota); ok { + if rf, ok := ret.Get(0).(func(context.Context, *q.Query) []*quota.Quota); ok { r0 = rf(ctx, query) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]*models.Quota) + r0 = ret.Get(0).([]*quota.Quota) } } @@ -190,7 +190,7 @@ func (_m *Manager) List(ctx context.Context, query *q.Query) ([]*models.Quota, e } // Update provides a mock function with given fields: ctx, _a1 -func (_m *Manager) Update(ctx context.Context, _a1 *models.Quota) error { +func (_m *Manager) Update(ctx context.Context, _a1 *quota.Quota) error { ret := _m.Called(ctx, _a1) if len(ret) == 0 { @@ -198,7 +198,7 @@ func (_m *Manager) Update(ctx context.Context, _a1 *models.Quota) error { } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *models.Quota) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, *quota.Quota) error); ok { r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) diff --git a/src/testing/pkg/scan/export/filter_processor.go b/src/testing/pkg/scan/export/filter_processor.go index 22f68d0819c..e73648c39f4 100644 --- a/src/testing/pkg/scan/export/filter_processor.go +++ b/src/testing/pkg/scan/export/filter_processor.go @@ -117,4 +117,4 @@ func NewFilterProcessor(t interface { t.Cleanup(func() { mock.AssertExpectations(t) }) return mock -} \ No newline at end of file +}