benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further test refactoring

Browse Source
This commit is contained in:
mcrakhman 2022-10-27 16:57:01 +02:00 committed by Mikhail Iudin
parent 457f90f17f
commit 1e73844ac0
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/storage/liststorage_test.go
View File

@ -9,7 +9,7 @@ import (
"testing" "testing"
) )
func testListInDB(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { func testList(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) {
require.Equal(t, store.ID(), root.Id) require.Equal(t, store.ID(), root.Id)
aclRoot, err := store.Root() aclRoot, err := store.Root()
@ -38,7 +38,7 @@ func TestListStorage(t *testing.T) {
fx.db.View(func(txn *badger.Txn) (err error) { fx.db.View(func(txn *badger.Txn) (err error) {
listStore, err = newListStorage(spaceId, fx.db, txn) listStore, err = newListStorage(spaceId, fx.db, txn)
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, listStore, aclRoot, aclRoot.Id) testList(t, listStore, aclRoot, aclRoot.Id)
return nil return nil
}) })
@ -48,7 +48,7 @@ func TestListStorage(t *testing.T) {
// this is ok, because we only create new list storage when we create space storage // this is ok, because we only create new list storage when we create space storage
listStore, err := createListStorage(spaceId, fx.db, txn, aclRoot) listStore, err := createListStorage(spaceId, fx.db, txn, aclRoot)
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, listStore, aclRoot, aclRoot.Id) testList(t, listStore, aclRoot, aclRoot.Id)
return nil return nil
}) })

12
client/storage/spacestorage_test.go
View File

