From 45c23367315f189b197072d3324686244c1a8568 Mon Sep 17 00:00:00 2001 From: sentriz Date: Thu, 27 Jun 2019 15:26:33 +0100 Subject: [PATCH] update tests --- server/handler/test_data/db | Bin 118784 -> 135168 bytes .../test_get_album_list_alpha_artist | 22 ++-- .../test_data/test_get_album_list_alpha_name | 22 ++-- .../test_data/test_get_album_list_newest | 22 ++-- .../test_data/test_get_album_list_random | 102 +++++++-------- .../test_get_album_list_two_alpha_artist | 34 ++--- .../test_get_album_list_two_alpha_name | 34 ++--- .../test_data/test_get_album_list_two_newest | 34 ++--- .../test_data/test_get_album_list_two_random | 118 +++++++++--------- .../test_data/test_get_album_with_cover | 75 +++++------ .../test_data/test_get_album_without_cover | 2 +- .../handler/test_data/test_get_artist_id_one | 2 +- .../test_data/test_get_artist_id_three | 4 +- .../handler/test_data/test_get_artist_id_two | 2 +- .../test_data/test_get_artists_no_args | 10 ++ .../test_data/test_get_indexes_no_args | 10 ++ .../test_get_music_directory_with_tracks | 23 ++-- .../handler/test_data/test_search_three_q_13 | 2 +- .../handler/test_data/test_search_three_q_ani | 2 +- server/handler/test_data/test_search_two_q_13 | 43 +++++-- 20 files changed, 308 insertions(+), 255 deletions(-) diff --git a/server/handler/test_data/db b/server/handler/test_data/db index 35b48f41a307ea3b9c444af9ea0b83026ba9395a..df6cd27a8692c88542533b5cef461cf1481d6cb1 100644 GIT binary patch literal 135168 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 WnTi7$nd4r~Z$S1{9z_}v_kRGoHkz>j literal 118784 zcmeHw3w#_`dGE~5>|3+rXJpy2HIfrcifn0S-|NJ2^s=p3vTVtYY#idOq_MPkwIlDY zY%34q4dKzyauY~zn-E$`n*yN?lmg9#(uVRV0eWec3mf#~<(O z9~rVhRR~t)LbfFtj_?_b_K5M<=ni!yM1v1 zf3Lr~jAvO^*{vKMA0F)+KcyTVIz@}?>gwI-YaZCnbA*}F`8=3`Gug$mLH=H@1g#2x z+wJT9&HGyT%AOjRdHrnp%tE$2ccz$|ouj{I^HYoSr45ZL3>j^73!#+W*WOtZ*sUx- zv`aa&&exo1;qR)IP36y&v$JQ)xpH2of3IIrh4pf_!fJPSDS4T`o!qE|Y_Xgxl|dot z)7H6_Qj=X#QZ1)TdDY>FzqzG_f6aNKD)g~5mF;RmFSeUXk}H(;S-q$%6m#?0;*xSs zUs7nLfs)MYg%_zUHL~05)Nh%3dyaBs?6`8|#K?%E3=SRWJ27%xQ3{Ls{OG7KjP<$Zr7q>}*08_1xtYIbJ5fJUEJ>Q| z%1806UH8laR@4e!cd8RdjjFP+;%Tl5<@h+XniiXAt3t4`#$o}?Yqf&ADhGnpmV<>M zw!B=<6=q8%o&FoL^HjZz&Gf}sYiPc8s^n$_^rK!z45HD^7wEt^C5RLPv7SZ zn0fkJ7zQ2z9DJMz_?o+#`6Z%y*w>OuJX6Td>*TkfNx_Ofd0CF=9{CgcW4sZ1SwrT%lc=GK_p(eReJQ{LL}waNBCF|E!UpftG(Zm)G$f%Ej#Txstz8MPOfBCrxUD z-U8K8eMb9kYM{ZKKrid9>t(6FSU}|r?=76 zYp;KL@xQ6xtG)ahEA^*rifV+cG;OZkm!r~^a<_qPs2VRvv6;nUwhTk-Wzjl)oXP?1 zWy_=L@?S)UN$Ss39QQ^*9*UZLrm#3ah24MkMH-YolPgWT%PC#A2>#|h+xQA!GhLMM z5;0!p?_#4?gJ#YuOVrrBux!GPdSJ%V&7Yz@106Y+^z(~)VOlo_($zl&n^Myp6I`{e>Be?fjye!u*%e7}4*{KwTjUSOZ=uG1{ed30mcAhfHA-rU<@z@7z2y}#sFi0G4RqE*eG=Kb?g8Bh|tC_umAf(FiofH z|K2S^f^W3`FXChB*8c@bXyt3`|DF!vL~t$Z|6X_(QGOoZs9F9G*ah$%`T6i$!aG6_ zg|-Lp53UPT{6F?z@coPLsP{>)Dn2N#6JG84k;mY_$&YfMca z9#2bmFc?*}%pNtlM^hCowO38-iDPh4>70f$ zX?mB5h|k>hb?!0Yp%wY{;5;n|ZVv(1>wyHWKp-&!WVMuwsc+TGd=(Sw++|!s>%PU`H^Lf^rm`wo6r9cRaI>`=W4nU2Z)v zaRUNd%>*V?Fg*!(U{(<|gTTh7^=zT4LHrw^Zsnd6=IOStHce!?Ld7x5hk`M#5 zbHLEu>eO{Zx1C5PTrt>0u+LPLS~0X)Q6xiezK6S9ms9)mt|mkST>_xl?#Kw}ZaS8B zRbQJ34kT1%=t3^93@w?2bR^%-U9MiLmG7$r!-(Kof}q10K`g2z-R)k~DuQ-TRr-|C zT&biOXO&aNB4wlVw_CZ(w(B)4!tEi10wV?>qs1AD8c$_nuKi=wDuN~jt7hIPWGRMS zb05SS!3(v*gB3oArLU%(S_%q}$K90ECW1o+RT(RwevVx%m;fG0a+hn@Y8XOy1`q<+ zR3KoRBLUDn64A7)ZrViD6hatQju&(K3&&zJ3aYl6CqN2vP<)DB0e=~OzEQXSh5vTPH9Uaek5NIx%l7C$}AmxU>t zV$=hLIrkNFkZc}EHkl!G`4&npcAzzReveKdZlzpDoT0jtaPjNGU>Q< zL^>q(OV>$BNtLdVu99}ZtFs@*0AqkLz!+c*Fa{U{i~+^~W8nXD2D}2#`|l*_9VES- zq_>fDiKLfEdXc0TNV-VUGD%A$Et2#+Nf$8n86+)`be^PnlAa^!D@d9n=^ROCNqUx~ zI!R|pI!)3kl4ePID@o6g^cIr7oTN9C^fXCdM$%IxJxS6@lHNqp6C^!O(g~7|lk^x# zkCJqZq(?CIj*@hQq=!j*BT0uzdWfV4NqT^!Lzs$#Bpo1WKS}#YdIL%Klk|F$?jz}S zB)yiTdr6uhX_}-dk|s%-AZeVWF_K0}s*zMBX)j58NV=?0Rn zC+Rwp%9wg0B$Y_oMA9%xLnMV50w5D0sh^}iQ3�OhilsOgw@R40@oQ^YT;J+FRtO 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 diff --git a/server/handler/test_data/test_get_album_list_alpha_artist b/server/handler/test_data/test_get_album_list_alpha_artist index fc7f932..86716b4 100644 --- a/server/handler/test_data/test_get_album_list_alpha_artist +++ b/server/handler/test_data/test_get_album_list_alpha_artist @@ -35,16 +35,25 @@ "id": 8, "coverArt": 8, "artist": "A Certain Ratio", - "title": "(1981) To Each.", + "title": "(1981) To EachOTHER.", "parent": 6, "isDir": true, "created": "0001-01-01T00:00:00Z" }, + { + "id": 23, + "coverArt": 23, + "artist": "Captain Beefheart", + "title": "(1970) Lick My Decals Off, Bitch", + "parent": 22, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, { "id": 5, "coverArt": 5, "artist": "Dead Moon", - "title": "(1989) Unknown Passage", + "title": "(1989) Unknown PassagePENIS", "parent": 4, "isDir": true, "created": "0001-01-01T00:00:00Z" @@ -84,15 +93,6 @@ "parent": 20, "isDir": true, "created": "0001-01-01T00:00:00Z" - }, - { - "id": 15, - "coverArt": 15, - "artist": "There", - "title": "(2010) Anika", - "parent": 14, - "isDir": true, - "created": "0001-01-01T00:00:00Z" } ] } diff --git a/server/handler/test_data/test_get_album_list_alpha_name b/server/handler/test_data/test_get_album_list_alpha_name index 2ad9f87..ff0d6c5 100644 --- a/server/handler/test_data/test_get_album_list_alpha_name +++ b/server/handler/test_data/test_get_album_list_alpha_name @@ -31,6 +31,15 @@ "isDir": true, "created": "0001-01-01T00:00:00Z" }, + { + "id": 23, + "coverArt": 23, + "artist": "Captain Beefheart", + "title": "(1970) Lick My Decals Off, Bitch", + "parent": 22, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, { "id": 19, "coverArt": 19, @@ -53,7 +62,7 @@ "id": 8, "coverArt": 8, "artist": "A Certain Ratio", - "title": "(1981) To Each.", + "title": "(1981) To EachOTHER.", "parent": 6, "isDir": true, "created": "0001-01-01T00:00:00Z" @@ -71,7 +80,7 @@ "id": 5, "coverArt": 5, "artist": "Dead Moon", - "title": "(1989) Unknown Passage", + "title": "(1989) Unknown PassagePENIS", "parent": 4, "isDir": true, "created": "0001-01-01T00:00:00Z" @@ -84,15 +93,6 @@ "parent": 6, "isDir": true, "created": "0001-01-01T00:00:00Z" - }, - { - "id": 15, - "coverArt": 15, - "artist": "There", - "title": "(2010) Anika", - "parent": 14, - "isDir": true, - "created": "0001-01-01T00:00:00Z" } ] } diff --git a/server/handler/test_data/test_get_album_list_newest b/server/handler/test_data/test_get_album_list_newest index b647239..749bc24 100644 --- a/server/handler/test_data/test_get_album_list_newest +++ b/server/handler/test_data/test_get_album_list_newest @@ -4,6 +4,15 @@ "version": "1.9.0", "albumList": { "album": [ + { + "id": 23, + "coverArt": 23, + "artist": "Captain Beefheart", + "title": "(1970) Lick My Decals Off, Bitch", + "parent": 22, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, { "id": 21, "coverArt": 21, @@ -62,7 +71,7 @@ "id": 8, "coverArt": 8, "artist": "A Certain Ratio", - "title": "(1981) To Each.", + "title": "(1981) To EachOTHER.", "parent": 6, "isDir": true, "created": "0001-01-01T00:00:00Z" @@ -80,19 +89,10 @@ "id": 5, "coverArt": 5, "artist": "Dead Moon", - "title": "(1989) Unknown Passage", + "title": "(1989) Unknown PassagePENIS", "parent": 4, "isDir": true, "created": "0001-01-01T00:00:00Z" - }, - { - "id": 3, - "coverArt": 3, - "artist": "Jah Wobble, The Edge, Holger Czukay", - "title": "(1983) Snake Charmer", - "parent": 2, - "isDir": true, - "created": "0001-01-01T00:00:00Z" } ] } diff --git a/server/handler/test_data/test_get_album_list_random b/server/handler/test_data/test_get_album_list_random index 12968b3..34ac408 100644 --- a/server/handler/test_data/test_get_album_list_random +++ b/server/handler/test_data/test_get_album_list_random @@ -5,56 +5,20 @@ "albumList": { "album": [ { - "id": 11, - "coverArt": 11, - "artist": "13th Floor Lowervators", - "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", - "parent": 9, + "id": 23, + "coverArt": 23, + "artist": "Captain Beefheart", + "title": "(1970) Lick My Decals Off, Bitch", + "parent": 22, "isDir": true, "created": "0001-01-01T00:00:00Z" }, { - "id": 15, - "coverArt": 15, - "artist": "There", - "title": "(2010) Anika", - "parent": 14, - "isDir": true, - "created": "0001-01-01T00:00:00Z" - }, - { - "id": 3, - "coverArt": 3, - "artist": "Jah Wobble, The Edge, Holger Czukay", - "title": "(1983) Snake Charmer", - "parent": 2, - "isDir": true, - "created": "0001-01-01T00:00:00Z" - }, - { - "id": 5, - "coverArt": 5, - "artist": "Dead Moon", - "title": "(1989) Unknown Passage", - "parent": 4, - "isDir": true, - "created": "0001-01-01T00:00:00Z" - }, - { - "id": 8, - "coverArt": 8, - "artist": "A Certain Ratio", - "title": "(1981) To Each.", - "parent": 6, - "isDir": true, - "created": "0001-01-01T00:00:00Z" - }, - { - "id": 19, - "coverArt": 19, - "artist": "Swell Maps", - "title": "(1979) A Trip to Marineville", - "parent": 17, + "id": 21, + "coverArt": 21, + "artist": "Ten Years After", + "title": "(1967) Ten Years After", + "parent": 20, "isDir": true, "created": "0001-01-01T00:00:00Z" }, @@ -76,6 +40,15 @@ "isDir": true, "created": "0001-01-01T00:00:00Z" }, + { + "id": 11, + "coverArt": 11, + "artist": "13th Floor Lowervators", + "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", + "parent": 9, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, { "id": 7, "coverArt": 7, @@ -86,11 +59,38 @@ "created": "0001-01-01T00:00:00Z" }, { - "id": 21, - "coverArt": 21, - "artist": "Ten Years After", - "title": "(1967) Ten Years After", - "parent": 20, + "id": 5, + "coverArt": 5, + "artist": "Dead Moon", + "title": "(1989) Unknown PassagePENIS", + "parent": 4, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, + { + "id": 8, + "coverArt": 8, + "artist": "A Certain Ratio", + "title": "(1981) To EachOTHER.", + "parent": 6, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, + { + "id": 15, + "coverArt": 15, + "artist": "There", + "title": "(2010) Anika", + "parent": 14, + "isDir": true, + "created": "0001-01-01T00:00:00Z" + }, + { + "id": 19, + "coverArt": 19, + "artist": "Swell Maps", + "title": "(1979) A Trip to Marineville", + "parent": 17, "isDir": true, "created": "0001-01-01T00:00:00Z" } diff --git a/server/handler/test_data/test_get_album_list_two_alpha_artist b/server/handler/test_data/test_get_album_list_two_alpha_artist index d020b9f..713cf9d 100644 --- a/server/handler/test_data/test_get_album_list_two_alpha_artist +++ b/server/handler/test_data/test_get_album_list_two_alpha_artist @@ -10,7 +10,7 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-10T17:06:26.01139089+01:00" + "created": "2019-06-27T15:24:02.46573003+01:00" }, { "id": 11, @@ -18,7 +18,7 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-10T17:06:26.015039416+01:00" + "created": "2019-06-27T15:24:02.470330345+01:00" }, { "id": 7, @@ -26,14 +26,14 @@ "artistId": 3, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-10T17:06:26.003805335+01:00" + "created": "2019-06-27T15:24:02.450659914+01:00" }, { "id": 8, "artistId": 3, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-10T17:06:26.00810814+01:00" + "created": "2019-06-27T15:24:02.461369276+01:00" }, { "id": 15, @@ -41,7 +41,15 @@ "artistId": 5, "artist": "Anikas", "name": "Anika", - "created": "2019-06-10T17:06:26.028934348+01:00" + "created": "2019-06-27T15:24:02.477628419+01:00" + }, + { + "id": 23, + "coverArt": 23, + "artistId": 8, + "artist": "Captain Beefheart & His Magic Band", + "name": "Lick My Decals Off, Baby", + "created": "2019-06-27T15:24:02.506104998+01:00" }, { "id": 5, @@ -49,7 +57,7 @@ "artistId": 2, "artist": "Dead Moon", "name": "Unknown Passage", - "created": "2019-06-10T17:06:26.000595013+01:00" + "created": "2019-06-27T15:24:02.445256544+01:00" }, { "id": 3, @@ -57,7 +65,7 @@ "artistId": 1, "artist": "Jah Wobble, The Edge & Holger Czukay", "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00" + "created": "2019-06-27T15:24:02.442068575+01:00" }, { "id": 18, @@ -65,7 +73,7 @@ "artistId": 6, "artist": "Swell Maps", "name": "Jane From Occupied Europe", - "created": "2019-06-10T17:06:26.031594709+01:00" + "created": "2019-06-27T15:24:02.485555598+01:00" }, { "id": 19, @@ -73,15 +81,7 @@ "artistId": 6, "artist": "Swell Maps", "name": "A Trip to Marineville", - "created": "2019-06-10T17:06:26.036222364+01:00" - }, - { - "id": 21, - "coverArt": 21, - "artistId": 7, - "artist": "Ten Years After", - "name": "Ten Years After", - "created": "2019-06-10T17:06:26.041345532+01:00" + "created": "2019-06-27T15:24:02.492420212+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_alpha_name b/server/handler/test_data/test_get_album_list_two_alpha_name index d619573..6ba4985 100644 --- a/server/handler/test_data/test_get_album_list_two_alpha_name +++ b/server/handler/test_data/test_get_album_list_two_alpha_name @@ -10,7 +10,7 @@ "artistId": 6, "artist": "Swell Maps", "name": "A Trip to Marineville", - "created": "2019-06-10T17:06:26.036222364+01:00" + "created": "2019-06-27T15:24:02.492420212+01:00" }, { "id": 15, @@ -18,7 +18,7 @@ "artistId": 5, "artist": "Anikas", "name": "Anika", - "created": "2019-06-10T17:06:26.028934348+01:00" + "created": "2019-06-27T15:24:02.477628419+01:00" }, { "id": 10, @@ -26,7 +26,7 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-10T17:06:26.01139089+01:00" + "created": "2019-06-27T15:24:02.46573003+01:00" }, { "id": 18, @@ -34,7 +34,15 @@ "artistId": 6, "artist": "Swell Maps", "name": "Jane From Occupied Europe", - "created": "2019-06-10T17:06:26.031594709+01:00" + "created": "2019-06-27T15:24:02.485555598+01:00" + }, + { + "id": 23, + "coverArt": 23, + "artistId": 8, + "artist": "Captain Beefheart & His Magic Band", + "name": "Lick My Decals Off, Baby", + "created": "2019-06-27T15:24:02.506104998+01:00" }, { "id": 3, @@ -42,7 +50,7 @@ "artistId": 1, "artist": "Jah Wobble, The Edge & Holger Czukay", "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00" + "created": "2019-06-27T15:24:02.442068575+01:00" }, { "id": 21, @@ -50,7 +58,7 @@ "artistId": 7, "artist": "Ten Years After", "name": "Ten Years After", - "created": "2019-06-10T17:06:26.041345532+01:00" + "created": "2019-06-27T15:24:02.49914444+01:00" }, { "id": 7, @@ -58,7 +66,7 @@ "artistId": 3, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-10T17:06:26.003805335+01:00" + "created": "2019-06-27T15:24:02.450659914+01:00" }, { "id": 11, @@ -66,22 +74,14 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-10T17:06:26.015039416+01:00" + "created": "2019-06-27T15:24:02.470330345+01:00" }, { "id": 8, "artistId": 3, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-10T17:06:26.00810814+01:00" - }, - { - "id": 5, - "coverArt": 5, - "artistId": 2, - "artist": "Dead Moon", - "name": "Unknown Passage", - "created": "2019-06-10T17:06:26.000595013+01:00" + "created": "2019-06-27T15:24:02.461369276+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_newest b/server/handler/test_data/test_get_album_list_two_newest index 2f61c71..8c4e990 100644 --- a/server/handler/test_data/test_get_album_list_two_newest +++ b/server/handler/test_data/test_get_album_list_two_newest @@ -4,13 +4,21 @@ "version": "1.9.0", "albumList2": { "album": [ + { + "id": 23, + "coverArt": 23, + "artistId": 8, + "artist": "Captain Beefheart & His Magic Band", + "name": "Lick My Decals Off, Baby", + "created": "2019-06-27T15:24:02.506104998+01:00" + }, { "id": 21, "coverArt": 21, "artistId": 7, "artist": "Ten Years After", "name": "Ten Years After", - "created": "2019-06-10T17:06:26.041345532+01:00" + "created": "2019-06-27T15:24:02.49914444+01:00" }, { "id": 19, @@ -18,7 +26,7 @@ "artistId": 6, "artist": "Swell Maps", "name": "A Trip to Marineville", - "created": "2019-06-10T17:06:26.036222364+01:00" + "created": "2019-06-27T15:24:02.492420212+01:00" }, { "id": 18, @@ -26,7 +34,7 @@ "artistId": 6, "artist": "Swell Maps", "name": "Jane From Occupied Europe", - "created": "2019-06-10T17:06:26.031594709+01:00" + "created": "2019-06-27T15:24:02.485555598+01:00" }, { "id": 15, @@ -34,7 +42,7 @@ "artistId": 5, "artist": "Anikas", "name": "Anika", - "created": "2019-06-10T17:06:26.028934348+01:00" + "created": "2019-06-27T15:24:02.477628419+01:00" }, { "id": 11, @@ -42,7 +50,7 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-10T17:06:26.015039416+01:00" + "created": "2019-06-27T15:24:02.470330345+01:00" }, { "id": 10, @@ -50,14 +58,14 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "Easter Everywhere", - "created": "2019-06-10T17:06:26.01139089+01:00" + "created": "2019-06-27T15:24:02.46573003+01:00" }, { "id": 8, "artistId": 3, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-10T17:06:26.00810814+01:00" + "created": "2019-06-27T15:24:02.461369276+01:00" }, { "id": 7, @@ -65,7 +73,7 @@ "artistId": 3, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-10T17:06:26.003805335+01:00" + "created": "2019-06-27T15:24:02.450659914+01:00" }, { "id": 5, @@ -73,15 +81,7 @@ "artistId": 2, "artist": "Dead Moon", "name": "Unknown Passage", - "created": "2019-06-10T17:06:26.000595013+01:00" - }, - { - "id": 3, - "coverArt": 3, - "artistId": 1, - "artist": "Jah Wobble, The Edge & Holger Czukay", - "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00" + "created": "2019-06-27T15:24:02.445256544+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_list_two_random b/server/handler/test_data/test_get_album_list_two_random index 1ce9ff8..4764a1d 100644 --- a/server/handler/test_data/test_get_album_list_two_random +++ b/server/handler/test_data/test_get_album_list_two_random @@ -10,63 +10,7 @@ "artistId": 2, "artist": "Dead Moon", "name": "Unknown Passage", - "created": "2019-06-10T17:06:26.000595013+01:00" - }, - { - "id": 10, - "coverArt": 10, - "artistId": 4, - "artist": "13th Floor Elevators", - "name": "Easter Everywhere", - "created": "2019-06-10T17:06:26.01139089+01:00" - }, - { - "id": 11, - "coverArt": 11, - "artistId": 4, - "artist": "13th Floor Elevators", - "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-10T17:06:26.015039416+01:00" - }, - { - "id": 3, - "coverArt": 3, - "artistId": 1, - "artist": "Jah Wobble, The Edge & Holger Czukay", - "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00" - }, - { - "id": 19, - "coverArt": 19, - "artistId": 6, - "artist": "Swell Maps", - "name": "A Trip to Marineville", - "created": "2019-06-10T17:06:26.036222364+01:00" - }, - { - "id": 7, - "coverArt": 7, - "artistId": 3, - "artist": "A Certain Ratio", - "name": "The Graveyard and the Ballroom", - "created": "2019-06-10T17:06:26.003805335+01:00" - }, - { - "id": 15, - "coverArt": 15, - "artistId": 5, - "artist": "Anikas", - "name": "Anika", - "created": "2019-06-10T17:06:26.028934348+01:00" - }, - { - "id": 18, - "coverArt": 18, - "artistId": 6, - "artist": "Swell Maps", - "name": "Jane From Occupied Europe", - "created": "2019-06-10T17:06:26.031594709+01:00" + "created": "2019-06-27T15:24:02.445256544+01:00" }, { "id": 21, @@ -74,14 +18,70 @@ "artistId": 7, "artist": "Ten Years After", "name": "Ten Years After", - "created": "2019-06-10T17:06:26.041345532+01:00" + "created": "2019-06-27T15:24:02.49914444+01:00" + }, + { + "id": 10, + "coverArt": 10, + "artistId": 4, + "artist": "13th Floor Elevators", + "name": "Easter Everywhere", + "created": "2019-06-27T15:24:02.46573003+01:00" }, { "id": 8, "artistId": 3, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-10T17:06:26.00810814+01:00" + "created": "2019-06-27T15:24:02.461369276+01:00" + }, + { + "id": 11, + "coverArt": 11, + "artistId": 4, + "artist": "13th Floor Elevators", + "name": "The Psychedelic Sounds of the 13th Floor Elevators", + "created": "2019-06-27T15:24:02.470330345+01:00" + }, + { + "id": 15, + "coverArt": 15, + "artistId": 5, + "artist": "Anikas", + "name": "Anika", + "created": "2019-06-27T15:24:02.477628419+01:00" + }, + { + "id": 7, + "coverArt": 7, + "artistId": 3, + "artist": "A Certain Ratio", + "name": "The Graveyard and the Ballroom", + "created": "2019-06-27T15:24:02.450659914+01:00" + }, + { + "id": 3, + "coverArt": 3, + "artistId": 1, + "artist": "Jah Wobble, The Edge & Holger Czukay", + "name": "Snake Charmer", + "created": "2019-06-27T15:24:02.442068575+01:00" + }, + { + "id": 23, + "coverArt": 23, + "artistId": 8, + "artist": "Captain Beefheart & His Magic Band", + "name": "Lick My Decals Off, Baby", + "created": "2019-06-27T15:24:02.506104998+01:00" + }, + { + "id": 18, + "coverArt": 18, + "artistId": 6, + "artist": "Swell Maps", + "name": "Jane From Occupied Europe", + "created": "2019-06-27T15:24:02.485555598+01:00" } ] } diff --git a/server/handler/test_data/test_get_album_with_cover b/server/handler/test_data/test_get_album_with_cover index 8b13875..0c941e3 100644 --- a/server/handler/test_data/test_get_album_with_cover +++ b/server/handler/test_data/test_get_album_with_cover @@ -8,17 +8,18 @@ "artistId": 1, "artist": "Jah Wobble, The Edge & Holger Czukay", "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00", + "created": "2019-06-27T15:24:02.442068575+01:00", "song": [ { "album": "Snake Charmer", "albumId": 3, "artist": "Jah Wobble, The Edge & Holger Czukay", "artistId": 1, - "bitRate": 866, + "bitRate": 882, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-10T17:06:25.998787704+01:00", + "created": "2019-06-27T15:24:02.442790707+01:00", + "duration": 372, "id": 1, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/01.05 Snake Charmer.flac", @@ -34,36 +35,18 @@ "albumId": 3, "artist": "Jah Wobble, The Edge & Holger Czukay", "artistId": 1, - "bitRate": 733, + "bitRate": 814, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-10T17:06:25.999138309+01:00", - "id": 2, - "parent": 3, - "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac", - "size": 31080508, - "suffix": "flac", - "title": "It Was a Camel", - "track": 1, - "discNumber": 1, - "type": "music" - }, - { - "album": "Snake Charmer", - "albumId": 3, - "artist": "Jah Wobble, The Edge & Holger Czukay", - "artistId": 1, - "bitRate": 798, - "contentType": "audio/x-flac", - "coverArt": 3, - "created": "2019-06-10T17:06:25.999449918+01:00", + "created": "2019-06-27T15:24:02.443827287+01:00", + "duration": 523, "id": 3, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/02.05 Hold On to Your Dreams.flac", "size": 53447545, "suffix": "flac", "title": "Hold On to Your Dreams", - "track": 1, + "track": 2, "discNumber": 1, "type": "music" }, @@ -72,17 +55,18 @@ "albumId": 3, "artist": "Jah Wobble, The Edge & Holger Czukay", "artistId": 1, - "bitRate": 867, + "bitRate": 745, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-10T17:06:25.999768289+01:00", - "id": 4, + "created": "2019-06-27T15:24:02.443344614+01:00", + "duration": 331, + "id": 2, "parent": 3, - "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac", - "size": 46427922, + "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac", + "size": 31080508, "suffix": "flac", - "title": "Snake Charmer (reprise)", - "track": 1, + "title": "It Was a Camel", + "track": 3, "discNumber": 1, "type": "music" }, @@ -91,17 +75,38 @@ "albumId": 3, "artist": "Jah Wobble, The Edge & Holger Czukay", "artistId": 1, - "bitRate": 961, + "bitRate": 976, "contentType": "audio/x-flac", "coverArt": 3, - "created": "2019-06-10T17:06:26.000111656+01:00", + "created": "2019-06-27T15:24:02.444768977+01:00", + "duration": 227, "id": 5, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/04.05 Sleazy.flac", "size": 27938750, "suffix": "flac", "title": "Sleazy", - "track": 1, + "track": 4, + "discNumber": 1, + "type": "music" + }, + { + "album": "Snake Charmer", + "albumId": 3, + "artist": "Jah Wobble, The Edge & Holger Czukay", + "artistId": 1, + "bitRate": 884, + "contentType": "audio/x-flac", + "coverArt": 3, + "created": "2019-06-27T15:24:02.444311153+01:00", + "duration": 418, + "id": 4, + "parent": 3, + "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac", + "size": 46427922, + "suffix": "flac", + "title": "Snake Charmer (reprise)", + "track": 5, "discNumber": 1, "type": "music" } diff --git a/server/handler/test_data/test_get_album_without_cover b/server/handler/test_data/test_get_album_without_cover index 84ba29f..a0e0653 100644 --- a/server/handler/test_data/test_get_album_without_cover +++ b/server/handler/test_data/test_get_album_without_cover @@ -4,7 +4,7 @@ "version": "1.9.0", "album": { "id": 2, - "created": "2019-06-10T17:06:25.998150103+01:00" + "created": "2019-06-27T15:24:02.441859723+01:00" } } } diff --git a/server/handler/test_data/test_get_artist_id_one b/server/handler/test_data/test_get_artist_id_one index de52da6..e232143 100644 --- a/server/handler/test_data/test_get_artist_id_one +++ b/server/handler/test_data/test_get_artist_id_one @@ -12,7 +12,7 @@ "artistId": 1, "artist": "Jah Wobble, The Edge & Holger Czukay", "name": "Snake Charmer", - "created": "2019-06-10T17:06:25.998358476+01:00" + "created": "2019-06-27T15:24:02.442068575+01:00" } ] } diff --git a/server/handler/test_data/test_get_artist_id_three b/server/handler/test_data/test_get_artist_id_three index cccae96..2daab69 100644 --- a/server/handler/test_data/test_get_artist_id_three +++ b/server/handler/test_data/test_get_artist_id_three @@ -12,14 +12,14 @@ "artistId": 3, "artist": "A Certain Ratio", "name": "The Graveyard and the Ballroom", - "created": "2019-06-10T17:06:26.003805335+01:00" + "created": "2019-06-27T15:24:02.450659914+01:00" }, { "id": 8, "artistId": 3, "artist": "A Certain Ratio", "name": "To Each...", - "created": "2019-06-10T17:06:26.00810814+01:00" + "created": "2019-06-27T15:24:02.461369276+01:00" } ] } diff --git a/server/handler/test_data/test_get_artist_id_two b/server/handler/test_data/test_get_artist_id_two index 874e11d..cd9b5bf 100644 --- a/server/handler/test_data/test_get_artist_id_two +++ b/server/handler/test_data/test_get_artist_id_two @@ -12,7 +12,7 @@ "artistId": 2, "artist": "Dead Moon", "name": "Unknown Passage", - "created": "2019-06-10T17:06:26.000595013+01:00" + "created": "2019-06-27T15:24:02.445256544+01:00" } ] } diff --git a/server/handler/test_data/test_get_artists_no_args b/server/handler/test_data/test_get_artists_no_args index 46e8e78..359e0ae 100644 --- a/server/handler/test_data/test_get_artists_no_args +++ b/server/handler/test_data/test_get_artists_no_args @@ -29,6 +29,16 @@ } ] }, + { + "name": "c", + "artist": [ + { + "id": 8, + "name": "Captain Beefheart & His Magic Band", + "albumCount": 1 + } + ] + }, { "name": "d", "artist": [ diff --git a/server/handler/test_data/test_get_indexes_no_args b/server/handler/test_data/test_get_indexes_no_args index b56be40..c9adfd1 100644 --- a/server/handler/test_data/test_get_indexes_no_args +++ b/server/handler/test_data/test_get_indexes_no_args @@ -30,6 +30,16 @@ } ] }, + { + "name": "c", + "artist": [ + { + "id": 22, + "name": "Captain Beefheart", + "albumCount": 1 + } + ] + }, { "name": "d", "artist": [ diff --git a/server/handler/test_data/test_get_music_directory_with_tracks b/server/handler/test_data/test_get_music_directory_with_tracks index 509b527..1cae3bb 100644 --- a/server/handler/test_data/test_get_music_directory_with_tracks +++ b/server/handler/test_data/test_get_music_directory_with_tracks @@ -10,10 +10,11 @@ { "album": "(1983) Snake Charmer", "artist": "Jah Wobble, The Edge & Holger Czukay", - "bitRate": 866, + "bitRate": 882, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 372, "id": 1, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/01.05 Snake Charmer.flac", @@ -27,68 +28,72 @@ { "album": "(1983) Snake Charmer", "artist": "Jah Wobble, The Edge & Holger Czukay", - "bitRate": 798, + "bitRate": 814, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 523, "id": 3, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/02.05 Hold On to Your Dreams.flac", "size": 53447545, "suffix": "flac", "title": "Hold On to Your Dreams", - "track": 1, + "track": 2, "discNumber": 1, "type": "music" }, { "album": "(1983) Snake Charmer", "artist": "Jah Wobble, The Edge & Holger Czukay", - "bitRate": 733, + "bitRate": 745, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 331, "id": 2, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac", "size": 31080508, "suffix": "flac", "title": "It Was a Camel", - "track": 1, + "track": 3, "discNumber": 1, "type": "music" }, { "album": "(1983) Snake Charmer", "artist": "Jah Wobble, The Edge & Holger Czukay", - "bitRate": 961, + "bitRate": 976, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 227, "id": 5, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/04.05 Sleazy.flac", "size": 27938750, "suffix": "flac", "title": "Sleazy", - "track": 1, + "track": 4, "discNumber": 1, "type": "music" }, { "album": "(1983) Snake Charmer", "artist": "Jah Wobble, The Edge & Holger Czukay", - "bitRate": 867, + "bitRate": 884, "contentType": "audio/x-flac", "coverArt": 3, "created": "0001-01-01T00:00:00Z", + "duration": 418, "id": 4, "parent": 3, "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac", "size": 46427922, "suffix": "flac", "title": "Snake Charmer (reprise)", - "track": 1, + "track": 5, "discNumber": 1, "type": "music" } diff --git a/server/handler/test_data/test_search_three_q_13 b/server/handler/test_data/test_search_three_q_13 index dff8055..5d36a6d 100644 --- a/server/handler/test_data/test_search_three_q_13 +++ b/server/handler/test_data/test_search_three_q_13 @@ -16,7 +16,7 @@ "artistId": 4, "artist": "13th Floor Elevators", "name": "The Psychedelic Sounds of the 13th Floor Elevators", - "created": "2019-06-10T17:06:26.015039416+01:00" + "created": "2019-06-27T15:24:02.470330345+01:00" } ] } diff --git a/server/handler/test_data/test_search_three_q_ani b/server/handler/test_data/test_search_three_q_ani index 016359a..124d8e2 100644 --- a/server/handler/test_data/test_search_three_q_ani +++ b/server/handler/test_data/test_search_three_q_ani @@ -16,7 +16,7 @@ "artistId": 5, "artist": "Anikas", "name": "Anika", - "created": "2019-06-10T17:06:26.028934348+01:00" + "created": "2019-06-27T15:24:02.477628419+01:00" } ] } diff --git a/server/handler/test_data/test_search_two_q_13 b/server/handler/test_data/test_search_two_q_13 index 4de69e6..4d4bda6 100644 --- a/server/handler/test_data/test_search_two_q_13 +++ b/server/handler/test_data/test_search_two_q_13 @@ -24,28 +24,30 @@ { "album": "(1994) The Graveyard and the Ballroom", "artist": "A Certain Ratio", - "bitRate": 877, + "bitRate": 894, "contentType": "audio/x-flac", "coverArt": 7, "created": "0001-01-01T00:00:00Z", - "id": 15, + "duration": 332, + "id": 16, "parent": 7, "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac", "size": 37302417, "suffix": "flac", "title": "Flight", - "track": 1, + "track": 13, "discNumber": 1, "type": "music" }, { "album": "(1966) The Psychedelic Sounds of the 13th Floor Elevators", "artist": "13th Floor Elevators", - "bitRate": 245, + "bitRate": 244, "contentType": "audio/mpeg", "coverArt": 11, "created": "0001-01-01T00:00:00Z", - "id": 49, + "duration": 154, + "id": 50, "parent": 11, "path": "13th Floor Lowervators/(1966) The Psychedelic Sounds of the 13th Floor Elevators/13.21 Before You Accuse Me.mp3", "size": 4722688, @@ -58,17 +60,18 @@ { "album": "(1980) Jane From Occupied Europe", "artist": "Swell Maps", - "bitRate": 1176, + "bitRate": 1204, "contentType": "audio/x-flac", "coverArt": 18, "created": "0001-01-01T00:00:00Z", - "id": 85, + "duration": 220, + "id": 86, "parent": 18, "path": "Swell Maps/(1980) Jane From Occupied Europe/13.16 Blenheim Shots.flac", "size": 33140852, "suffix": "flac", "title": "Blenheim Shots", - "track": 1, + "track": 13, "discNumber": 1, "type": "music" }, @@ -79,7 +82,8 @@ "contentType": "audio/mpeg", "coverArt": 19, "created": "0001-01-01T00:00:00Z", - "id": 102, + "duration": 463, + "id": 103, "parent": 19, "path": "Swell Maps/(1979) A Trip to Marineville/d01 13.14 Adventuring Into Basketry.mp3", "size": 17119309, @@ -96,7 +100,8 @@ "contentType": "audio/ogg", "coverArt": 21, "created": "0001-01-01T00:00:00Z", - "id": 115, + "duration": 433, + "id": 117, "parent": 21, "path": "Ten Years After/(1967) Ten Years After/13.15 Spider in My Web.ogg", "size": 10400948, @@ -105,6 +110,24 @@ "track": 13, "discNumber": 1, "type": "music" + }, + { + "album": "(1970) Lick My Decals Off, Bitch", + "artist": "Captain Beefheart & His Magic Band", + "bitRate": 160, + "contentType": "audio/mpeg", + "coverArt": 23, + "created": "0001-01-01T00:00:00Z", + "duration": 152, + "id": 139, + "parent": 23, + "path": "Captain Beefheart/(1970) Lick My Decals Off, Bitch/13.15 Space-Age Couple.mp3", + "size": 3054515, + "suffix": "mp3", + "title": "Space-Age Couple", + "track": 13, + "discNumber": 1, + "type": "music" } ] }