sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix all ofenses

Browse Source
This commit is contained in:
A.Unger
2020-10-14 18:03:52 +02:00
committed by Ilja Neumann
parent dd5ee5e9da
commit d85e818546
6 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/indexer/index/cs3/non_unique_test.go
+4 -5
View File
@@ -1,21 +1,20 @@
package cs3
import (
"os"
"path"
"testing"
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/accounts/pkg/indexer/option"
. "github.com/owncloud/ocis/accounts/pkg/indexer/test"
"github.com/stretchr/testify/assert"
"os"
"path"
"testing"
)
func TestCS3NonUniqueIndex_FakeSymlink(t *testing.T) {
go setupMetadataStorage()
defer cancelFunc()
dataDir := WriteIndexTestDataCS3(t, TestData, "Id")
dataDir := WriteIndexTestDataCS3(t, Data, "Id")
cfg := config.Config{
Repo: config.Repo{
Disk: config.Disk{
accounts/pkg/indexer/index/cs3/unique_test.go
+2 -2
View File
@@ -34,7 +34,7 @@ func TestCS3UniqueIndex_FakeSymlink(t *testing.T) {
go setupMetadataStorage()
defer cancelFunc()
dataDir := WriteIndexTestDataCS3(t, TestData, "Id")
dataDir := WriteIndexTestDataCS3(t,Data, "Id")
cfg := config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -86,7 +86,7 @@ func TestCS3UniqueIndexSearch(t *testing.T) {
go setupMetadataStorage()
defer cancelFunc()
dataDir := WriteIndexTestDataCS3(t, TestData, "Id")
dataDir := WriteIndexTestDataCS3(t, Data, "Id")
cfg := config.Config{
Repo: config.Repo{
Disk: config.Disk{
accounts/pkg/indexer/index/disk/non_unique_test.go
+11 -11
View File
@@ -14,7 +14,7 @@ import (
)
func TestNonUniqueIndexAdd(t *testing.T) {
sut, dataPath := getNonUniqueIdxSut(t, TestPet{}, "Color")
sut, dataPath := getNonUniqueIdxSut(t, Pet{}, "Color")
ids, err := sut.Lookup("Green")
assert.NoError(t, err)
@@ -33,7 +33,7 @@ func TestNonUniqueIndexAdd(t *testing.T) {
}
func TestNonUniqueIndexUpdate(t *testing.T) {
sut, dataPath := getNonUniqueIdxSut(t, TestPet{}, "Color")
sut, dataPath := getNonUniqueIdxSut(t, Pet{}, "Color")
err := sut.Update("goefe-789", "Green", "Black")
assert.NoError(t, err)
@@ -41,25 +41,25 @@ func TestNonUniqueIndexUpdate(t *testing.T) {
err = sut.Update("xadaf-189", "Green", "Black")
assert.NoError(t, err)
assert.DirExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Black", GetTypeFQN(TestPet{}))))
assert.NoDirExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green", GetTypeFQN(TestPet{}))))
assert.DirExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Black", GetTypeFQN(Pet{}))))
assert.NoDirExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green", GetTypeFQN(Pet{}))))
_ = os.RemoveAll(dataPath)
}
func TestNonUniqueIndexDelete(t *testing.T) {
sut, dataPath := getNonUniqueIdxSut(t, TestPet{}, "Color")
assert.FileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(TestPet{}))))
sut, dataPath := getNonUniqueIdxSut(t, Pet{}, "Color")
assert.FileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(Pet{}))))
err := sut.Remove("goefe-789", "")
assert.NoError(t, err)
assert.NoFileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(TestPet{}))))
assert.NoFileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(Pet{}))))
_ = os.RemoveAll(dataPath)
}
func TestNonUniqueIndexSearch(t *testing.T) {
sut, dataPath := getNonUniqueIdxSut(t, TestPet{}, "Email")
sut, dataPath := getNonUniqueIdxSut(t, Pet{}, "Email")
res, err := sut.Search("Gr*")
@@ -78,7 +78,7 @@ func TestNonUniqueIndexSearch(t *testing.T) {
// entity: used to get the fully qualified name for the index root path.
func getNonUniqueIdxSut(t *testing.T, entity interface{}, indexBy string) (index.Index, string) {
dataPath := WriteIndexTestData(t, TestData, "Id")
dataPath := WriteIndexTestData(t, Data, "ID")
cfg := config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -98,8 +98,8 @@ func getNonUniqueIdxSut(t *testing.T, entity interface{}, indexBy string) (index
t.Fatal(err)
}
for _, u := range TestData["pets"] {
pkVal := ValueOf(u, "Id")
for _, u := range Data["pets"] {
pkVal := ValueOf(u, "ID")
idxByVal := ValueOf(u, "Color")
_, err := sut.Add(pkVal, idxByVal)
if err != nil {
accounts/pkg/indexer/index/disk/unique_test.go
+3 -3
View File
@@ -99,7 +99,7 @@ func TestErrors(t *testing.T) {
}
func getUniqueIdxSut(t *testing.T, indexBy string, entityType interface{}) (index.Index, string) {
dataPath := WriteIndexTestData(t, TestData, "Id")
dataPath := WriteIndexTestData(t, Data, "ID")
cfg := config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -119,8 +119,8 @@ func getUniqueIdxSut(t *testing.T, indexBy string, entityType interface{}) (inde
t.Fatal(err)
}
for _, u := range TestData["users"] {
pkVal := ValueOf(u, "Id")
for _, u := range Data["users"] {
pkVal := ValueOf(u, "ID")
idxByVal := ValueOf(u, "Email")
_, err := sut.Add(pkVal, idxByVal)
if err != nil {
accounts/pkg/indexer/indexer_test.go
+28 -28
View File
@@ -11,7 +11,7 @@ import (
)
func TestIndexer_AddWithUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -20,7 +20,7 @@ func TestIndexer_AddWithUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique")
err := indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique")
assert.NoError(t, err)
u := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
@@ -31,7 +31,7 @@ func TestIndexer_AddWithUniqueIndex(t *testing.T) {
}
func TestIndexer_AddWithUniqueIndexCS3(t *testing.T) {
dir := WriteIndexTestDataCS3(t, TestData, "Id")
dir := WriteIndexTestDataCS3(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
CS3: config.CS3{
@@ -43,7 +43,7 @@ func TestIndexer_AddWithUniqueIndexCS3(t *testing.T) {
},
})
err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique")
err := indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique")
assert.NoError(t, err)
u := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
@@ -54,7 +54,7 @@ func TestIndexer_AddWithUniqueIndexCS3(t *testing.T) {
}
func TestIndexer_AddWithNonUniqueIndexCS3(t *testing.T) {
dataDir := WriteIndexTestDataCS3(t, TestData, "Id")
dataDir := WriteIndexTestDataCS3(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
CS3: config.CS3{
@@ -66,7 +66,7 @@ func TestIndexer_AddWithNonUniqueIndexCS3(t *testing.T) {
},
})
err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "non_unique")
err := indexer.AddIndex(&User{}, "UserName", "ID", "users", "non_unique")
assert.NoError(t, err)
u := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
@@ -77,7 +77,7 @@ func TestIndexer_AddWithNonUniqueIndexCS3(t *testing.T) {
}
func TestIndexer_FindByWithUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -86,7 +86,7 @@ func TestIndexer_FindByWithUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique")
err := indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique")
assert.NoError(t, err)
u := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
@@ -101,7 +101,7 @@ func TestIndexer_FindByWithUniqueIndex(t *testing.T) {
}
func TestIndexer_AddWithNonUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -110,11 +110,11 @@ func TestIndexer_AddWithNonUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique")
err := indexer.AddIndex(&Pet{}, "Kind", "ID", "pets", "non_unique")
assert.NoError(t, err)
pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
pet1 := Pet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := Pet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1)
assert.NoError(t, err)
@@ -122,14 +122,14 @@ func TestIndexer_AddWithNonUniqueIndex(t *testing.T) {
err = indexer.Add(pet2)
assert.NoError(t, err)
res, err := indexer.FindBy(TestPet{}, "Kind", "Hog")
res, err := indexer.FindBy(Pet{}, "Kind", "Hog")
assert.NoError(t, err)
t.Log(res)
}
func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -138,11 +138,11 @@ func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique")
err := indexer.AddIndex(&Pet{}, "Kind", "ID", "pets", "non_unique")
assert.NoError(t, err)
pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
pet1 := Pet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := Pet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1)
assert.NoError(t, err)
@@ -157,7 +157,7 @@ func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) {
}
func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -166,11 +166,11 @@ func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique")
err := indexer.AddIndex(&Pet{}, "Name", "ID", "pets", "non_unique")
assert.NoError(t, err)
pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
pet1 := Pet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := Pet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1)
assert.NoError(t, err)
@@ -186,7 +186,7 @@ func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) {
}
func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -195,10 +195,10 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique")
err := indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique")
assert.NoError(t, err)
err = indexer.AddIndex(&User{}, "Email", "Id", "users", "unique")
err = indexer.AddIndex(&User{}, "Email", "ID", "users", "unique")
assert.NoError(t, err)
user1 := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
@@ -244,7 +244,7 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
}
func TestIndexer_UpdateWithNonUniqueIndex(t *testing.T) {
dataDir := WriteIndexTestData(t, TestData, "Id")
dataDir := WriteIndexTestData(t, Data, "ID")
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
@@ -253,11 +253,11 @@ func TestIndexer_UpdateWithNonUniqueIndex(t *testing.T) {
},
})
err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique")
err := indexer.AddIndex(&Pet{}, "Name", "ID", "pets", "non_unique")
assert.NoError(t, err)
pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
pet1 := Pet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := Pet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1)
assert.NoError(t, err)
accounts/pkg/indexer/test/data.go
+8 -8
View File
@@ -13,13 +13,13 @@ type User struct {
ID, UserName, Email string
}
// TestPet is a pet.
type TestPet struct {
// Pet is a pet.
type Pet struct {
ID, Kind, Color, Name string
}
// TestData mock data.
var TestData = map[string][]interface{}{
// Data mock data.
var Data = map[string][]interface{}{
"users": {
User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"},
User{ID: "hijklmn-456", UserName: "frank", Email: "frank@example.com"},
@@ -27,10 +27,10 @@ var TestData = map[string][]interface{}{
User{ID: "rulan54-777", UserName: "jones", Email: "jones@example.com"},
},
"pets": {
TestPet{ID: "rebef-123", Kind: "Dog", Color: "Brown", Name: "Waldo"},
TestPet{ID: "wefwe-456", Kind: "Cat", Color: "White", Name: "Snowy"},
TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"},
TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"},
Pet{ID: "rebef-123", Kind: "Dog", Color: "Brown", Name: "Waldo"},
Pet{ID: "wefwe-456", Kind: "Cat", Color: "White", Name: "Snowy"},
Pet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"},
Pet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"},
},
}