From 1791c2bcbc265edfc71be1421d0a0a939447bb93 Mon Sep 17 00:00:00 2001 From: Danis Kirasirov <dbgbbu@gmail.com> Date: Mon, 19 Feb 2024 14:19:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20Stub=20=D0=B2=D0=BC?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=20Dummy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/items/dummy.go | 16 ++++++++++------ pkg/items/pagination_test.go | 14 +++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkg/items/dummy.go b/pkg/items/dummy.go index 29b2f593..206a0802 100644 --- a/pkg/items/dummy.go +++ b/pkg/items/dummy.go @@ -18,17 +18,21 @@ func (d *Dummy) Find(_ context.Context, _, _, _ string, _ *Filter, _ ...*FindOpt return d.FindResult.Items, d.FindResult.Total, d.FindResult.Error } -type DummyWithOptions struct { - Items +type StubFindResult struct { Total int } -func (d *DummyWithOptions) Find(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindOptions) ([]*Item, int, error) { +type Stub struct { + Items + FindResult *StubFindResult +} + +func (d *Stub) Find(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindOptions) ([]*Item, int, error) { fo := MergeFindOptions(opts...) - return make([]*Item, fo.Limit), d.Total, nil + return make([]*Item, fo.Limit), d.FindResult.Total, nil } -func (d *DummyWithOptions) FindPublished(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindPublishedOptions) ([]*Item, int, error) { +func (d *Stub) FindPublished(_ context.Context, _, _, _ string, _ *Filter, opts ...*FindPublishedOptions) ([]*Item, int, error) { fo := MergeFindPublishedOptions(opts...) - return make([]*Item, fo.Limit), d.Total, nil + return make([]*Item, fo.Limit), d.FindResult.Total, nil } diff --git a/pkg/items/pagination_test.go b/pkg/items/pagination_test.go index 6f36fc6d..c401b21f 100644 --- a/pkg/items/pagination_test.go +++ b/pkg/items/pagination_test.go @@ -35,7 +35,7 @@ func TestBatchProcessor(t *testing.T) { }) t.Run("With FindOptions", func(t *testing.T) { - itemssvc := &DummyWithOptions{Items: nil, Total: 1000} + itemssvc := &Stub{FindResult: &StubFindResult{Total: 1000}} b := &BatchProcessor{ Items: itemssvc, SpaceID: "sp", @@ -51,13 +51,13 @@ func TestBatchProcessor(t *testing.T) { }) t.Run("With FindPublishedOptions", func(t *testing.T) { - itemssvc := &DummyWithOptions{Items: nil, Total: 60} + itemssvc := &Stub{FindResult: &StubFindResult{Total: 60}} b := &BatchProcessor{ - Items: itemssvc, - SpaceID: "sp", - EnvID: environments.DefaultEnvironment, - CollectionID: "col", - FindPublishedOptions: &FindPublishedOptions{FindOptions: *options.New(0, 20)}, + Items: itemssvc, + SpaceID: "sp", + EnvID: environments.DefaultEnvironment, + CollectionID: "col", + FindPublishedOptions: &FindPublishedOptions{FindOptions: *options.New(0, 20)}, } var counter int -- GitLab