@@ -18,12 +18,22 @@ import (
1818
1919 "go.senan.xyz/gonic/server/ctrlbase"
2020 "go.senan.xyz/gonic/server/ctrlsubsonic/params"
21+ "go.senan.xyz/gonic/server/db"
2122 "go.senan.xyz/gonic/server/mockfs"
23+ "go.senan.xyz/gonic/server/transcode"
2224)
2325
24- var (
25- testDataDir = "testdata"
26- testCamelExpr = regexp .MustCompile ("([a-z0-9])([A-Z])" )
26+ var testCamelExpr = regexp .MustCompile ("([a-z0-9])([A-Z])" )
27+
28+ const (
29+ mockUsername = "admin"
30+ mockPassword = "admin"
31+ mockClientName = "test"
32+ )
33+
34+ const (
35+ audioPath5s = "testdata/audio/5s.flac" //nolint:deadcode,varcheck
36+ audioPath10s = "testdata/audio/10s.flac" //nolint:deadcode,varcheck
2737)
2838
2939type queryCase struct {
@@ -37,22 +47,43 @@ func makeGoldenPath(test string) string {
3747 snake := testCamelExpr .ReplaceAllString (test , "${1}_${2}" )
3848 lower := strings .ToLower (snake )
3949 relPath := strings .ReplaceAll (lower , "/" , "_" )
40- return path .Join (testDataDir , relPath )
50+ return path .Join ("testdata" , relPath )
4151}
4252
4353func makeHTTPMock (query url.Values ) (* httptest.ResponseRecorder , * http.Request ) {
4454 // ensure the handlers give us json
4555 query .Add ("f" , "json" )
56+ query .Add ("u" , mockUsername )
57+ query .Add ("p" , mockPassword )
58+ query .Add ("v" , "1" )
59+ query .Add ("c" , mockClientName )
4660 // request from the handler in question
4761 req , _ := http .NewRequest ("" , "" , nil )
4862 req .URL .RawQuery = query .Encode ()
49- subParams := params .New (req )
50- withParams := context .WithValue (req .Context (), CtxParams , subParams )
63+ ctx := req .Context ()
64+ ctx = context .WithValue (ctx , CtxParams , params .New (req ))
65+ ctx = context .WithValue (ctx , CtxUser , & db.User {})
66+ req = req .WithContext (ctx )
5167 rr := httptest .NewRecorder ()
52- req = req .WithContext (withParams )
5368 return rr , req
5469}
5570
71+ func serveRaw (t * testing.T , contr * Controller , h handlerSubsonicRaw , rr * httptest.ResponseRecorder , req * http.Request ) {
72+ type middleware func (http.Handler ) http.Handler
73+ middlewares := []middleware {
74+ contr .WithParams ,
75+ contr .WithRequiredParams ,
76+ contr .WithUser ,
77+ }
78+
79+ handler := contr .HR (h )
80+ for _ , m := range middlewares {
81+ handler = m (handler )
82+ }
83+
84+ handler .ServeHTTP (rr , req )
85+ }
86+
5687func runQueryCases (t * testing.T , contr * Controller , h handlerSubsonic , cases []* queryCase ) {
5788 t .Helper ()
5889 for _ , qc := range cases {
@@ -96,28 +127,40 @@ func runQueryCases(t *testing.T, contr *Controller, h handlerSubsonic, cases []*
96127 }
97128}
98129
99- func makeController (t * testing.T ) * Controller { return makec (t , []string {"" }) }
100- func makeControllerRoots (t * testing.T , r []string ) * Controller { return makec (t , r ) }
130+ func makeController (t * testing.T ) * Controller { return makec (t , []string {"" }, false ) }
131+ func makeControllerRoots (t * testing.T , r []string ) * Controller { return makec (t , r , false ) }
132+ func makeControllerAudio (t * testing.T ) * Controller { return makec (t , []string {"" }, true ) }
101133
102- func makec (t * testing.T , roots []string ) * Controller {
134+ func makec (t * testing.T , roots []string , audio bool ) * Controller {
103135 t .Helper ()
104136
105137 m := mockfs .NewWithDirs (t , roots )
106138 for _ , root := range roots {
107139 m .AddItemsPrefixWithCovers (root )
140+ if ! audio {
141+ continue
142+ }
143+ m .SetRealAudio (filepath .Join (root , "artist-0/album-0/track-0.flac" ), 10 , audioPath10s )
144+ m .SetRealAudio (filepath .Join (root , "artist-0/album-0/track-1.flac" ), 10 , audioPath10s )
145+ m .SetRealAudio (filepath .Join (root , "artist-0/album-0/track-2.flac" ), 10 , audioPath10s )
108146 }
109147
110148 m .ScanAndClean ()
111149 m .ResetDates ()
112- m .LogAlbums ()
113150
114151 var absRoots []string
115152 for _ , root := range roots {
116153 absRoots = append (absRoots , filepath .Join (m .TmpDir (), root ))
117154 }
118155
119156 base := & ctrlbase.Controller {DB : m .DB ()}
120- return & Controller {Controller : base , MusicPaths : absRoots }
157+ contr := & Controller {
158+ Controller : base ,
159+ MusicPaths : absRoots ,
160+ Transcoder : transcode .NewFFmpegTranscoder (),
161+ }
162+
163+ return contr
121164}
122165
123166func TestMain (m * testing.M ) {
0 commit comments