From 8ae4fdd5b297956b1c8fbc3d90280486464239ef Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 18 Jan 2020 01:56:17 -0500 Subject: [PATCH] Fix Windows test --- persistence/mediafile_repository_test.go | 7 ++++++- persistence/persistence_suite_test.go | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/persistence/mediafile_repository_test.go b/persistence/mediafile_repository_test.go index 1b2b2fbf9..f61edde47 100644 --- a/persistence/mediafile_repository_test.go +++ b/persistence/mediafile_repository_test.go @@ -1,6 +1,9 @@ package persistence import ( + "os" + "path/filepath" + "github.com/cloudsonic/sonic-server/model" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -15,7 +18,9 @@ var _ = Describe("MediaFileRepository", func() { Describe("FindByPath", func() { It("returns all records from a given ArtistID", func() { - Expect(repo.FindByPath("/beatles/1")).To(Equal(model.MediaFiles{ + path := string(os.PathSeparator) + filepath.Join("beatles", "1") + println("Searching path", path) // TODO Remove + Expect(repo.FindByPath(path)).To(Equal(model.MediaFiles{ songComeTogether, })) }) diff --git a/persistence/persistence_suite_test.go b/persistence/persistence_suite_test.go index 11cdc435b..fea1c329c 100644 --- a/persistence/persistence_suite_test.go +++ b/persistence/persistence_suite_test.go @@ -1,6 +1,8 @@ package persistence import ( + "os" + "strings" "testing" "github.com/cloudsonic/sonic-server/conf" @@ -34,10 +36,10 @@ var testAlbums = model.Albums{ albumRadioactivity, } -var songDayInALife = model.MediaFile{ID: "1", Title: "A Day In A Life", ArtistID: "3", AlbumID: "1", Genre: "Rock", Path: "/beatles/1/sgt/a day.mp3"} -var songComeTogether = model.MediaFile{ID: "2", Title: "Come Together", ArtistID: "3", AlbumID: "2", Genre: "Rock", Path: "/beatles/1/come together.mp3"} -var songRadioactivity = model.MediaFile{ID: "3", Title: "Radioactivity", ArtistID: "2", AlbumID: "3", Genre: "Electronic", Path: "/kraft/radio/radio.mp3"} -var songAntenna = model.MediaFile{ID: "4", Title: "Antenna", ArtistID: "2", AlbumID: "3", Genre: "Electronic", Path: "/kraft/radio/antenna.mp3"} +var songDayInALife = model.MediaFile{ID: "1", Title: "A Day In A Life", ArtistID: "3", AlbumID: "1", Genre: "Rock", Path: P("/beatles/1/sgt/a day.mp3")} +var songComeTogether = model.MediaFile{ID: "2", Title: "Come Together", ArtistID: "3", AlbumID: "2", Genre: "Rock", Path: P("/beatles/1/come together.mp3")} +var songRadioactivity = model.MediaFile{ID: "3", Title: "Radioactivity", ArtistID: "2", AlbumID: "3", Genre: "Electronic", Path: P("/kraft/radio/radio.mp3")} +var songAntenna = model.MediaFile{ID: "4", Title: "Antenna", ArtistID: "2", AlbumID: "3", Genre: "Electronic", Path: P("/kraft/radio/antenna.mp3")} var testSongs = model.MediaFiles{ songDayInALife, songComeTogether, @@ -45,6 +47,10 @@ var testSongs = model.MediaFiles{ songAntenna, } +func P(path string) string { + return strings.ReplaceAll(path, "/", string(os.PathSeparator)) +} + var _ = Describe("Initialize test DB", func() { BeforeSuite(func() { //log.SetLevel(log.LevelTrace)