From f1d1a26b6461309d216e27c888d910c1786b99cf Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 19 Dec 2022 18:51:31 +0100 Subject: [PATCH] Few more fixes in tests --- common/commonspace/diffservice/diffsyncer_test.go | 3 ++- common/commonspace/synctree/synctree.go | 13 ++++++------- common/commonspace/synctree/synctree_test.go | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/common/commonspace/diffservice/diffsyncer_test.go b/common/commonspace/diffservice/diffsyncer_test.go index cf41a154..c7711528 100644 --- a/common/commonspace/diffservice/diffsyncer_test.go +++ b/common/commonspace/diffservice/diffsyncer_test.go @@ -8,6 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto/mock_spacesyncproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" @@ -110,7 +111,7 @@ func TestDiffSyncer_Sync(t *testing.T) { spaceId := "spaceId" aclRootId := "aclRootId" l := logger.NewNamed(spaceId) - diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, nil, l) + diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, statusservice.NewNoOpStatusService(), l) delState.EXPECT().AddObserver(gomock.Any()) diffSyncer.Init(delState) diff --git a/common/commonspace/synctree/synctree.go b/common/commonspace/synctree/synctree.go index e94ce67f..0fbf3e6f 100644 --- a/common/commonspace/synctree/synctree.go +++ b/common/commonspace/synctree/synctree.go @@ -100,10 +100,10 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.SyncService, deps.Configuration) - headUpdate := syncClient.CreateHeadUpdate(objTree, nil) - deps.StatusService.HeadsChange(objTree.ID(), objTree.Heads()) - syncClient.BroadcastAsync(headUpdate) id = objTree.ID() + headUpdate := syncClient.CreateHeadUpdate(objTree, nil) + deps.StatusService.HeadsChange(id, objTree.Heads()) + syncClient.BroadcastAsync(headUpdate) return } @@ -118,11 +118,10 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.SyncService, deps.Configuration) - headUpdate := syncClient.CreateHeadUpdate(objTree, nil) - - deps.StatusService.HeadsChange(objTree.ID(), objTree.Heads()) - syncClient.BroadcastAsync(headUpdate) id = objTree.ID() + headUpdate := syncClient.CreateHeadUpdate(objTree, nil) + deps.StatusService.HeadsChange(id, objTree.Heads()) + syncClient.BroadcastAsync(headUpdate) return } diff --git a/common/commonspace/synctree/synctree_test.go b/common/commonspace/synctree/synctree_test.go index a65a0485..df0a29f0 100644 --- a/common/commonspace/synctree/synctree_test.go +++ b/common/commonspace/synctree/synctree_test.go @@ -62,6 +62,7 @@ func Test_DeriveSyncTree(t *testing.T) { } createSyncClient = syncClientFuncCreator(syncClientMock) headUpdate := &treechangeproto.TreeSyncMessage{} + objTreeMock.EXPECT().Heads().AnyTimes().Return([]string{"h1"}) syncClientMock.EXPECT().CreateHeadUpdate(gomock.Any(), gomock.Nil()).Return(headUpdate) syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil) deps := CreateDeps{ @@ -95,6 +96,7 @@ func Test_CreateSyncTree(t *testing.T) { } createSyncClient = syncClientFuncCreator(syncClientMock) + objTreeMock.EXPECT().Heads().AnyTimes().Return([]string{"h1"}) headUpdate := &treechangeproto.TreeSyncMessage{} syncClientMock.EXPECT().CreateHeadUpdate(gomock.Any(), gomock.Nil()).Return(headUpdate) syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil) @@ -199,6 +201,7 @@ func Test_BuildSyncTree(t *testing.T) { Mode: tree.Append, Added: changes, } + objTreeMock.EXPECT().ID().Return("id").AnyTimes() objTreeMock.EXPECT().AddContent(gomock.Any(), gomock.Eq(content)). Return(expectedRes, nil)