arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Make MockRepo names more consistent

Browse Source
This commit is contained in:
Deluan
2021-06-08 16:30:19 -04:00
parent 779571a086
commit 110e17b004
12 changed files with 79 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/mock_album_repo.go
+10 -10
View File
@@ -6,11 +6,11 @@ import (
"github.com/navidrome/navidrome/model"
)
func CreateMockAlbumRepo() *MockAlbum {
return &MockAlbum{}
func CreateMockAlbumRepo() *MockAlbumRepo {
return &MockAlbumRepo{}
}
type MockAlbum struct {
type MockAlbumRepo struct {
model.AlbumRepository
data map[string]model.Album
all model.Albums
@@ -18,11 +18,11 @@ type MockAlbum struct {
Options model.QueryOptions
}
func (m *MockAlbum) SetError(err bool) {
func (m *MockAlbumRepo) SetError(err bool) {
m.err = err
}
func (m *MockAlbum) SetData(albums model.Albums) {
func (m *MockAlbumRepo) SetData(albums model.Albums) {
m.data = make(map[string]model.Album)
m.all = albums
for _, a := range m.all {
@@ -30,7 +30,7 @@ func (m *MockAlbum) SetData(albums model.Albums) {
}
}
func (m *MockAlbum) Exists(id string) (bool, error) {
func (m *MockAlbumRepo) Exists(id string) (bool, error) {
if m.err {
return false, errors.New("Error!")
}
@@ -38,7 +38,7 @@ func (m *MockAlbum) Exists(id string) (bool, error) {
return found, nil
}
func (m *MockAlbum) Get(id string) (*model.Album, error) {
func (m *MockAlbumRepo) Get(id string) (*model.Album, error) {
if m.err {
return nil, errors.New("Error!")
}
@@ -48,7 +48,7 @@ func (m *MockAlbum) Get(id string) (*model.Album, error) {
return nil, model.ErrNotFound
}
func (m *MockAlbum) GetAll(qo ...model.QueryOptions) (model.Albums, error) {
func (m *MockAlbumRepo) GetAll(qo ...model.QueryOptions) (model.Albums, error) {
if len(qo) > 0 {
m.Options = qo[0]
}
@@ -58,7 +58,7 @@ func (m *MockAlbum) GetAll(qo ...model.QueryOptions) (model.Albums, error) {
return m.all, nil
}
func (m *MockAlbum) FindByArtist(artistId string) (model.Albums, error) {
func (m *MockAlbumRepo) FindByArtist(artistId string) (model.Albums, error) {
if m.err {
return nil, errors.New("Error!")
}
@@ -74,4 +74,4 @@ func (m *MockAlbum) FindByArtist(artistId string) (model.Albums, error) {
return res, nil
}
var _ model.AlbumRepository = (*MockAlbum)(nil)
var _ model.AlbumRepository = (*MockAlbumRepo)(nil)
tests/mock_artist_repo.go
+8 -8
View File
@@ -6,28 +6,28 @@ import (
"github.com/navidrome/navidrome/model"
)
func CreateMockArtistRepo() *MockArtist {
return &MockArtist{}
func CreateMockArtistRepo() *MockArtistRepo {
return &MockArtistRepo{}
}
type MockArtist struct {
type MockArtistRepo struct {
model.ArtistRepository
data map[string]model.Artist
err bool
}
func (m *MockArtist) SetError(err bool) {
func (m *MockArtistRepo) SetError(err bool) {
m.err = err
}
func (m *MockArtist) SetData(artists model.Artists) {
func (m *MockArtistRepo) SetData(artists model.Artists) {
m.data = make(map[string]model.Artist)
for _, a := range artists {
m.data[a.ID] = a
}
}
func (m *MockArtist) Exists(id string) (bool, error) {
func (m *MockArtistRepo) Exists(id string) (bool, error) {
if m.err {
return false, errors.New("Error!")
}
@@ -35,7 +35,7 @@ func (m *MockArtist) Exists(id string) (bool, error) {
return found, nil
}
func (m *MockArtist) Get(id string) (*model.Artist, error) {
func (m *MockArtistRepo) Get(id string) (*model.Artist, error) {
if m.err {
return nil, errors.New("Error!")
}
@@ -45,4 +45,4 @@ func (m *MockArtist) Get(id string) (*model.Artist, error) {
return nil, model.ErrNotFound
}
var _ model.ArtistRepository = (*MockArtist)(nil)
var _ model.ArtistRepository = (*MockArtistRepo)(nil)
tests/mock_mediafile_repo.go
+9 -9
View File
@@ -6,28 +6,28 @@ import (
"github.com/navidrome/navidrome/model"
)
func CreateMockMediaFileRepo() *MockMediaFile {
return &MockMediaFile{}
func CreateMockMediaFileRepo() *MockMediaFileRepo {
return &MockMediaFileRepo{}
}
type MockMediaFile struct {
type MockMediaFileRepo struct {
model.MediaFileRepository
data map[string]model.MediaFile
err bool
}
func (m *MockMediaFile) SetError(err bool) {
func (m *MockMediaFileRepo) SetError(err bool) {
m.err = err
}
func (m *MockMediaFile) SetData(mfs model.MediaFiles) {
func (m *MockMediaFileRepo) SetData(mfs model.MediaFiles) {
m.data = make(map[string]model.MediaFile)
for _, mf := range mfs {
m.data[mf.ID] = mf
}
}
func (m *MockMediaFile) Exists(id string) (bool, error) {
func (m *MockMediaFileRepo) Exists(id string) (bool, error) {
if m.err {
return false, errors.New("Error!")
}
@@ -35,7 +35,7 @@ func (m *MockMediaFile) Exists(id string) (bool, error) {
return found, nil
}
func (m *MockMediaFile) Get(id string) (*model.MediaFile, error) {
func (m *MockMediaFileRepo) Get(id string) (*model.MediaFile, error) {
if m.err {
return nil, errors.New("Error!")
}
@@ -45,7 +45,7 @@ func (m *MockMediaFile) Get(id string) (*model.MediaFile, error) {
return nil, model.ErrNotFound
}
func (m *MockMediaFile) FindByAlbum(artistId string) (model.MediaFiles, error) {
func (m *MockMediaFileRepo) FindByAlbum(artistId string) (model.MediaFiles, error) {
if m.err {
return nil, errors.New("Error!")
}
@@ -61,4 +61,4 @@ func (m *MockMediaFile) FindByAlbum(artistId string) (model.MediaFiles, error) {
return res, nil
}
var _ model.MediaFileRepository = (*MockMediaFile)(nil)
var _ model.MediaFileRepository = (*MockMediaFileRepo)(nil)
tests/mock_persistence.go
+5 -2
View File
@@ -60,13 +60,16 @@ func (db *MockDataStore) PlayQueue(context.Context) model.PlayQueueRepository {
func (db *MockDataStore) Property(context.Context) model.PropertyRepository {
if db.MockedProperty == nil {
db.MockedProperty = &mockedPropertyRepo{}
db.MockedProperty = &MockedPropertyRepo{}
}
return db.MockedProperty
}
func (db *MockDataStore) Share(context.Context) model.ShareRepository {
return struct{ model.ShareRepository }{}
if db.MockedShare == nil {
db.MockedShare = &MockShareRepo{}
}
return db.MockedShare
}
func (db *MockDataStore) User(context.Context) model.UserRepository {
tests/mock_property_repo.go
+5 -5
View File
@@ -2,19 +2,19 @@ package tests
import "github.com/navidrome/navidrome/model"
type mockedPropertyRepo struct {
type MockedPropertyRepo struct {
model.UserRepository
data map[string]string
err error
}
func (p *mockedPropertyRepo) init() {
func (p *MockedPropertyRepo) init() {
if p.data == nil {
p.data = make(map[string]string)
}
}
func (p *mockedPropertyRepo) Put(id string, value string) error {
func (p *MockedPropertyRepo) Put(id string, value string) error {
if p.err != nil {
return p.err
}
@@ -23,7 +23,7 @@ func (p *mockedPropertyRepo) Put(id string, value string) error {
return nil
}
func (p *mockedPropertyRepo) Get(id string) (string, error) {
func (p *MockedPropertyRepo) Get(id string) (string, error) {
if p.err != nil {
return "", p.err
}
@@ -34,7 +34,7 @@ func (p *mockedPropertyRepo) Get(id string) (string, error) {
return "", model.ErrNotFound
}
func (p *mockedPropertyRepo) DefaultGet(id string, defaultValue string) (string, error) {
func (p *MockedPropertyRepo) DefaultGet(id string, defaultValue string) (string, error) {
if p.err != nil {
return "", p.err
}
tests/mock_share_repo.go
+27
View File
@@ -0,0 +1,27 @@
package tests
import (
"github.com/deluan/rest"
"github.com/navidrome/navidrome/model"
)
type MockShareRepo struct {
model.ShareRepository
rest.Repository
rest.Persistable
Entity interface{}
Cols []string
Err error
}
func (m *MockShareRepo) Save(entity interface{}) (string, error) {
m.Entity = entity
return "id", m.Err
}
func (m *MockShareRepo) Update(entity interface{}, cols ...string) error {
m.Entity = entity
m.Cols = cols
return m.Err
}
tests/mock_transcoding_repo.go
+3 -3
View File
@@ -2,15 +2,15 @@ package tests
import "github.com/navidrome/navidrome/model"
type MockTranscodingRepository struct {
type MockTranscodingRepo struct {
model.TranscodingRepository
}
func (m *MockTranscodingRepository) Get(id string) (*model.Transcoding, error) {
func (m *MockTranscodingRepo) Get(id string) (*model.Transcoding, error) {
return &model.Transcoding{ID: id, TargetFormat: "mp3", DefaultBitRate: 160}, nil
}
func (m *MockTranscodingRepository) FindByFormat(format string) (*model.Transcoding, error) {
func (m *MockTranscodingRepo) FindByFormat(format string) (*model.Transcoding, error) {
switch format {
case "mp3":
return &model.Transcoding{ID: "mp31", TargetFormat: "mp3", DefaultBitRate: 160}, nil