diff --git a/accounts/pkg/indexer/index/cs3/non_unique_test.go b/accounts/pkg/indexer/index/cs3/non_unique_test.go index ac6fa06dd..8f2fe2f6a 100644 --- a/accounts/pkg/indexer/index/cs3/non_unique_test.go +++ b/accounts/pkg/indexer/index/cs3/non_unique_test.go @@ -31,7 +31,7 @@ func TestCS3NonUniqueIndex_FakeSymlink(t *testing.T) { } sut := NewNonUniqueIndexWithOptions( - option.WithTypeName(GetTypeFQN(TestUser{})), + option.WithTypeName(GetTypeFQN(User{})), option.WithIndexBy("UserName"), option.WithFilesDir(path.Join(cfg.Repo.Disk.Path, "/meta")), option.WithDataDir(cfg.Repo.Disk.Path), diff --git a/accounts/pkg/indexer/index/cs3/unique_test.go b/accounts/pkg/indexer/index/cs3/unique_test.go index 88783d13a..cc825a61f 100644 --- a/accounts/pkg/indexer/index/cs3/unique_test.go +++ b/accounts/pkg/indexer/index/cs3/unique_test.go @@ -50,7 +50,7 @@ func TestCS3UniqueIndex_FakeSymlink(t *testing.T) { } sut := NewUniqueIndexWithOptions( - option.WithTypeName(GetTypeFQN(TestUser{})), + option.WithTypeName(GetTypeFQN(User{})), option.WithIndexBy("UserName"), option.WithFilesDir(path.Join(cfg.Repo.Disk.Path, "/meta")), option.WithDataDir(cfg.Repo.Disk.Path), @@ -102,7 +102,7 @@ func TestCS3UniqueIndexSearch(t *testing.T) { } sut := NewUniqueIndexWithOptions( - option.WithTypeName(GetTypeFQN(TestUser{})), + option.WithTypeName(GetTypeFQN(User{})), option.WithIndexBy("UserName"), option.WithFilesDir(path.Join(cfg.Repo.Disk.Path, "/meta")), option.WithDataDir(cfg.Repo.Disk.Path), diff --git a/accounts/pkg/indexer/index/disk/unique_test.go b/accounts/pkg/indexer/index/disk/unique_test.go index dcec9217d..691900eb9 100644 --- a/accounts/pkg/indexer/index/disk/unique_test.go +++ b/accounts/pkg/indexer/index/disk/unique_test.go @@ -13,7 +13,7 @@ import ( ) func TestUniqueLookupSingleEntry(t *testing.T) { - uniq, dataDir := getUniqueIdxSut(t, "Email", TestUser{}) + uniq, dataDir := getUniqueIdxSut(t, "Email", User{}) filesDir := path.Join(dataDir, "users") t.Log("existing lookup") @@ -33,7 +33,7 @@ func TestUniqueLookupSingleEntry(t *testing.T) { } func TestUniqueUniqueConstraint(t *testing.T) { - uniq, dataDir := getUniqueIdxSut(t, "Email", TestUser{}) + uniq, dataDir := getUniqueIdxSut(t, "Email", User{}) _, err := uniq.Add("abcdefg-123", "mikey@example.com") assert.Error(t, err) @@ -43,7 +43,7 @@ func TestUniqueUniqueConstraint(t *testing.T) { } func TestUniqueRemove(t *testing.T) { - uniq, dataDir := getUniqueIdxSut(t, "Email", TestUser{}) + uniq, dataDir := getUniqueIdxSut(t, "Email", User{}) err := uniq.Remove("", "mikey@example.com") assert.NoError(t, err) @@ -56,7 +56,7 @@ func TestUniqueRemove(t *testing.T) { } func TestUniqueUpdate(t *testing.T) { - uniq, dataDir := getUniqueIdxSut(t, "Email", TestUser{}) + uniq, dataDir := getUniqueIdxSut(t, "Email", User{}) t.Log("successful update") err := uniq.Update("", "mikey@example.com", "mikey2@example.com") @@ -76,7 +76,7 @@ func TestUniqueUpdate(t *testing.T) { } func TestUniqueIndexSearch(t *testing.T) { - sut, dataDir := getUniqueIdxSut(t, "Email", TestUser{}) + sut, dataDir := getUniqueIdxSut(t, "Email", User{}) res, err := sut.Search("j*@example.com") diff --git a/accounts/pkg/indexer/indexer_test.go b/accounts/pkg/indexer/indexer_test.go index 6f1532d41..032ea1eb5 100644 --- a/accounts/pkg/indexer/indexer_test.go +++ b/accounts/pkg/indexer/indexer_test.go @@ -20,10 +20,10 @@ func TestIndexer_AddWithUniqueIndex(t *testing.T) { }, }) - err := indexer.AddIndex(&TestUser{}, "UserName", "Id", "users", "unique") + err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique") assert.NoError(t, err) - u := &TestUser{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) @@ -43,10 +43,10 @@ func TestIndexer_AddWithUniqueIndexCS3(t *testing.T) { }, }) - err := indexer.AddIndex(&TestUser{}, "UserName", "Id", "users", "unique") + err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique") assert.NoError(t, err) - u := &TestUser{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) @@ -66,10 +66,10 @@ func TestIndexer_AddWithNonUniqueIndexCS3(t *testing.T) { }, }) - err := indexer.AddIndex(&TestUser{}, "UserName", "Id", "users", "non_unique") + err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "non_unique") assert.NoError(t, err) - u := &TestUser{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) @@ -86,14 +86,14 @@ func TestIndexer_FindByWithUniqueIndex(t *testing.T) { }, }) - err := indexer.AddIndex(&TestUser{}, "UserName", "Id", "users", "unique") + err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique") assert.NoError(t, err) - u := &TestUser{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(TestUser{}, "UserName", "mikey") + res, err := indexer.FindBy(User{}, "UserName", "mikey") assert.NoError(t, err) t.Log(res) @@ -195,14 +195,14 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) { }, }) - err := indexer.AddIndex(&TestUser{}, "UserName", "Id", "users", "unique") + err := indexer.AddIndex(&User{}, "UserName", "Id", "users", "unique") assert.NoError(t, err) - err = indexer.AddIndex(&TestUser{}, "Email", "Id", "users", "unique") + err = indexer.AddIndex(&User{}, "Email", "Id", "users", "unique") assert.NoError(t, err) - user1 := &TestUser{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} - user2 := &TestUser{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) @@ -210,33 +210,33 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) { err = indexer.Add(user2) assert.NoError(t, err) - err = indexer.Update(user1, &TestUser{ + err = indexer.Update(user1, &User{ Id: "abcdefg-123", UserName: "mikey-new", Email: "mikey@example.com", }) assert.NoError(t, err) - v, err1 := indexer.FindBy(&TestUser{}, "UserName", "mikey-new") + v, err1 := indexer.FindBy(&User{}, "UserName", "mikey-new") assert.NoError(t, err1) assert.Len(t, v, 1) - v, err2 := indexer.FindBy(&TestUser{}, "UserName", "mikey") + v, err2 := indexer.FindBy(&User{}, "UserName", "mikey") assert.NoError(t, err2) assert.Len(t, v, 0) - err1 = indexer.Update(&TestUser{ + err1 = indexer.Update(&User{ Id: "abcdefg-123", UserName: "mikey-new", Email: "mikey@example.com", - }, &TestUser{ + }, &User{ Id: "abcdefg-123", UserName: "mikey-newest", Email: "mikey-new@example.com", }) assert.NoError(t, err1) - fbUserName, err2 := indexer.FindBy(&TestUser{}, "UserName", "mikey-newest") + fbUserName, err2 := indexer.FindBy(&User{}, "UserName", "mikey-newest") assert.NoError(t, err2) assert.Len(t, fbUserName, 1) - fbEmail, err3 := indexer.FindBy(&TestUser{}, "Email", "mikey-new@example.com") + fbEmail, err3 := indexer.FindBy(&User{}, "Email", "mikey-new@example.com") assert.NoError(t, err3) assert.Len(t, fbEmail, 1) diff --git a/accounts/pkg/indexer/test/data.go b/accounts/pkg/indexer/test/data.go index 9e7bf840a..90dce43e2 100644 --- a/accounts/pkg/indexer/test/data.go +++ b/accounts/pkg/indexer/test/data.go @@ -8,8 +8,8 @@ import ( "testing" ) -// TestUser is a user. -type TestUser struct { +// User is a user. +type User struct { Id, UserName, Email string } @@ -21,10 +21,10 @@ type TestPet struct { // TestData mock data. var TestData = map[string][]interface{}{ "users": { - TestUser{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}, - TestUser{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"}, - TestUser{Id: "ewf4ofk-555", UserName: "jacky", Email: "jacky@example.com"}, - TestUser{Id: "rulan54-777", UserName: "jones", Email: "jones@example.com"}, + User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}, + User{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"}, + User{Id: "ewf4ofk-555", UserName: "jacky", Email: "jacky@example.com"}, + User{Id: "rulan54-777", UserName: "jones", Email: "jones@example.com"}, }, "pets": { TestPet{Id: "rebef-123", Kind: "Dog", Color: "Brown", Name: "Waldo"}, diff --git a/accounts/pkg/indexer/test/helpers.go b/accounts/pkg/indexer/test/helpers.go index 19a1fe879..3d19a22fb 100644 --- a/accounts/pkg/indexer/test/helpers.go +++ b/accounts/pkg/indexer/test/helpers.go @@ -9,6 +9,7 @@ import ( "testing" ) +// CreateTmpDir creates a temporary dir for tests data. func CreateTmpDir(t *testing.T) string { name, err := ioutil.TempDir("/var/tmp", "testfiles-*") if err != nil { @@ -18,6 +19,7 @@ func CreateTmpDir(t *testing.T) string { return name } +// ValueOf gets the value of a type v on a given field . func ValueOf(v interface{}, field string) string { r := reflect.ValueOf(v) f := reflect.Indirect(r).FieldByName(field) @@ -37,6 +39,7 @@ func getType(v interface{}) (reflect.Value, error) { return rv, nil } +// GetTypeFQN formats a valid name from a type . func GetTypeFQN(t interface{}) string { typ, _ := getType(t) typeName := path.Join(typ.Type().PkgPath(), typ.Type().Name())