lastfm-albumart: Update tests

As we have moved to use API 2.0, we need to update the tests.

8 files changed, 219 insertions, 110 deletions

diff --git a/tests/lastfm-albumart/Makefile.am b/tests/lastfm-albumart/Makefile.am
index 534307c..95d5aa6 100644
--- a/tests/lastfm-albumart/Makefile.am
+++ b/tests/lastfm-albumart/Makefile.am
@@ -27,8 +27,9 @@ test_lastfm_albumart_CFLAGS =	\
 # Distribute the tests data:
 dist_noinst_DATA =               \
    data/network-data.ini         \
-   data/resolve-good-found.data  \
-   data/resolve-good-found-default.data
+   data/good.data                \
+   data/good-found-default.data  \
+   data/good-not-found.data
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
diff --git a/tests/lastfm-albumart/data/good-found-default.data b/tests/lastfm-albumart/data/good-found-default.data
new file mode 100644
index 0000000..e82a3ea
--- /dev/null
+++ b/tests/lastfm-albumart/data/good-found-default.data
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lfm status="ok"><album><name>Frocen</name>
+<artist>Madonna</artist>
+<url>http://www.last.fm/music/Madonna/Frocen</url>
+<image size="small"/>
+<image size="medium"/>
+<image size="large"/>
+<image size="extralarge"/>
+<image size="mega"/>
+<image size=""/>
+<listeners>1</listeners>
+<playcount>2</playcount>
+<tracks/>
+<tags/>
+</album>
+</lfm>
\ No newline at end of file
diff --git a/tests/lastfm-albumart/data/good-not-found.data b/tests/lastfm-albumart/data/good-not-found.data
new file mode 100644
index 0000000..16f67f2
--- /dev/null
+++ b/tests/lastfm-albumart/data/good-not-found.data
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lfm status="failed"><error code="6">Album not found</error>
+</lfm>
\ No newline at end of file
diff --git a/tests/lastfm-albumart/data/good.data b/tests/lastfm-albumart/data/good.data
new file mode 100644
index 0000000..3677c24
--- /dev/null
+++ b/tests/lastfm-albumart/data/good.data
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lfm status="ok"><album><name>Frozen</name>
+<artist>Madonna</artist>
+<mbid>538f0ae9-ab83-3080-aa30-1aff5554d9a5</mbid>
+<url>http://www.last.fm/music/Madonna/Frozen</url>
+<image size="small">http://img2-ak.lst.fm/i/u/34s/10dc1e48f06343539996122a02e199df.png</image>
+<image size="medium">http://img2-ak.lst.fm/i/u/64s/10dc1e48f06343539996122a02e199df.png</image>
+<image size="large">http://img2-ak.lst.fm/i/u/174s/10dc1e48f06343539996122a02e199df.png</image>
+<image size="extralarge">http://img2-ak.lst.fm/i/u/300x300/10dc1e48f06343539996122a02e199df.png</image>
+<image size="mega">http://img2-ak.lst.fm/i/u/10dc1e48f06343539996122a02e199df.png</image>
+<image size="">http://img2-ak.lst.fm/i/u/arQ/10dc1e48f06343539996122a02e199df.png</image>
+<listeners>20517</listeners>
+<playcount>121953</playcount>
+<tracks><track rank="1"><name>Frozen</name>
+<url>http://www.last.fm/music/Madonna/_/Frozen</url>
+<duration>332</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="2"><name>Don't Cry for Me Argentina</name>
+<url>http://www.last.fm/music/Madonna/_/Don%27t+Cry+for+Me+Argentina</url>
+<duration>332</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="3"><name>Like a Prayer</name>
+<url>http://www.last.fm/music/Madonna/_/Like+a+Prayer</url>
+<duration>352</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="4"><name>You'll See</name>
+<url>http://www.last.fm/music/Madonna/_/You%27ll+See</url>
+<duration>281</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="5"><name>Deeper and Deeper</name>
+<url>http://www.last.fm/music/Madonna/_/Deeper+and+Deeper</url>
+<duration>391</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="6"><name>La Isla Bonita</name>
+<url>http://www.last.fm/music/Madonna/_/La+Isla+Bonita</url>
+<duration>216</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="7"><name>Take A Bonita</name>
+<url>http://www.last.fm/music/Madonna/_/Take+A+Bonita</url>
+<duration>247</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="8"><name>Holiday</name>
+<url>http://www.last.fm/music/Madonna/_/Holiday</url>
+<duration>246</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="9"><name>Crazy for You</name>
+<url>http://www.last.fm/music/Madonna/_/Crazy+for+You</url>
+<duration>244</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="10"><name>Material Girl</name>
+<url>http://www.last.fm/music/Madonna/_/Material+Girl</url>
+<duration>233</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="11"><name>Causing a Commotion</name>
+<url>http://www.last.fm/music/Madonna/_/Causing+a+Commotion</url>
+<duration>293</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="12"><name>You Must Love Me</name>
+<url>http://www.last.fm/music/Madonna/_/You+Must+Love+Me</url>
+<duration>169</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="13"><name>Papa Don't Preach</name>
+<url>http://www.last.fm/music/Madonna/_/Papa+Don%27t+Preach</url>
+<duration>263</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="14"><name>Into The Groode</name>
+<url>http://www.last.fm/music/Madonna/_/Into+The+Groode</url>
+<duration>350</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="15"><name>Open Your Heart</name>
+<url>http://www.last.fm/music/Madonna/_/Open+Your+Heart</url>
+<duration>231</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="16"><name>Live to Tell</name>
+<url>http://www.last.fm/music/Madonna/_/Live+to+Tell</url>
+<duration>351</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+<track rank="17"><name>True Blue</name>
+<url>http://www.last.fm/music/Madonna/_/True+Blue</url>
+<duration>260</duration>
+<streamable fulltrack="0">0</streamable>
+<artist><name>Madonna</name>
+<mbid>79239441-bfd5-4981-a70c-55c3f15c1287</mbid>
+<url>http://www.last.fm/music/Madonna</url>
+</artist>
+</track>
+</tracks>
+<tags><tag><name>Madonna</name>
+<url>http://www.last.fm/tag/Madonna</url>
+</tag>
+<tag><name>pop</name>
+<url>http://www.last.fm/tag/pop</url>
+</tag>
+<tag><name>electronica</name>
+<url>http://www.last.fm/tag/electronica</url>
+</tag>
+<tag><name>female vocalists</name>
+<url>http://www.last.fm/tag/female+vocalists</url>
+</tag>
+<tag><name>Awesome</name>
+<url>http://www.last.fm/tag/Awesome</url>
+</tag>
+</tags>
+</album>
+</lfm>
\ No newline at end of file
diff --git a/tests/lastfm-albumart/data/network-data.ini b/tests/lastfm-albumart/data/network-data.ini
index f46f811..2e4693b 100644
--- a/tests/lastfm-albumart/data/network-data.ini
+++ b/tests/lastfm-albumart/data/network-data.ini
@@ -1,11 +1,11 @@
 [default]
 version=1
 
