From d90c1cdc449a64f234c54aa529cde55d9750da30 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 9 Jan 2020 22:50:01 -0500 Subject: [PATCH] Removed commented out tests --- api/api_test.go | 47 ----------- api/browsing_test.go | 186 ------------------------------------------- api/stream_test.go | 59 -------------- 3 files changed, 292 deletions(-) delete mode 100644 api/api_test.go delete mode 100644 api/browsing_test.go delete mode 100644 api/stream_test.go diff --git a/api/api_test.go b/api/api_test.go deleted file mode 100644 index 8cdedba0..00000000 --- a/api/api_test.go +++ /dev/null @@ -1,47 +0,0 @@ -package api_test - -// -//import ( -// "fmt" -// "net/http" -// "net/http/httptest" -// "strings" -// -// "github.com/astaxie/beego" -//) -// -//const ( -// testUser = "deluan" -// testPassword = "wordpass" -// testClient = "test" -// testVersion = "1.0.0" -//) -// -//func AddParams(endpoint string, params ...string) string { -// url := fmt.Sprintf("%s?u=%s&p=%s&c=%s&v=%s&f=json", endpoint, testUser, testPassword, testClient, testVersion) -// if len(params) > 0 { -// url = url + "&" + strings.Join(params, "&") -// } -// return url -//} -// -//func Get(url string, testCase string) (*http.Request, *httptest.ResponseRecorder) { -// r, _ := http.NewRequest("GET", url, nil) -// w := httptest.NewRecorder() -// beego.BeeApp.Handlers.ServeHTTP(w, r) -// -// log.Debug(r, "testing", testCase, fmt.Sprintf("\nUrl: %s\nStatus Code: [%d]\n%s", r.URL, w.Code, w.Body.String())) -// -// return r, w -//} -// -//func GetWithHeader(url string, header, value, testCase string) (*http.Request, *httptest.ResponseRecorder) { -// r, _ := http.NewRequest("GET", url, nil) -// r.Header.Add(header, value) -// w := httptest.NewRecorder() -// beego.BeeApp.Handlers.ServeHTTP(w, r) -// -// log.Debug(r, "testing", testCase, fmt.Sprintf("\nUrl: %s\nStatus Code: [%d]\n%s", r.URL, w.Code, w.Body.String())) -// -// return r, w -//} diff --git a/api/browsing_test.go b/api/browsing_test.go deleted file mode 100644 index 46ce59c2..00000000 --- a/api/browsing_test.go +++ /dev/null @@ -1,186 +0,0 @@ -package api_test -// -//import ( -// "testing" -// -// "github.com/cloudsonic/sonic-server/api/responses" -// "github.com/cloudsonic/sonic-server/domain" -// "github.com/cloudsonic/sonic-server/engine" -// "github.com/cloudsonic/sonic-server/persistence" -// . "github.com/cloudsonic/sonic-server/tests" -// "github.com/cloudsonic/sonic-server/utils" -// . "github.com/smartystreets/goconvey/convey" -//) -// -//func TestGetMusicFolders(t *testing.T) { -// Init(t, false) -// -// _, w := Get(AddParams("/rest/getMusicFolders.view"), "TestGetMusicFolders") -// -// Convey("Subject: GetMusicFolders Endpoint", t, func() { -// Convey("Status code should be 200", func() { -// So(w.Code, ShouldEqual, 200) -// }) -// Convey("The response should include the default folder", func() { -// So(UnindentJSON(w.Body.Bytes()), ShouldContainSubstring, `{"musicFolder":[{"id":"0","name":"iTunes Library"}]}`) -// }) -// }) -//} -// -//const ( -// emptyResponse = `{"indexes":{"ignoredArticles":"The El La Los Las Le Les Os As O A","lastModified":"1"}` -//) -// -//func TestGetIndexes(t *testing.T) { -// Init(t, false) -// -// mockRepo := persistence.CreateMockArtistIndexRepo() -// utils.DefineSingleton(new(domain.ArtistIndexRepository), func() domain.ArtistIndexRepository { -// return mockRepo -// }) -// propRepo := engine.CreateMockPropertyRepo() -// utils.DefineSingleton(new(engine.PropertyRepository), func() engine.PropertyRepository { -// return propRepo -// }) -// -// mockRepo.SetData("[]", 0) -// mockRepo.SetError(false) -// propRepo.Put(engine.PropLastScan, "1") -// propRepo.SetError(false) -// -// Convey("Subject: GetIndexes Endpoint", t, func() { -// Convey("Return fail on Index Table error", func() { -// mockRepo.SetError(true) -// _, w := Get(AddParams("/rest/getIndexes.view", "ifModifiedSince=0"), "TestGetIndexes") -// -// So(w.Body, ShouldReceiveError, responses.ErrorGeneric) -// }) -// Convey("Return fail on Property Table error", func() { -// propRepo.SetError(true) -// _, w := Get(AddParams("/rest/getIndexes.view"), "TestGetIndexes") -// -// So(w.Body, ShouldReceiveError, responses.ErrorGeneric) -// }) -// Convey("When the index is empty", func() { -// _, w := Get(AddParams("/rest/getIndexes.view"), "TestGetIndexes") -// -// Convey("Status code should be 200", func() { -// So(w.Code, ShouldEqual, 200) -// }) -// Convey("Then it should return an empty collection", func() { -// So(UnindentJSON(w.Body.Bytes()), ShouldContainSubstring, emptyResponse) -// }) -// }) -// Convey("When the index is not empty", func() { -// mockRepo.SetData(`[{"Id": "A","Artists": [ -// {"ArtistId": "21", "Artist": "Afrolicious"} -// ]}]`, 2) -// -// SkipConvey("Then it should return the the items in the response", func() { -// _, w := Get(AddParams("/rest/getIndexes.view"), "TestGetIndexes") -// -// So(w.Body.String(), ShouldContainSubstring, -// ``) -// }) -// }) -// Convey("And it should return empty if 'ifModifiedSince' is more recent than the index", func() { -// mockRepo.SetData(`[{"Id": "A","Artists": [ -// {"ArtistId": "21", "Artist": "Afrolicious"} -// ]}]`, 2) -// propRepo.Put(engine.PropLastScan, "1") -// -// _, w := Get(AddParams("/rest/getIndexes.view", "ifModifiedSince=2"), "TestGetIndexes") -// -// So(UnindentJSON(w.Body.Bytes()), ShouldContainSubstring, emptyResponse) -// }) -// Convey("And it should return empty if 'ifModifiedSince' is the same as the index last update", func() { -// mockRepo.SetData(`[{"Id": "A","Artists": [ -// {"ArtistId": "21", "Artist": "Afrolicious"} -// ]}]`, 2) -// propRepo.Put(engine.PropLastScan, "1") -// -// _, w := Get(AddParams("/rest/getIndexes.view", "ifModifiedSince=1"), "TestGetIndexes") -// -// So(UnindentJSON(w.Body.Bytes()), ShouldContainSubstring, emptyResponse) -// }) -// Reset(func() { -// mockRepo.SetData("[]", 0) -// mockRepo.SetError(false) -// propRepo.Put(engine.PropLastScan, "1") -// propRepo.SetError(false) -// }) -// }) -//} -// -//func TestGetMusicDirectory(t *testing.T) { -// Init(t, false) -// -// mockArtistRepo := persistence.CreateMockArtistRepo() -// utils.DefineSingleton(new(domain.ArtistRepository), func() domain.ArtistRepository { -// return mockArtistRepo -// }) -// mockAlbumRepo := persistence.CreateMockAlbumRepo() -// utils.DefineSingleton(new(domain.AlbumRepository), func() domain.AlbumRepository { -// return mockAlbumRepo -// }) -// mockMediaFileRepo := persistence.CreateMockMediaFileRepo() -// utils.DefineSingleton(new(domain.MediaFileRepository), func() domain.MediaFileRepository { -// return mockMediaFileRepo -// }) -// -// Convey("Subject: GetMusicDirectory Endpoint", t, func() { -// Convey("Should fail if missing Id parameter", func() { -// _, w := Get(AddParams("/rest/getMusicDirectory.view"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldReceiveError, responses.ErrorMissingParameter) -// }) -// Convey("Id is for an artist", func() { -// Convey("Return fail on Artist Table error", func() { -// mockArtistRepo.SetData(`[{"Id":"1","Name":"The Charlatans"}]`, 1) -// mockArtistRepo.SetError(true) -// _, w := Get(AddParams("/rest/getMusicDirectory.view", "id=1"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldReceiveError, responses.ErrorGeneric) -// }) -// }) -// Convey("When id is not found", func() { -// mockArtistRepo.SetData(`[{"Id":"1","Name":"The Charlatans"}]`, 1) -// _, w := Get(AddParams("/rest/getMusicDirectory.view", "id=NOT_FOUND"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldReceiveError, responses.ErrorDataNotFound) -// }) -// Convey("When id matches an artist", func() { -// mockArtistRepo.SetData(`[{"Id":"1","Name":"The KLF"}]`, 1) -// -// Convey("Without albums", func() { -// _, w := Get(AddParams("/rest/getMusicDirectory.view", "id=1"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldContainJSON, `"id":"1","name":"The KLF"`) -// }) -// Convey("With albums", func() { -// mockAlbumRepo.SetData(`[{"Id":"A","Name":"Tardis","ArtistId":"1"}]`, 1) -// _, w := Get(AddParams("/rest/getMusicDirectory.view", "id=1"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldContainJSON, `"child":[{"album":"Tardis","albumId":"A","artistId":"1","id":"A","isDir":true,"parent":"1","title":"Tardis"}]`) -// }) -// }) -// Convey("When id matches an album with tracks", func() { -// mockArtistRepo.SetData(`[{"Id":"2","Name":"Céu"}]`, 1) -// mockAlbumRepo.SetData(`[{"Id":"A","Name":"Vagarosa","ArtistId":"2"}]`, 1) -// mockMediaFileRepo.SetData(`[{"Id":"3","Title":"Cangote","AlbumId":"A"}]`, 1) -// _, w := Get(AddParams("/rest/getMusicDirectory.view", "id=A"), "TestGetMusicDirectory") -// -// So(w.Body, ShouldContainJSON, `"child":[{"albumId":"A","id":"3","isDir":false,"parent":"A","title":"Cangote","type":"music"}]`) -// }) -// Reset(func() { -// mockArtistRepo.SetData("[]", 0) -// mockArtistRepo.SetError(false) -// -// mockAlbumRepo.SetData("[]", 0) -// mockAlbumRepo.SetError(false) -// -// mockMediaFileRepo.SetData("[]", 0) -// mockMediaFileRepo.SetError(false) -// }) -// }) -//} diff --git a/api/stream_test.go b/api/stream_test.go deleted file mode 100644 index 7811b2e6..00000000 --- a/api/stream_test.go +++ /dev/null @@ -1,59 +0,0 @@ -package api_test - -// -//import ( -// "fmt" -// "net/http" -// "net/http/httptest" -// "testing" -// -// "github.com/astaxie/beego" -// "github.com/cloudsonic/sonic-server/api/responses" -// "github.com/cloudsonic/sonic-server/domain" -// "github.com/cloudsonic/sonic-server/persistence" -// . "github.com/cloudsonic/sonic-server/tests" -// "github.com/cloudsonic/sonic-server/utils" -// . "github.com/smartystreets/goconvey/convey" -//) -// -//func stream(params ...string) (*http.Request, *httptest.ResponseRecorder) { -// url := AddParams("/rest/stream.view", params...) -// r, _ := http.NewRequest("GET", url, nil) -// w := httptest.NewRecorder() -// beego.BeeApp.Handlers.ServeHTTP(w, r) -// log.Debug(r, "testing TestStream", fmt.Sprintf("\nUrl: %s\nStatus Code: [%d]\n%#v", r.URL, w.Code, w.HeaderMap)) -// return r, w -//} -// -//func TestStream(t *testing.T) { -// Init(t, false) -// -// mockMediaFileRepo := persistence.CreateMockMediaFileRepo() -// utils.DefineSingleton(new(domain.MediaFileRepository), func() domain.MediaFileRepository { -// return mockMediaFileRepo -// }) -// -// Convey("Subject: Stream Endpoint", t, func() { -// Convey("Should fail if missing Id parameter", func() { -// _, w := stream() -// -// So(w.Body, ShouldReceiveError, responses.ErrorMissingParameter) -// }) -// Convey("When id is not found", func() { -// mockMediaFileRepo.SetData(`[]`, 1) -// _, w := stream("id=NOT_FOUND") -// -// So(w.Body, ShouldReceiveError, responses.ErrorDataNotFound) -// }) -// Convey("When id is found", func() { -// mockMediaFileRepo.SetData(`[{"Id":"2","HasCoverArt":true,"Path":"tests/fixtures/01 Invisible (RED) Edit Version.mp3"}]`, 1) -// _, w := stream("id=2") -// -// So(w.Body.Bytes(), ShouldMatchMD5, "258dd4f0e70ee5c8dee3cb33c966acec") -// }) -// Reset(func() { -// mockMediaFileRepo.SetData("[]", 0) -// mockMediaFileRepo.SetError(false) -// }) -// }) -//}