tests: port lua-factory fake sources to new API

https://bugzilla.gnome.org/show_bug.cgi?id=753141

2 files changed, 19 insertions, 20 deletions

diff --git a/tests/lua-factory/data/test-source-grl-media.lua b/tests/lua-factory/data/test-source-grl-media.lua
index 849c36d..f0272af 100644
--- a/tests/lua-factory/data/test-source-grl-media.lua
+++ b/tests/lua-factory/data/test-source-grl-media.lua
@@ -41,30 +41,30 @@ source = {
 -- Handlers of Grilo functions --
 ---------------------------------
 
-function grl_source_resolve()
+function grl_source_resolve(media, options, callback)
   -- This source expects an url which will be fetched and converted
   -- to a GrlMedia with grl.lua.json.string_to_table().
-  local req = grl.get_media_keys()
-  if not req or not req.url or #req.url == 0 then
+  if not media or not media.url or #media.url == 0 then
     grl.warning("resolve was called without metadata-key url")
-    grl.callback()
+    callback()
     return
   end
-  grl.fetch(req.url, "fetch_url_cb")
+  local userdata = {callback = callback, media = media}
+  grl.fetch(media.url, fetch_url_cb, userdata)
 end
 
-function fetch_url_cb(feed)
+function fetch_url_cb(feed, userdata)
   if not feed or #feed == 0 then
     grl.warning("failed to load json")
-    grl.callback()
+    userdata.callback()
     return
   end
 
   local media = grl.lua.json.string_to_table(feed)
   if not media then
     grl.warning ("fail to make media from json")
-    grl.callback()
+    userdata.callback()
     return
   end
-  grl.callback(media, 0)
+  userdata.callback(media, 0)
 end
diff --git a/tests/lua-factory/data/test-source-xml-parser.lua b/tests/lua-factory/data/test-source-xml-parser.lua
index 58a90c6..e78c347 100644
--- a/tests/lua-factory/data/test-source-xml-parser.lua
+++ b/tests/lua-factory/data/test-source-xml-parser.lua
@@ -41,25 +41,24 @@ source = {
 -- Handlers of Grilo functions --
 ---------------------------------
 
-function grl_source_resolve()
+function grl_source_resolve(media, options, callback)
   -- This source expects an url which will be fetched and converted
   -- to a table using grl.lua.xml.string_to_table().
-  local req = grl.get_media_keys()
-  if not req or not req.url or #req.url ~= 2 then
+  if not media or not media.url or #media.url ~= 2 then
     grl.warning("resolve was called without metadata-key url")
-    grl.callback()
+    callback()
     return
   end
-
-  grl.fetch(req.url, "fetch_url_cb")
+  local userdata = {callback = callback, media = media}
+  grl.fetch(media.url, fetch_url_cb, userdata)
 end
 
 -- feeds[1] is the xml to test
 -- feeds[2] is a lua table with this xml, to compare
-function fetch_url_cb(feeds)
+function fetch_url_cb(feeds, userdata)
   if not feeds or #feeds ~= 2 then
     grl.warning("failed to load xml")
-    grl.callback()
+    userdata.callback()
     return
   end
 
@@ -67,7 +66,7 @@ function fetch_url_cb(feeds)
   local ref = load(feeds[2])()
   if not xml or not ref then
     grl.warning ("xml parser failed")
-    grl.callback()
+    userdata.callback()
     return
   end
 
@@ -76,12 +75,12 @@ function fetch_url_cb(feeds)
     grl.warning("xml parser failed, results are not the same\n" ..
                 "reference table of test:\n" .. grl.lua.inspect(ref) .. "\n" ..
                 "table from xml parser:\n" .. grl.lua.inspect(xml))
-    grl.callback()
+    userdata.callback()
     return
   end
 
   local media = { id = "success" }
-  grl.callback(media, 0)
+  userdata.callback(media, 0)
 end
 
 function test_table_contains(t, e)