From 0420a4b4aa512133ca79f1963db23ea4fdadabf5 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 13 Nov 2023 20:18:36 +0100 Subject: [PATCH] GO-2371 Consistent names and fix tests --- space/service_test.go | 4 +- space/spaceinfo/spaceinfo.go | 4 -- .../mock_techspace/mock_TechSpace.go | 69 +++++++++++++++---- space/techspace/techspace.go | 8 +-- space/techspace/techspace_test.go | 12 ++-- 5 files changed, 70 insertions(+), 27 deletions(-) diff --git a/space/service_test.go b/space/service_test.go index 6610199b4..1e7fd6152 100644 --- a/space/service_test.go +++ b/space/service_test.go @@ -109,10 +109,10 @@ func (fx *fixture) expectRun(newAccount bool) { } // startLoad fx.techSpace.EXPECT().SpaceViewExists(mock.Anything, testPersonalSpaceID).Return(true, nil) - fx.techSpace.EXPECT().SetInfo(mock.Anything, mock.Anything).Return(nil) + fx.techSpace.EXPECT().SetLocalInfo(mock.Anything, mock.Anything).Return(nil) // wait load fx.spaceCore.EXPECT().Get(mock.Anything, testPersonalSpaceID).Return(&spacecore.AnySpace{Space: fx.personalSpace}, nil) - fx.techSpace.EXPECT().SetInfo(mock.Anything, spaceinfo.SpaceInfo{ + fx.techSpace.EXPECT().SetLocalInfo(mock.Anything, spaceinfo.SpaceLocalInfo{ SpaceID: testPersonalSpaceID, LocalStatus: spaceinfo.LocalStatusOk, RemoteStatus: spaceinfo.RemoteStatusUnknown, diff --git a/space/spaceinfo/spaceinfo.go b/space/spaceinfo/spaceinfo.go index 1c5528157..c43a5f4cd 100644 --- a/space/spaceinfo/spaceinfo.go +++ b/space/spaceinfo/spaceinfo.go @@ -49,7 +49,3 @@ type SpaceInfo struct { RemoteStatus RemoteStatus AccountStatus AccountStatus } - -func (s SpaceInfo) IsDeleted() bool { - return s.RemoteStatus.IsDeleted() && s.LocalStatus == LocalStatusMissing && s.AccountStatus == AccountStatusDeleted -} diff --git a/space/techspace/mock_techspace/mock_TechSpace.go b/space/techspace/mock_techspace/mock_TechSpace.go index 26fe72ab7..73b790e19 100644 --- a/space/techspace/mock_techspace/mock_TechSpace.go +++ b/space/techspace/mock_techspace/mock_TechSpace.go @@ -114,12 +114,12 @@ func (_c *MockTechSpace_Run_Call) RunAndReturn(run func(commonspace.Space, objec return _c } -// SetInfo provides a mock function with given fields: ctx, info -func (_m *MockTechSpace) SetInfo(ctx context.Context, info spaceinfo.SpaceInfo) error { +// SetLocalInfo provides a mock function with given fields: ctx, info +func (_m *MockTechSpace) SetLocalInfo(ctx context.Context, info spaceinfo.SpaceLocalInfo) error { ret := _m.Called(ctx, info) var r0 error - if rf, ok := ret.Get(0).(func(context.Context, spaceinfo.SpaceInfo) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, spaceinfo.SpaceLocalInfo) error); ok { r0 = rf(ctx, info) } else { r0 = ret.Error(0) @@ -128,31 +128,74 @@ func (_m *MockTechSpace) SetInfo(ctx context.Context, info spaceinfo.SpaceInfo) return r0 } -// MockTechSpace_SetInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetInfo' -type MockTechSpace_SetInfo_Call struct { +// MockTechSpace_SetLocalInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetLocalInfo' +type MockTechSpace_SetLocalInfo_Call struct { *mock.Call } -// SetInfo is a helper method to define mock.On call +// SetLocalInfo is a helper method to define mock.On call // - ctx context.Context -// - info spaceinfo.SpaceInfo -func (_e *MockTechSpace_Expecter) SetInfo(ctx interface{}, info interface{}) *MockTechSpace_SetInfo_Call { - return &MockTechSpace_SetInfo_Call{Call: _e.mock.On("SetInfo", ctx, info)} +// - info spaceinfo.SpaceLocalInfo +func (_e *MockTechSpace_Expecter) SetLocalInfo(ctx interface{}, info interface{}) *MockTechSpace_SetLocalInfo_Call { + return &MockTechSpace_SetLocalInfo_Call{Call: _e.mock.On("SetLocalInfo", ctx, info)} } -func (_c *MockTechSpace_SetInfo_Call) Run(run func(ctx context.Context, info spaceinfo.SpaceInfo)) *MockTechSpace_SetInfo_Call { +func (_c *MockTechSpace_SetLocalInfo_Call) Run(run func(ctx context.Context, info spaceinfo.SpaceLocalInfo)) *MockTechSpace_SetLocalInfo_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(spaceinfo.SpaceInfo)) + run(args[0].(context.Context), args[1].(spaceinfo.SpaceLocalInfo)) }) return _c } -func (_c *MockTechSpace_SetInfo_Call) Return(err error) *MockTechSpace_SetInfo_Call { +func (_c *MockTechSpace_SetLocalInfo_Call) Return(err error) *MockTechSpace_SetLocalInfo_Call { _c.Call.Return(err) return _c } -func (_c *MockTechSpace_SetInfo_Call) RunAndReturn(run func(context.Context, spaceinfo.SpaceInfo) error) *MockTechSpace_SetInfo_Call { +func (_c *MockTechSpace_SetLocalInfo_Call) RunAndReturn(run func(context.Context, spaceinfo.SpaceLocalInfo) error) *MockTechSpace_SetLocalInfo_Call { + _c.Call.Return(run) + return _c +} + +// SetPersistentInfo provides a mock function with given fields: ctx, info +func (_m *MockTechSpace) SetPersistentInfo(ctx context.Context, info spaceinfo.SpacePersistentInfo) error { + ret := _m.Called(ctx, info) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, spaceinfo.SpacePersistentInfo) error); ok { + r0 = rf(ctx, info) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// MockTechSpace_SetPersistentInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPersistentInfo' +type MockTechSpace_SetPersistentInfo_Call struct { + *mock.Call +} + +// SetPersistentInfo is a helper method to define mock.On call +// - ctx context.Context +// - info spaceinfo.SpacePersistentInfo +func (_e *MockTechSpace_Expecter) SetPersistentInfo(ctx interface{}, info interface{}) *MockTechSpace_SetPersistentInfo_Call { + return &MockTechSpace_SetPersistentInfo_Call{Call: _e.mock.On("SetPersistentInfo", ctx, info)} +} + +func (_c *MockTechSpace_SetPersistentInfo_Call) Run(run func(ctx context.Context, info spaceinfo.SpacePersistentInfo)) *MockTechSpace_SetPersistentInfo_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(context.Context), args[1].(spaceinfo.SpacePersistentInfo)) + }) + return _c +} + +func (_c *MockTechSpace_SetPersistentInfo_Call) Return(err error) *MockTechSpace_SetPersistentInfo_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockTechSpace_SetPersistentInfo_Call) RunAndReturn(run func(context.Context, spaceinfo.SpacePersistentInfo) error) *MockTechSpace_SetPersistentInfo_Call { _c.Call.Return(run) return _c } diff --git a/space/techspace/techspace.go b/space/techspace/techspace.go index 588a5d1c9..d2bb30275 100644 --- a/space/techspace/techspace.go +++ b/space/techspace/techspace.go @@ -45,8 +45,8 @@ type TechSpace interface { type SpaceView interface { sync.Locker SetSpaceData(details *types.Struct) error - SetLocalInfo(info spaceinfo.SpaceLocalInfo) error - SetPersistentInfo(info spaceinfo.SpacePersistentInfo) error + SetSpaceLocalInfo(info spaceinfo.SpaceLocalInfo) error + SetSpacePersistentInfo(info spaceinfo.SpacePersistentInfo) error } func New() TechSpace { @@ -102,13 +102,13 @@ func (s *techSpace) TechSpaceId() string { func (s *techSpace) SetLocalInfo(ctx context.Context, info spaceinfo.SpaceLocalInfo) (err error) { return s.doSpaceView(ctx, info.SpaceID, func(spaceView SpaceView) error { - return spaceView.SetLocalInfo(info) + return spaceView.SetSpaceLocalInfo(info) }) } func (s *techSpace) SetPersistentInfo(ctx context.Context, info spaceinfo.SpacePersistentInfo) (err error) { return s.doSpaceView(ctx, info.SpaceID, func(spaceView SpaceView) error { - return spaceView.SetPersistentInfo(info) + return spaceView.SetSpacePersistentInfo(info) }) } diff --git a/space/techspace/techspace_test.go b/space/techspace/techspace_test.go index 9a038b366..a89e1ac9c 100644 --- a/space/techspace/techspace_test.go +++ b/space/techspace/techspace_test.go @@ -47,7 +47,11 @@ func (s *spaceViewStub) SetSpaceData(details *types.Struct) error { return nil } -func (s *spaceViewStub) SetSpaceInfo(info spaceinfo.SpaceInfo) (err error) { +func (s *spaceViewStub) SetSpaceLocalInfo(info spaceinfo.SpaceLocalInfo) (err error) { + return nil +} + +func (s *spaceViewStub) SetSpacePersistentInfo(info spaceinfo.SpacePersistentInfo) (err error) { return nil } @@ -107,7 +111,7 @@ func TestTechSpace_SpaceViewExists(t *testing.T) { } func TestTechSpace_SetInfo(t *testing.T) { - info := spaceinfo.SpaceInfo{ + info := spaceinfo.SpaceLocalInfo{ SpaceID: "space.id", } viewId := "viewid" @@ -120,7 +124,7 @@ func TestTechSpace_SetInfo(t *testing.T) { fx.expectDeriveTreePayload(viewId) fx.objectCache.EXPECT().GetObject(ctx, viewId).Return(spaceView, nil) - require.NoError(t, fx.SetInfo(ctx, info)) + require.NoError(t, fx.SetLocalInfo(ctx, info)) }) t.Run("err spaceView not exists", func(t *testing.T) { @@ -130,7 +134,7 @@ func TestTechSpace_SetInfo(t *testing.T) { fx.expectDeriveTreePayload(viewId) fx.objectCache.EXPECT().GetObject(ctx, viewId).Return(nil, fmt.Errorf("object not found")) - require.EqualError(t, fx.SetInfo(ctx, info), ErrSpaceViewNotExists.Error()) + require.EqualError(t, fx.SetLocalInfo(ctx, info), ErrSpaceViewNotExists.Error()) }) }