From 620731b464633adc5da7e3b785eaa985da23350e Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Fri, 25 Nov 2022 14:37:00 +0100 Subject: [PATCH] Re-generate mocks and fix sync tree tests --- common/commonspace/diffservice/diffservice.go | 2 +- .../mock_diffservice/mock_diffservice.go | 74 ++++++++----------- .../storage/mock_storage/mock_storage.go | 43 +++++++++++ common/commonspace/synctree/synctree_test.go | 27 +++++-- .../mock_treegetter/mock_treegetter.go | 14 ++++ .../acl/storage/mock_storage/mock_storage.go | 14 ++++ .../tree/mock_objecttree/mock_objecttree.go | 14 ++++ .../mock_periodicsync/mock_periodicsync.go | 58 +++++++++++++++ common/util/periodicsync/periodicsync.go | 1 + 9 files changed, 199 insertions(+), 48 deletions(-) create mode 100644 common/util/periodicsync/mock_periodicsync/mock_periodicsync.go diff --git a/common/commonspace/diffservice/diffservice.go b/common/commonspace/diffservice/diffservice.go index 1c5df8b3..113e4e5c 100644 --- a/common/commonspace/diffservice/diffservice.go +++ b/common/commonspace/diffservice/diffservice.go @@ -1,4 +1,4 @@ -//go:generate mockgen -destination mock_diffservice/mock_diffservice.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice DiffSyncer,PeriodicSync +//go:generate mockgen -destination mock_diffservice/mock_diffservice.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice DiffSyncer package diffservice import ( diff --git a/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go b/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go index 966a7cc5..f54342d9 100644 --- a/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go +++ b/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice (interfaces: DiffSyncer,PeriodicSync) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice (interfaces: DiffSyncer) // Package mock_diffservice is a generated GoMock package. package mock_diffservice @@ -8,6 +8,7 @@ import ( context "context" reflect "reflect" + deletionstate "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" gomock "github.com/golang/mock/gomock" ) @@ -34,6 +35,30 @@ func (m *MockDiffSyncer) EXPECT() *MockDiffSyncerMockRecorder { return m.recorder } +// Init mocks base method. +func (m *MockDiffSyncer) Init(arg0 *deletionstate.DeletionState) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Init", arg0) +} + +// Init indicates an expected call of Init. +func (mr *MockDiffSyncerMockRecorder) Init(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockDiffSyncer)(nil).Init), arg0) +} + +// RemoveObjects mocks base method. +func (m *MockDiffSyncer) RemoveObjects(arg0 []string) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "RemoveObjects", arg0) +} + +// RemoveObjects indicates an expected call of RemoveObjects. +func (mr *MockDiffSyncerMockRecorder) RemoveObjects(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveObjects", reflect.TypeOf((*MockDiffSyncer)(nil).RemoveObjects), arg0) +} + // Sync mocks base method. func (m *MockDiffSyncer) Sync(arg0 context.Context) error { m.ctrl.T.Helper() @@ -48,49 +73,14 @@ func (mr *MockDiffSyncerMockRecorder) Sync(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockDiffSyncer)(nil).Sync), arg0) } -// MockPeriodicSync is a mock of PeriodicSync interface. -type MockPeriodicSync struct { - ctrl *gomock.Controller - recorder *MockPeriodicSyncMockRecorder -} - -// MockPeriodicSyncMockRecorder is the mock recorder for MockPeriodicSync. -type MockPeriodicSyncMockRecorder struct { - mock *MockPeriodicSync -} - -// NewMockPeriodicSync creates a new mock instance. -func NewMockPeriodicSync(ctrl *gomock.Controller) *MockPeriodicSync { - mock := &MockPeriodicSync{ctrl: ctrl} - mock.recorder = &MockPeriodicSyncMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockPeriodicSync) EXPECT() *MockPeriodicSyncMockRecorder { - return m.recorder -} - -// Close mocks base method. -func (m *MockPeriodicSync) Close() { +// UpdateHeads mocks base method. +func (m *MockDiffSyncer) UpdateHeads(arg0 string, arg1 []string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Close") + m.ctrl.Call(m, "UpdateHeads", arg0, arg1) } -// Close indicates an expected call of Close. -func (mr *MockPeriodicSyncMockRecorder) Close() *gomock.Call { +// UpdateHeads indicates an expected call of UpdateHeads. +func (mr *MockDiffSyncerMockRecorder) UpdateHeads(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockPeriodicSync)(nil).Close)) -} - -// Run mocks base method. -func (m *MockPeriodicSync) Run() { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Run") -} - -// Run indicates an expected call of Run. -func (mr *MockPeriodicSyncMockRecorder) Run() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockPeriodicSync)(nil).Run)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateHeads", reflect.TypeOf((*MockDiffSyncer)(nil).UpdateHeads), arg0, arg1) } diff --git a/common/commonspace/storage/mock_storage/mock_storage.go b/common/commonspace/storage/mock_storage/mock_storage.go index 419c61fa..c8ab901e 100644 --- a/common/commonspace/storage/mock_storage/mock_storage.go +++ b/common/commonspace/storage/mock_storage/mock_storage.go @@ -176,6 +176,20 @@ func (mr *MockSpaceStorageMockRecorder) Id() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSpaceStorage)(nil).Id)) } +// SetTreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) SetTreeDeletedStatus(arg0, arg1 string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetTreeDeletedStatus", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetTreeDeletedStatus indicates an expected call of SetTreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).SetTreeDeletedStatus), arg0, arg1) +} + // SpaceHeader mocks base method. func (m *MockSpaceStorage) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) { m.ctrl.T.Helper() @@ -191,6 +205,20 @@ func (mr *MockSpaceStorageMockRecorder) SpaceHeader() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceHeader", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceHeader)) } +// SpaceSettingsId mocks base method. +func (m *MockSpaceStorage) SpaceSettingsId() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceSettingsId") + ret0, _ := ret[0].(string) + return ret0 +} + +// SpaceSettingsId indicates an expected call of SpaceSettingsId. +func (mr *MockSpaceStorageMockRecorder) SpaceSettingsId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSettingsId", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceSettingsId)) +} + // StoredIds mocks base method. func (m *MockSpaceStorage) StoredIds() ([]string, error) { m.ctrl.T.Helper() @@ -206,6 +234,21 @@ func (mr *MockSpaceStorageMockRecorder) StoredIds() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoredIds", reflect.TypeOf((*MockSpaceStorage)(nil).StoredIds)) } +// TreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) TreeDeletedStatus(arg0 string) (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeDeletedStatus", arg0) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TreeDeletedStatus indicates an expected call of TreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).TreeDeletedStatus), arg0) +} + // TreeStorage mocks base method. func (m *MockSpaceStorage) TreeStorage(arg0 string) (storage0.TreeStorage, error) { m.ctrl.T.Helper() diff --git a/common/commonspace/synctree/synctree_test.go b/common/commonspace/synctree/synctree_test.go index 95a3436a..e14433cb 100644 --- a/common/commonspace/synctree/synctree_test.go +++ b/common/commonspace/synctree/synctree_test.go @@ -3,6 +3,7 @@ package synctree import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" @@ -45,7 +46,8 @@ func Test_DeriveSyncTree(t *testing.T) { updateListenerMock := mock_updatelistener.NewMockUpdateListener(ctrl) syncClientMock := mock_synctree.NewMockSyncClient(ctrl) aclListMock := mock_list.NewMockACLList(ctrl) - objTreeMock := mock_tree.NewMockObjectTree(ctrl) + objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) + spaceStorageMock := mock_storage.NewMockSpaceStorage(ctrl) spaceId := "spaceId" expectedPayload := tree.ObjectTreeCreatePayload{SpaceId: spaceId} createDerivedObjectTree = func(payload tree.ObjectTreeCreatePayload, l list.ACLList, create storage2.TreeStorageCreatorFunc) (objTree tree.ObjectTree, err error) { @@ -59,7 +61,14 @@ func Test_DeriveSyncTree(t *testing.T) { headUpdate := &treechangeproto.TreeSyncMessage{} syncClientMock.EXPECT().CreateHeadUpdate(syncTreeMatcher{objTreeMock, syncClientMock, updateListenerMock}, gomock.Nil()).Return(headUpdate) syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil) - deps := CreateDeps{AclList: aclListMock, SpaceId: spaceId, Payload: expectedPayload, Listener: updateListenerMock} + updateListenerMock.EXPECT().Rebuild(gomock.Any()) + deps := CreateDeps{ + AclList: aclListMock, + SpaceId: spaceId, + Payload: expectedPayload, + Listener: updateListenerMock, + SpaceStorage: spaceStorageMock, + } _, err := DeriveSyncTree(ctx, deps) require.NoError(t, err) @@ -73,7 +82,8 @@ func Test_CreateSyncTree(t *testing.T) { updateListenerMock := mock_updatelistener.NewMockUpdateListener(ctrl) syncClientMock := mock_synctree.NewMockSyncClient(ctrl) aclListMock := mock_list.NewMockACLList(ctrl) - objTreeMock := mock_tree.NewMockObjectTree(ctrl) + objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) + spaceStorageMock := mock_storage.NewMockSpaceStorage(ctrl) spaceId := "spaceId" expectedPayload := tree.ObjectTreeCreatePayload{SpaceId: spaceId} createObjectTree = func(payload tree.ObjectTreeCreatePayload, l list.ACLList, create storage2.TreeStorageCreatorFunc) (objTree tree.ObjectTree, err error) { @@ -87,7 +97,14 @@ func Test_CreateSyncTree(t *testing.T) { headUpdate := &treechangeproto.TreeSyncMessage{} syncClientMock.EXPECT().CreateHeadUpdate(syncTreeMatcher{objTreeMock, syncClientMock, updateListenerMock}, gomock.Nil()).Return(headUpdate) syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil) - deps := CreateDeps{AclList: aclListMock, SpaceId: spaceId, Payload: expectedPayload, Listener: updateListenerMock} + updateListenerMock.EXPECT().Rebuild(gomock.Any()) + deps := CreateDeps{ + AclList: aclListMock, + SpaceId: spaceId, + Payload: expectedPayload, + Listener: updateListenerMock, + SpaceStorage: spaceStorageMock, + } _, err := CreateSyncTree(ctx, deps) require.NoError(t, err) @@ -100,7 +117,7 @@ func Test_BuildSyncTree(t *testing.T) { updateListenerMock := mock_updatelistener.NewMockUpdateListener(ctrl) syncClientMock := mock_synctree.NewMockSyncClient(ctrl) - objTreeMock := mock_tree.NewMockObjectTree(ctrl) + objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) tr := &SyncTree{ ObjectTree: objTreeMock, SyncHandler: nil, diff --git a/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go b/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go index a07949bc..4706000b 100644 --- a/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go +++ b/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go @@ -50,6 +50,20 @@ func (mr *MockTreeGetterMockRecorder) Close(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockTreeGetter)(nil).Close), arg0) } +// DeleteTree mocks base method. +func (m *MockTreeGetter) DeleteTree(arg0 context.Context, arg1, arg2 string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DeleteTree", arg0, arg1, arg2) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteTree indicates an expected call of DeleteTree. +func (mr *MockTreeGetterMockRecorder) DeleteTree(arg0, arg1, arg2 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTree", reflect.TypeOf((*MockTreeGetter)(nil).DeleteTree), arg0, arg1, arg2) +} + // GetTree mocks base method. func (m *MockTreeGetter) GetTree(arg0 context.Context, arg1, arg2 string) (tree.ObjectTree, error) { m.ctrl.T.Helper() diff --git a/common/pkg/acl/storage/mock_storage/mock_storage.go b/common/pkg/acl/storage/mock_storage/mock_storage.go index 751184a7..d6361f69 100644 --- a/common/pkg/acl/storage/mock_storage/mock_storage.go +++ b/common/pkg/acl/storage/mock_storage/mock_storage.go @@ -160,6 +160,20 @@ func (mr *MockTreeStorageMockRecorder) AddRawChange(arg0 interface{}) *gomock.Ca return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChange", reflect.TypeOf((*MockTreeStorage)(nil).AddRawChange), arg0) } +// Delete mocks base method. +func (m *MockTreeStorage) Delete() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Delete") + ret0, _ := ret[0].(error) + return ret0 +} + +// Delete indicates an expected call of Delete. +func (mr *MockTreeStorageMockRecorder) Delete() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockTreeStorage)(nil).Delete)) +} + // GetRawChange mocks base method. func (m *MockTreeStorage) GetRawChange(arg0 context.Context, arg1 string) (*treechangeproto.RawTreeChangeWithId, error) { m.ctrl.T.Helper() diff --git a/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go b/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go index 205fb8ce..4cfca949 100644 --- a/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go +++ b/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go @@ -116,6 +116,20 @@ func (mr *MockObjectTreeMockRecorder) DebugDump() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DebugDump", reflect.TypeOf((*MockObjectTree)(nil).DebugDump)) } +// Delete mocks base method. +func (m *MockObjectTree) Delete() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Delete") + ret0, _ := ret[0].(error) + return ret0 +} + +// Delete indicates an expected call of Delete. +func (mr *MockObjectTreeMockRecorder) Delete() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockObjectTree)(nil).Delete)) +} + // HasChanges mocks base method. func (m *MockObjectTree) HasChanges(arg0 ...string) bool { m.ctrl.T.Helper() diff --git a/common/util/periodicsync/mock_periodicsync/mock_periodicsync.go b/common/util/periodicsync/mock_periodicsync/mock_periodicsync.go new file mode 100644 index 00000000..b032a401 --- /dev/null +++ b/common/util/periodicsync/mock_periodicsync/mock_periodicsync.go @@ -0,0 +1,58 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync (interfaces: PeriodicSync) + +// Package mock_periodicsync is a generated GoMock package. +package mock_periodicsync + +import ( + reflect "reflect" + + gomock "github.com/golang/mock/gomock" +) + +// MockPeriodicSync is a mock of PeriodicSync interface. +type MockPeriodicSync struct { + ctrl *gomock.Controller + recorder *MockPeriodicSyncMockRecorder +} + +// MockPeriodicSyncMockRecorder is the mock recorder for MockPeriodicSync. +type MockPeriodicSyncMockRecorder struct { + mock *MockPeriodicSync +} + +// NewMockPeriodicSync creates a new mock instance. +func NewMockPeriodicSync(ctrl *gomock.Controller) *MockPeriodicSync { + mock := &MockPeriodicSync{ctrl: ctrl} + mock.recorder = &MockPeriodicSyncMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockPeriodicSync) EXPECT() *MockPeriodicSyncMockRecorder { + return m.recorder +} + +// Close mocks base method. +func (m *MockPeriodicSync) Close() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Close") +} + +// Close indicates an expected call of Close. +func (mr *MockPeriodicSyncMockRecorder) Close() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockPeriodicSync)(nil).Close)) +} + +// Run mocks base method. +func (m *MockPeriodicSync) Run() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Run") +} + +// Run indicates an expected call of Run. +func (mr *MockPeriodicSyncMockRecorder) Run() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockPeriodicSync)(nil).Run)) +} diff --git a/common/util/periodicsync/periodicsync.go b/common/util/periodicsync/periodicsync.go index 37647810..52db0935 100644 --- a/common/util/periodicsync/periodicsync.go +++ b/common/util/periodicsync/periodicsync.go @@ -1,3 +1,4 @@ +//go:generate mockgen -destination mock_periodicsync/mock_periodicsync.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync PeriodicSync package periodicsync import (