-[https://ws.audioscrobbler.com/1.0/album/madonna/frozen/info.xml]
-data=resolve-good-found.data
+[http://ws.audioscrobbler.com/2.0/?method=album.getInfo&api_key=7a2461fe34c9c8124fb28ac750ba12fa&artist=madonna&album=frozen]
+data=good.data
 
-[https://ws.audioscrobbler.com/1.0/album/madonna/frocen/info.xml]
-data=resolve-good-found-default.data
+[http://ws.audioscrobbler.com/2.0/?method=album.getInfo&api_key=7a2461fe34c9c8124fb28ac750ba12fa&artist=madonna&album=frocen]
+data=good-found-default.data
 
-[https://ws.audioscrobbler.com/1.0/album/madonna/unknown/info.xml]
-data=
+[http://ws.audioscrobbler.com/2.0/?method=album.getInfo&api_key=7a2461fe34c9c8124fb28ac750ba12fa&artist=madonna&album=unknown]
+data=good-not-found.data
diff --git a/tests/lastfm-albumart/data/resolve-good-found-default.data b/tests/lastfm-albumart/data/resolve-good-found-default.data
deleted file mode 100644
index 943005d..0000000
--- a/tests/lastfm-albumart/data/resolve-good-found-default.data
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<album artist="Madonna" title="Frocen">
-    <reach>1</reach>
-    <url>http://www.last.fm/music/Madonna/Frocen</url>
-    <releasedate>    </releasedate>
-    <coverart>
-        <small>http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</small>
-        <medium>http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</medium>
-        <large>http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</large>
-    </coverart>
-    <mbid></mbid>
-    <tracks>
-            </tracks>
-</album>
\ No newline at end of file
diff --git a/tests/lastfm-albumart/data/resolve-good-found.data b/tests/lastfm-albumart/data/resolve-good-found.data
deleted file mode 100644
index c00ed82..0000000
--- a/tests/lastfm-albumart/data/resolve-good-found.data
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<album artist="Madonna" title="Frozen">
-    <reach>20831</reach>
-    <url>http://www.last.fm/music/Madonna/Frozen</url>
-    <releasedate>    17 Mar 1998, 00:00</releasedate>
-    <coverart>
-        <small>http://userserve-ak.last.fm/serve/34s/76737256.png</small>
-        <medium>http://userserve-ak.last.fm/serve/64s/76737256.png</medium>
-        <large>http://userserve-ak.last.fm/serve/126/76737256.png</large>
-    </coverart>
-    <mbid>e911cad9-dc8f-4134-8438-c392b9cf1a58</mbid>
-    <tracks>
-                <track title="Frozen">
-            <reach>388796</reach>
-            <url>http://www.last.fm/music/Madonna/_/Frozen</url>
-                    </track>
-                <track title="Don't Cry for Me Argentina">
-            <reach>55360</reach>
-            <url>http://www.last.fm/music/Madonna/_/Don%27t+Cry+for+Me+Argentina</url>
-                    </track>
-                <track title="Like a Prayer">
-            <reach>487462</reach>
-            <url>http://www.last.fm/music/Madonna/_/Like+a+Prayer</url>
-                    </track>
-                <track title="You'll See">
-            <reach>68196</reach>
-            <url>http://www.last.fm/music/Madonna/_/You%27ll+See</url>
-                    </track>
-                <track title="Deeper and Deeper">
-            <reach>61639</reach>
-            <url>http://www.last.fm/music/Madonna/_/Deeper+and+Deeper</url>
-                    </track>
-                <track title="La Isla Bonita">
-            <reach>321802</reach>
-            <url>http://www.last.fm/music/Madonna/_/La+Isla+Bonita</url>
-                    </track>
-                <track title="Take A Bonita">
-            <reach>6</reach>
-            <url>http://www.last.fm/music/Madonna/_/Take+A+Bonita</url>
-                    </track>
-                <track title="Holyday">
-            <reach>283</reach>
-            <url>http://www.last.fm/music/+noredirect/Madonna/_/Holyday</url>
-                    </track>
-                <track title="Crazy for You">
-            <reach>167426</reach>
-            <url>http://www.last.fm/music/Madonna/_/Crazy+for+You</url>
-                    </track>
-                <track title="Material Girl">
-            <reach>358192</reach>
-            <url>http://www.last.fm/music/Madonna/_/Material+Girl</url>
-                    </track>
-                <track title="Causing a Commotion">
-            <reach>12784</reach>
-            <url>http://www.last.fm/music/Madonna/_/Causing+a+Commotion</url>
-                    </track>
-                <track title="You Must Love Me">
-            <reach>27327</reach>
-            <url>http://www.last.fm/music/Madonna/_/You+Must+Love+Me</url>
-                    </track>
-                <track title="Papa Don't Preach">
-            <reach>269903</reach>
-            <url>http://www.last.fm/music/Madonna/_/Papa+Don%27t+Preach</url>
-                    </track>
-                <track title="Into The Groode">
-            <reach>1</reach>
-            <url>http://www.last.fm/music/Madonna/_/Into+The+Groode</url>
-                    </track>
-                <track title="Open Your Heart">
-            <reach>169657</reach>
-            <url>http://www.last.fm/music/Madonna/_/Open+Your+Heart</url>
-                    </track>
-                <track title="Live to Tell">
-            <reach>157781</reach>
-            <url>http://www.last.fm/music/Madonna/_/Live+to+Tell</url>
-                    </track>
-                <track title="True Blue">
-            <reach>62135</reach>
-            <url>http://www.last.fm/music/Madonna/_/True+Blue</url>
-                    </track>
-            </tracks>
-</album>
\ No newline at end of file
diff --git a/tests/lastfm-albumart/test_lastfm_albumart.c b/tests/lastfm-albumart/test_lastfm_albumart.c
index 0966068..fa54234 100644
--- a/tests/lastfm-albumart/test_lastfm_albumart.c
+++ b/tests/lastfm-albumart/test_lastfm_albumart.c
@@ -167,24 +167,24 @@ test_resolve_good_found (void)
 
   g_assert_no_error (error);
 
-  /* We should get 5 thumbnails */
+  /* We should get 6 thumbnails */
   expected_n_thumbnails = grl_data_length (GRL_DATA (media), GRL_METADATA_KEY_THUMBNAIL);
   g_assert_cmpuint (expected_n_thumbnails, ==, 5);
   g_assert_cmpstr (grl_media_get_thumbnail_nth (media, 0),
                    ==,
-                   "http://userserve-ak.last.fm/serve/500/76737256.png");
+                   "http://img2-ak.lst.fm/i/u/10dc1e48f06343539996122a02e199df.png");
   g_assert_cmpstr (grl_media_get_thumbnail_nth (media, 1),
                    ==,
-                   "http://userserve-ak.last.fm/serve/252/76737256.png");
+                   "http://img2-ak.lst.fm/i/u/300x300/10dc1e48f06343539996122a02e199df.png");
   g_assert_cmpstr (grl_media_get_thumbnail_nth (media, 2),
                    ==,
-                   "http://userserve-ak.last.fm/serve/126/76737256.png");
+                   "http://img2-ak.lst.fm/i/u/174s/10dc1e48f06343539996122a02e199df.png");
   g_assert_cmpstr (grl_media_get_thumbnail_nth (media, 3),
                    ==,
-                   "http://userserve-ak.last.fm/serve/64s/76737256.png");
+                   "http://img2-ak.lst.fm/i/u/64s/10dc1e48f06343539996122a02e199df.png");
   g_assert_cmpstr (grl_media_get_thumbnail_nth (media, 4),
                    ==,
-                   "http://userserve-ak.last.fm/serve/34s/76737256.png");
+                   "http://img2-ak.lst.fm/i/u/34s/10dc1e48f06343539996122a02e199df.png");
 
   g_list_free (keys);
   g_object_unref (options);