From cfafdb6063ec007a52b39018f93038d64dc3080a Mon Sep 17 00:00:00 2001 From: Ilja Neumann Date: Thu, 1 Oct 2020 17:33:57 +0200 Subject: [PATCH] dot import alias for test pkg --- accounts/pkg/indexer/index/non_unique_test.go | 12 ++-- accounts/pkg/indexer/index/unique_test.go | 12 ++-- accounts/pkg/indexer/indexer_test.go | 58 +++++++++---------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/accounts/pkg/indexer/index/non_unique_test.go b/accounts/pkg/indexer/index/non_unique_test.go index 09d74d173..c9dc9bfd3 100644 --- a/accounts/pkg/indexer/index/non_unique_test.go +++ b/accounts/pkg/indexer/index/non_unique_test.go @@ -2,7 +2,7 @@ package index import ( "github.com/owncloud/ocis/accounts/pkg/indexer/errors" - "github.com/owncloud/ocis/accounts/pkg/indexer/test" + . "github.com/owncloud/ocis/accounts/pkg/indexer/test" "github.com/stretchr/testify/assert" "os" "path" @@ -53,7 +53,7 @@ func TestNonUniqueIndexDelete(t *testing.T) { } func TestNonUniqueIndexInit(t *testing.T) { - dataDir := test.CreateTmpDir(t) + dataDir := CreateTmpDir(t) indexRootDir := path.Join(dataDir, "index.disk") filesDir := path.Join(dataDir, "users") @@ -90,16 +90,16 @@ func TestNonUniqueIndexSearch(t *testing.T) { } func getNonUniqueIdxSut(t *testing.T) (sut Index, dataPath string) { - dataPath = test.WriteIndexTestData(t, test.TestData, "Id") + dataPath = WriteIndexTestData(t, TestData, "Id") sut = NewNonUniqueIndex("Pet", "Color", path.Join(dataPath, "pets"), path.Join(dataPath, "index.disk")) err := sut.Init() if err != nil { t.Fatal(err) } - for _, u := range test.TestData["pets"] { - pkVal := test.ValueOf(u, "Id") - idxByVal := test.ValueOf(u, "Color") + for _, u := range TestData["pets"] { + pkVal := ValueOf(u, "Id") + idxByVal := ValueOf(u, "Color") _, err := sut.Add(pkVal, idxByVal) if err != nil { t.Fatal(err) diff --git a/accounts/pkg/indexer/index/unique_test.go b/accounts/pkg/indexer/index/unique_test.go index b21dd9856..5c153a8aa 100644 --- a/accounts/pkg/indexer/index/unique_test.go +++ b/accounts/pkg/indexer/index/unique_test.go @@ -2,7 +2,7 @@ package index import ( "github.com/owncloud/ocis/accounts/pkg/indexer/errors" - "github.com/owncloud/ocis/accounts/pkg/indexer/test" + . "github.com/owncloud/ocis/accounts/pkg/indexer/test" "github.com/stretchr/testify/assert" "os" "path" @@ -73,7 +73,7 @@ func TestUniqueUpdate(t *testing.T) { } func TestUniqueInit(t *testing.T) { - dataDir := test.CreateTmpDir(t) + dataDir := CreateTmpDir(t) indexRootDir := path.Join(dataDir, "index.disk") filesDir := path.Join(dataDir, "users") @@ -115,16 +115,16 @@ func TestErrors(t *testing.T) { } func getUniqueIdxSut(t *testing.T) (sut Index, dataPath string) { - dataPath = test.WriteIndexTestData(t, test.TestData, "Id") + dataPath = WriteIndexTestData(t, TestData, "Id") sut = NewUniqueIndex("User", "Email", path.Join(dataPath, "users"), path.Join(dataPath, "indexer.disk")) err := sut.Init() if err != nil { t.Fatal(err) } - for _, u := range test.TestData["users"] { - pkVal := test.ValueOf(u, "Id") - idxByVal := test.ValueOf(u, "Email") + for _, u := range TestData["users"] { + pkVal := ValueOf(u, "Id") + idxByVal := ValueOf(u, "Email") _, err := sut.Add(pkVal, idxByVal) if err != nil { t.Fatal(err) diff --git a/accounts/pkg/indexer/indexer_test.go b/accounts/pkg/indexer/indexer_test.go index 130624174..618ff6e0a 100644 --- a/accounts/pkg/indexer/indexer_test.go +++ b/accounts/pkg/indexer/indexer_test.go @@ -2,59 +2,59 @@ package indexer import ( "github.com/owncloud/ocis/accounts/pkg/indexer/errors" - "github.com/owncloud/ocis/accounts/pkg/indexer/test" + . "github.com/owncloud/ocis/accounts/pkg/indexer/test" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "testing" ) func TestIndexer_AddWithUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddUniqueIndex(&test.User{}, "UserName", "Id", "users") + indexer.AddUniqueIndex(&User{}, "UserName", "Id", "users") - u := &test.User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} + u := &User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} err := indexer.Add(u) assert.NoError(t, err) } func TestIndexer_FindByWithUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddUniqueIndex(&test.User{}, "UserName", "Id", "users") + indexer.AddUniqueIndex(&User{}, "UserName", "Id", "users") - u := &test.User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} + u := &User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} err := indexer.Add(u) assert.NoError(t, err) - res, err := indexer.FindBy(test.User{}, "UserName", "mikey") + res, err := indexer.FindBy(User{}, "UserName", "mikey") assert.NoError(t, err) t.Log(res) } func TestIndexer_AddWithNonUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddNonUniqueIndex(&test.TestPet{}, "Kind", "Id", "pets") + indexer.AddNonUniqueIndex(&TestPet{}, "Kind", "Id", "pets") - pet1 := test.TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} - pet2 := test.TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} + pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} + pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} err := indexer.Add(pet1) assert.NoError(t, err) @@ -62,24 +62,24 @@ func TestIndexer_AddWithNonUniqueIndex(t *testing.T) { err = indexer.Add(pet2) assert.NoError(t, err) - res, err := indexer.FindBy(test.TestPet{}, "Kind", "Hog") + res, err := indexer.FindBy(TestPet{}, "Kind", "Hog") assert.NoError(t, err) t.Log(res) } func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddNonUniqueIndex(&test.TestPet{}, "Kind", "Id", "pets") + indexer.AddNonUniqueIndex(&TestPet{}, "Kind", "Id", "pets") - pet1 := test.TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} - pet2 := test.TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} + pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} + pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} err := indexer.Add(pet1) assert.NoError(t, err) @@ -92,17 +92,17 @@ func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) { } func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddNonUniqueIndex(&test.TestPet{}, "Name", "Id", "pets") + indexer.AddNonUniqueIndex(&TestPet{}, "Name", "Id", "pets") - pet1 := test.TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} - pet2 := test.TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} + pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} + pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} err := indexer.Add(pet1) assert.NoError(t, err) @@ -117,17 +117,17 @@ func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) { } func TestIndexer_UpdateWithUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddUniqueIndex(&test.User{}, "UserName", "Id", "users") + indexer.AddUniqueIndex(&User{}, "UserName", "Id", "users") - user1 := &test.User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} - user2 := &test.User{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"} + user1 := &User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} + user2 := &User{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"} err := indexer.Add(user1) assert.NoError(t, err) @@ -146,17 +146,17 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) { } func TestIndexer_UpdateWithNonUniqueIndex(t *testing.T) { - dataDir := test.WriteIndexTestData(t, test.TestData, "Id") + dataDir := WriteIndexTestData(t, TestData, "Id") indexer := NewIndex(&Config{ DataDir: dataDir, IndexRootDirName: "index.disk", Log: zerolog.Logger{}, }) - indexer.AddNonUniqueIndex(&test.TestPet{}, "Name", "Id", "pets") + indexer.AddNonUniqueIndex(&TestPet{}, "Name", "Id", "pets") - pet1 := test.TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} - pet2 := test.TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} + pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} + pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} err := indexer.Add(pet1) assert.NoError(t, err)