@ -24,14 +24,14 @@ func spaceTestPayload() spacestorage.SpaceStorageCreatePayload {
} }
} }
func testSpaceInDB(t *testing.T, store spacestorage.SpaceStorage, payload spacestorage.SpaceStorageCreatePayload) { func testSpace(t *testing.T, store spacestorage.SpaceStorage, payload spacestorage.SpaceStorageCreatePayload) {
header, err := store.SpaceHeader() header, err := store.SpaceHeader()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, payload.SpaceHeaderWithId, header) require.Equal(t, payload.SpaceHeaderWithId, header)
aclStorage, err := store.ACLStorage() aclStorage, err := store.ACLStorage()
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, aclStorage, payload.RecWithId, payload.RecWithId.Id) testList(t, aclStorage, payload.RecWithId, payload.RecWithId.Id)
} }
func TestSpaceStorage_Create(t *testing.T) { func TestSpaceStorage_Create(t *testing.T) {
@ -43,7 +43,7 @@ func TestSpaceStorage_Create(t *testing.T) {
store, err := createSpaceStorage(fx.db, payload) store, err := createSpaceStorage(fx.db, payload)
require.NoError(t, err) require.NoError(t, err)
testSpaceInDB(t, store, payload) testSpace(t, store, payload)
require.NoError(t, store.Close()) require.NoError(t, store.Close())
t.Run("create same storage returns error", func(t *testing.T) { t.Run("create same storage returns error", func(t *testing.T) {
@ -66,17 +66,17 @@ func TestSpaceStorage_NewAndCreateTree(t *testing.T) {
defer fx.stop(t) defer fx.stop(t)
store, err = newSpaceStorage(fx.db, payload.SpaceHeaderWithId.Id) store, err = newSpaceStorage(fx.db, payload.SpaceHeaderWithId.Id)
require.NoError(t, err) require.NoError(t, err)
testSpaceInDB(t, store, payload) testSpace(t, store, payload)
t.Run("create tree and get tree", func(t *testing.T) { t.Run("create tree and get tree", func(t *testing.T) {
payload := treeTestPayload() payload := treeTestPayload()
treeStore, err := store.CreateTreeStorage(payload) treeStore, err := store.CreateTreeStorage(payload)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, treeStore, payload) testTreePayload(t, treeStore, payload)
otherStore, err := store.TreeStorage(payload.RootRawChange.Id) otherStore, err := store.TreeStorage(payload.RootRawChange.Id)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, otherStore, payload) testTreePayload(t, otherStore, payload)
}) })
} }

6
client/storage/treestorage_test.go
View File

@ -26,7 +26,7 @@ type fixture struct {
db *badger.DB db *badger.DB
} }
func testTreePayloadInDB(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) { func testTreePayload(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) {
require.Equal(t, payload.RootRawChange.Id, store.ID()) require.Equal(t, payload.RootRawChange.Id, store.ID())
root, err := store.Root() root, err := store.Root()
@ -70,7 +70,7 @@ func TestTreeStorage_Create(t *testing.T) {
payload := treeTestPayload() payload := treeTestPayload()
store, err := createTreeStorage(fx.db, spaceId, payload) store, err := createTreeStorage(fx.db, spaceId, payload)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, store, payload) testTreePayload(t, store, payload)
t.Run("create same storage returns error", func(t *testing.T) { t.Run("create same storage returns error", func(t *testing.T) {
_, err := createTreeStorage(fx.db, spaceId, payload) _, err := createTreeStorage(fx.db, spaceId, payload)
@ -91,7 +91,7 @@ func TestTreeStorage_Methods(t *testing.T) {
defer fx.stop(t) defer fx.stop(t)
store, err := newTreeStorage(fx.db, spaceId, payload.RootRawChange.Id) store, err := newTreeStorage(fx.db, spaceId, payload.RootRawChange.Id)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, store, payload) testTreePayload(t, store, payload)
t.Run("update heads", func(t *testing.T) { t.Run("update heads", func(t *testing.T) {
newHeads := []string{"a", "b"} newHeads := []string{"a", "b"}

2
common/pkg/acl/list/list.go
View File

@ -57,7 +57,7 @@ func BuildACLListWithIdentity(acc *account.AccountData, storage storage.ListStor
func BuildACLList(storage storage.ListStorage) (ACLList, error) { func BuildACLList(storage storage.ListStorage) (ACLList, error) {
id := storage.ID() id := storage.ID()
return build(storage.ID(), newACLStateBuilder(), newACLRecordBuilder(id, common.NewKeychain()), storage) return build(id, newACLStateBuilder(), newACLRecordBuilder(id, common.NewKeychain()), storage)
} }
func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder, storage storage.ListStorage) (list ACLList, err error) { func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder, storage storage.ListStorage) (list ACLList, err error) {

8
node/storage/liststorage_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
) )
func testListInDB(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { func testList(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) {
require.Equal(t, store.ID(), root.Id) require.Equal(t, store.ID(), root.Id)
aclRoot, err := store.Root() aclRoot, err := store.Root()
@ -28,13 +28,13 @@ func TestListStorage_Create(t *testing.T) {
aclRoot := &aclrecordproto.RawACLRecordWithId{Payload: []byte("root"), Id: "someRootId"} aclRoot := &aclrecordproto.RawACLRecordWithId{Payload: []byte("root"), Id: "someRootId"}
listStore, err := createListStorage(fx.db, aclRoot) listStore, err := createListStorage(fx.db, aclRoot)
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, listStore, aclRoot, aclRoot.Id) testList(t, listStore, aclRoot, aclRoot.Id)
t.Run("create same list storage returns nil", func(t *testing.T) { t.Run("create same list storage returns nil", func(t *testing.T) {
// this is ok, because we only create new list storage when we create space storage // this is ok, because we only create new list storage when we create space storage
listStore, err := createListStorage(fx.db, aclRoot) listStore, err := createListStorage(fx.db, aclRoot)
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, listStore, aclRoot, aclRoot.Id) testList(t, listStore, aclRoot, aclRoot.Id)
}) })
} }
@ -50,7 +50,7 @@ func TestListStorage_Methods(t *testing.T) {
defer fx.stop(t) defer fx.stop(t)
listStore, err := newListStorage(fx.db) listStore, err := newListStorage(fx.db)
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, listStore, aclRoot, aclRoot.Id) testList(t, listStore, aclRoot, aclRoot.Id)
t.Run("set head", func(t *testing.T) { t.Run("set head", func(t *testing.T) {
head := "newHead" head := "newHead"

12
node/storage/spacestorage_test.go
View File

@ -25,14 +25,14 @@ func spaceTestPayload() spacestorage.SpaceStorageCreatePayload {
} }
} }
func testSpaceInDB(t *testing.T, store spacestorage.SpaceStorage, payload spacestorage.SpaceStorageCreatePayload) { func testSpace(t *testing.T, store spacestorage.SpaceStorage, payload spacestorage.SpaceStorageCreatePayload) {
header, err := store.SpaceHeader() header, err := store.SpaceHeader()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, payload.SpaceHeaderWithId, header) require.Equal(t, payload.SpaceHeaderWithId, header)
aclStorage, err := store.ACLStorage() aclStorage, err := store.ACLStorage()
require.NoError(t, err) require.NoError(t, err)
testListInDB(t, aclStorage, payload.RecWithId, payload.RecWithId.Id) testList(t, aclStorage, payload.RecWithId, payload.RecWithId.Id)
} }
func TestSpaceStorage_Create(t *testing.T) { func TestSpaceStorage_Create(t *testing.T) {
@ -43,7 +43,7 @@ func TestSpaceStorage_Create(t *testing.T) {
store, err := createSpaceStorage(dir, payload) store, err := createSpaceStorage(dir, payload)
require.NoError(t, err) require.NoError(t, err)
testSpaceInDB(t, store, payload) testSpace(t, store, payload)
require.NoError(t, store.Close()) require.NoError(t, store.Close())
t.Run("create same storage returns error", func(t *testing.T) { t.Run("create same storage returns error", func(t *testing.T) {
@ -66,17 +66,17 @@ func TestSpaceStorage_NewAndCreateTree(t *testing.T) {
defer func() { defer func() {
require.NoError(t, store.Close()) require.NoError(t, store.Close())
}() }()
testSpaceInDB(t, store, payload) testSpace(t, store, payload)
t.Run("create tree and get tree", func(t *testing.T) { t.Run("create tree and get tree", func(t *testing.T) {
payload := treeTestPayload() payload := treeTestPayload()
treeStore, err := store.CreateTreeStorage(payload) treeStore, err := store.CreateTreeStorage(payload)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, treeStore, payload) testTreePayload(t, treeStore, payload)
otherStore, err := store.TreeStorage(payload.RootRawChange.Id) otherStore, err := store.TreeStorage(payload.RootRawChange.Id)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, otherStore, payload) testTreePayload(t, otherStore, payload)
}) })
} }

6
node/storage/treestorage_test.go
View File

@ -42,7 +42,7 @@ func (fx *fixture) stop(t *testing.T) {
require.NoError(t, fx.db.Close()) require.NoError(t, fx.db.Close())
} }
func testTreePayloadInDB(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) { func testTreePayload(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) {
require.Equal(t, payload.RootRawChange.Id, store.ID()) require.Equal(t, payload.RootRawChange.Id, store.ID())
root, err := store.Root() root, err := store.Root()
@ -69,7 +69,7 @@ func TestTreeStorage_Create(t *testing.T) {
payload := treeTestPayload() payload := treeTestPayload()
store, err := createTreeStorage(fx.db, payload) store, err := createTreeStorage(fx.db, payload)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, store, payload) testTreePayload(t, store, payload)
t.Run("create same storage returns error", func(t *testing.T) { t.Run("create same storage returns error", func(t *testing.T) {
_, err := createTreeStorage(fx.db, payload) _, err := createTreeStorage(fx.db, payload)
@ -89,7 +89,7 @@ func TestTreeStorage_Methods(t *testing.T) {
defer fx.stop(t) defer fx.stop(t)
store, err := newTreeStorage(fx.db, payload.RootRawChange.Id) store, err := newTreeStorage(fx.db, payload.RootRawChange.Id)
require.NoError(t, err) require.NoError(t, err)
testTreePayloadInDB(t, store, payload) testTreePayload(t, store, payload)
t.Run("update heads", func(t *testing.T) { t.Run("update heads", func(t *testing.T) {
newHeads := []string{"a", "b"} newHeads := []string{"a", "b"}