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

rename Id -> ID

Browse Source
This commit is contained in:
A.Unger
2020-10-14 18:03:52 +02:00
committed by Ilja Neumann
parent 0a038219fa
commit dd5ee5e9da
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/indexer/indexer_test.go
+17 -17
View File
@@ -23,7 +23,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) assert.NoError(t, err)
u := &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) err = indexer.Add(u)
assert.NoError(t, err) assert.NoError(t, err)
@@ -46,7 +46,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) assert.NoError(t, err)
u := &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) err = indexer.Add(u)
assert.NoError(t, err) assert.NoError(t, err)
@@ -69,7 +69,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) assert.NoError(t, err)
u := &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) err = indexer.Add(u)
assert.NoError(t, err) assert.NoError(t, err)
@@ -89,7 +89,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) assert.NoError(t, err)
u := &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) err = indexer.Add(u)
assert.NoError(t, err) assert.NoError(t, err)
@@ -113,8 +113,8 @@ func TestIndexer_AddWithNonUniqueIndex(t *testing.T) {
err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique") err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique")
assert.NoError(t, err) assert.NoError(t, err)
pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1) err = indexer.Add(pet1)
assert.NoError(t, err) assert.NoError(t, err)
@@ -141,8 +141,8 @@ func TestIndexer_DeleteWithNonUniqueIndex(t *testing.T) {
err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique") err := indexer.AddIndex(&TestPet{}, "Kind", "Id", "pets", "non_unique")
assert.NoError(t, err) assert.NoError(t, err)
pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1) err = indexer.Add(pet1)
assert.NoError(t, err) assert.NoError(t, err)
@@ -169,8 +169,8 @@ func TestIndexer_SearchWithNonUniqueIndex(t *testing.T) {
err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique") err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique")
assert.NoError(t, err) assert.NoError(t, err)
pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1) err = indexer.Add(pet1)
assert.NoError(t, err) assert.NoError(t, err)
@@ -201,8 +201,8 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
err = indexer.AddIndex(&User{}, "Email", "Id", "users", "unique") err = indexer.AddIndex(&User{}, "Email", "Id", "users", "unique")
assert.NoError(t, err) assert.NoError(t, err)
user1 := &User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"} user1 := &User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}
user2 := &User{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"} user2 := &User{ID: "hijklmn-456", UserName: "frank", Email: "frank@example.com"}
err = indexer.Add(user1) err = indexer.Add(user1)
assert.NoError(t, err) assert.NoError(t, err)
@@ -211,7 +211,7 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
err = indexer.Update(user1, &User{ err = indexer.Update(user1, &User{
Id: "abcdefg-123", ID: "abcdefg-123",
UserName: "mikey-new", UserName: "mikey-new",
Email: "mikey@example.com", Email: "mikey@example.com",
}) })
@@ -224,11 +224,11 @@ func TestIndexer_UpdateWithUniqueIndex(t *testing.T) {
assert.Len(t, v, 0) assert.Len(t, v, 0)
err1 = indexer.Update(&User{ err1 = indexer.Update(&User{
Id: "abcdefg-123", ID: "abcdefg-123",
UserName: "mikey-new", UserName: "mikey-new",
Email: "mikey@example.com", Email: "mikey@example.com",
}, &User{ }, &User{
Id: "abcdefg-123", ID: "abcdefg-123",
UserName: "mikey-newest", UserName: "mikey-newest",
Email: "mikey-new@example.com", Email: "mikey-new@example.com",
}) })
@@ -256,8 +256,8 @@ func TestIndexer_UpdateWithNonUniqueIndex(t *testing.T) {
err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique") err := indexer.AddIndex(&TestPet{}, "Name", "Id", "pets", "non_unique")
assert.NoError(t, err) assert.NoError(t, err)
pet1 := TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"} pet1 := TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}
pet2 := TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"} pet2 := TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}
err = indexer.Add(pet1) err = indexer.Add(pet1)
assert.NoError(t, err) assert.NoError(t, err)
accounts/pkg/indexer/test/data.go
+10 -10
View File
@@ -10,27 +10,27 @@ import (
// User is a user. // User is a user.
type User struct { type User struct {
Id, UserName, Email string ID, UserName, Email string
} }
// TestPet is a pet. // TestPet is a pet.
type TestPet struct { type TestPet struct {
Id, Kind, Color, Name string ID, Kind, Color, Name string
} }
// TestData mock data. // TestData mock data.
var TestData = map[string][]interface{}{ var TestData = map[string][]interface{}{
"users": { "users": {
User{Id: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"}, User{ID: "abcdefg-123", UserName: "mikey", Email: "mikey@example.com"},
User{Id: "hijklmn-456", UserName: "frank", Email: "frank@example.com"}, User{ID: "hijklmn-456", UserName: "frank", Email: "frank@example.com"},
User{Id: "ewf4ofk-555", UserName: "jacky", Email: "jacky@example.com"}, User{ID: "ewf4ofk-555", UserName: "jacky", Email: "jacky@example.com"},
User{Id: "rulan54-777", UserName: "jones", Email: "jones@example.com"}, User{ID: "rulan54-777", UserName: "jones", Email: "jones@example.com"},
}, },
"pets": { "pets": {
TestPet{Id: "rebef-123", Kind: "Dog", Color: "Brown", Name: "Waldo"}, TestPet{ID: "rebef-123", Kind: "Dog", Color: "Brown", Name: "Waldo"},
TestPet{Id: "wefwe-456", Kind: "Cat", Color: "White", Name: "Snowy"}, TestPet{ID: "wefwe-456", Kind: "Cat", Color: "White", Name: "Snowy"},
TestPet{Id: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"}, TestPet{ID: "goefe-789", Kind: "Hog", Color: "Green", Name: "Dicky"},
TestPet{Id: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"}, TestPet{ID: "xadaf-189", Kind: "Hog", Color: "Green", Name: "Ricky"},
}, },
} }