tests: Also use new libsoup vapi

[profile/ivi/rygel.git] / tests / rygel-http-post-test.vala

diff --git a/tests/rygel-http-post-test.vala b/tests/rygel-http-post-test.vala
index af8acdd..fd92f84 100644 (file)
--- a/tests/rygel-http-post-test.vala
+++ b/tests/rygel-http-post-test.vala
@@ -44,11 +44,11 @@ public class Rygel.ClientHacks {
 
 public class Rygel.TestRequestFactory {
     public Soup.Message msg;
-    public Soup.KnownStatusCode? expected_code;
+    public Soup.Status? expected_code;
     public bool cancel;
 
     public TestRequestFactory (Soup.Message msg,
-                               Soup.KnownStatusCode? expected_code,
+                               Soup.Status? expected_code,
                                bool cancel = false) {
         this.msg = msg;
         this.expected_code = expected_code;
@@ -122,29 +122,29 @@ public class Rygel.HTTPPostTest : GLib.Object {
         requests = new ArrayList<TestRequestFactory> ();
 
         var request = new Soup.Message ("POST", this.server.uri);
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
 
         request = new Soup.Message ("POST", this.server.uri);
         requests.add (new TestRequestFactory (request,
-                                             Soup.KnownStatusCode.NOT_FOUND));
+                                             Soup.Status.NOT_FOUND));
 
         request = new Soup.Message ("POST", this.server.create_uri ("NullItem"));
         requests.add (new TestRequestFactory (request,
-                                              Soup.KnownStatusCode.BAD_REQUEST));
+                                              Soup.Status.BAD_REQUEST));
 
         request = new Soup.Message ("POST",
                                     this.server.create_uri ("ErrorItem"));
         requests.add (new TestRequestFactory (request,
-                                              Soup.KnownStatusCode.OK));
+                                              Soup.Status.OK));
 
         request = new Soup.Message ("POST",
                                     this.server.create_uri ("CancelItem"));
         requests.add (new TestRequestFactory (request,
-                                              Soup.KnownStatusCode.OK, true));
+                                              Soup.Status.OK, true));
 
         request = new Soup.Message ("POST",
                                     this.server.create_uri ("VanishingItem"));
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
     }
 
     private HTTPRequest create_request (Soup.Message msg) throws Error {
@@ -353,7 +353,12 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
         this.error = false;
         this.id = "TesContainer";
 
-        this.monitor = this.file.monitor_file (FileMonitorFlags.NONE);
+        try {
+            this.monitor = this.file.monitor_file (FileMonitorFlags.NONE);
+        } catch (GLib.Error error) {
+            assert_not_reached ();
+        }
+
         this.monitor.changed.connect (this.on_file_changed);
     }
 
@@ -475,23 +480,23 @@ internal class Rygel.HTTPResponse : Rygel.StateMachine, GLib.Object {
 
         yield;
 
-        this.msg.set_status (Soup.KnownStatusCode.OK);
+        this.msg.set_status (Soup.Status.OK);
         this.server.unpause_message (msg);
 
         this.completed ();
     }
 }
 
-public class Rygel.ItemRemovalQueue: GLib.Object {
-    public static ItemRemovalQueue get_default () {
-       return new ItemRemovalQueue ();
+public class Rygel.ObjectRemovalQueue: GLib.Object {
+    public static ObjectRemovalQueue get_default () {
+       return new ObjectRemovalQueue ();
     }
 
-    public bool dequeue (MediaItem item) {
+    public bool dequeue (MediaObject item) {
         return true;
     }
 
-    public async void remove_now (MediaItem item, Cancellable? cancellable) {
+    public async void remove_now (MediaObject item, Cancellable? cancellable) {
         Idle.add (remove_now.callback);
 
         yield;