From: Jens Georg <jensg@openismus.com>
Date: Wed, 2 Oct 2013 11:36:12 +0000 (+0200)
Subject: tests: Also use new libsoup vapi
X-Git-Tag: RYGEL_0_21_0~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a6dc8261683c933aac46b5ebbab44ad1ddcc2c3;p=profile%2Fivi%2Frygel.git

tests: Also use new libsoup vapi
---

diff --git a/tests/rygel-http-get-test.vala b/tests/rygel-http-get-test.vala
index 09ea964..3893e08 100644
--- a/tests/rygel-http-get-test.vala
+++ b/tests/rygel-http-get-test.vala
@@ -53,10 +53,10 @@ public class Rygel.ClientHacks {
 
 public class Rygel.TestRequestFactory {
     public Soup.Message msg;
-    public Soup.KnownStatusCode expected_code;
+    public Soup.Status expected_code;
 
     public TestRequestFactory (Soup.Message msg,
-                               Soup.KnownStatusCode expected_code) {
+                               Soup.Status expected_code) {
         this.msg = msg;
         this.expected_code = expected_code;
     }
@@ -132,66 +132,66 @@ public class Rygel.HTTPGetTest : GLib.Object {
 
         Soup.Message request = new Soup.Message ("POST", this.server.uri);
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.BAD_REQUEST));
+                      Soup.Status.BAD_REQUEST));
 
         request = new Soup.Message ("HEAD", this.server.uri);
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
 
         request = new Soup.Message ("GET", this.server.uri);
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
 
         string uri = this.server.create_uri ("VideoItem");
         uri = uri + "/tr/MP3";
         request = new Soup.Message ("HEAD", uri);
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("transferMode.dlna.org", "Streaming");
-        requests.add (new TestRequestFactory (request, Soup.KnownStatusCode.OK));
+        requests.add (new TestRequestFactory (request, Soup.Status.OK));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("transferMode.dlna.org", "Interactive");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.NOT_ACCEPTABLE));
+                      Soup.Status.NOT_ACCEPTABLE));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("Range", "bytes=1-2");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.OK));
+                      Soup.Status.OK));
 
         uri = this.server.create_uri ("AudioItem");
         uri = uri + "/th/0";
 
         request = new Soup.Message ("GET", uri);
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.NOT_FOUND));
+                      Soup.Status.NOT_FOUND));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("TimeSeekRange.dlna.org", "0");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.NOT_ACCEPTABLE));
+                      Soup.Status.NOT_ACCEPTABLE));
 
         uri = this.server.create_uri ("AudioItem");
         request = new Soup.Message ("GET", uri);
         request.request_headers.append ("TimeSeekRange.dlna.org", "0");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.BAD_REQUEST));
+                      Soup.Status.BAD_REQUEST));
 
         uri = this.server.create_uri ("AudioItem");
         request = new Soup.Message ("GET", uri);
         request.request_headers.append ("TimeSeekRange.dlna.org", "npt=1-2049");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.REQUESTED_RANGE_NOT_SATISFIABLE));
+                      Soup.Status.REQUESTED_RANGE_NOT_SATISFIABLE));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("clienthacks.test.rygel", "f");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.OK));
+                      Soup.Status.OK));
 
         request = new Soup.Message ("GET", this.server.uri);
         request.request_headers.append ("clienthacks.test.rygel", "t");
         requests.add (new TestRequestFactory (request,
-                      Soup.KnownStatusCode.OK));
+                      Soup.Status.OK));
     }
 
     private HTTPGet create_request (Soup.Message msg) throws Error {
@@ -491,7 +491,7 @@ 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 ();
diff --git a/tests/rygel-http-item-uri-test.vala b/tests/rygel-http-item-uri-test.vala
index cfc0f16..6a4ed7a 100644
--- a/tests/rygel-http-item-uri-test.vala
+++ b/tests/rygel-http-item-uri-test.vala
@@ -24,9 +24,9 @@
 using Gee;
 
 private errordomain Rygel.HTTPRequestError {
-    UNACCEPTABLE = Soup.KnownStatusCode.NOT_ACCEPTABLE,
-    BAD_REQUEST = Soup.KnownStatusCode.BAD_REQUEST,
-    NOT_FOUND = Soup.KnownStatusCode.NOT_FOUND
+    UNACCEPTABLE = Soup.Status.NOT_ACCEPTABLE,
+    BAD_REQUEST = Soup.Status.BAD_REQUEST,
+    NOT_FOUND = Soup.Status.NOT_FOUND
 }
 
 private errordomain Rygel.TestError {
@@ -143,7 +143,7 @@ private class Rygel.HTTPItemURITest : GLib.Object {
             var str = this.test_to_string (uri);
             this.test_construction_from_string (str);
         }
-        this.test_error_construction ("/Ttt", Soup.KnownStatusCode.BAD_REQUEST);
+        this.test_error_construction ("/Ttt", Soup.Status.BAD_REQUEST);
     }
 
     private HTTPItemURITest () throws TestError {
@@ -197,7 +197,7 @@ private class Rygel.HTTPItemURITest : GLib.Object {
     }
 
     private void test_error_construction (string str,
-                                          Soup.KnownStatusCode error_code) {
+                                          Soup.Status error_code) {
         try {
             var uri = new HTTPItemURI.from_string (str, this.server);
             assert (uri == null);
diff --git a/tests/rygel-http-post-test.vala b/tests/rygel-http-post-test.vala
index 6949f01..fd92f84 100644
--- 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 {
@@ -480,7 +480,7 @@ 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 ();
diff --git a/tests/rygel-http-response-test.vala b/tests/rygel-http-response-test.vala
index b2bed07..c56230b 100644
--- a/tests/rygel-http-response-test.vala
+++ b/tests/rygel-http-response-test.vala
@@ -29,7 +29,7 @@ public errordomain Rygel.TestError {
 }
 
 public errordomain Rygel.HTTPRequestError {
-    NOT_FOUND = Soup.KnownStatusCode.NOT_FOUND
+    NOT_FOUND = Soup.Status.NOT_FOUND
 }
 
 public class Rygel.HTTPResponseTest : GLib.Object {
@@ -270,7 +270,7 @@ public class Rygel.HTTPClient : GLib.Object, StateMachine {
 
     private void on_cancelled (Cancellable cancellable) {
         this.context.session.cancel_message (this.msg,
-                                             KnownStatusCode.CANCELLED);
+                                             Status.CANCELLED);
         this.completed ();
     }
 }
@@ -323,7 +323,7 @@ public class Rygel.HTTPGet : GLib.Object {
         this.seek = seek;
         this.cancellable = cancellable;
         this.msg.response_headers.set_encoding (Soup.Encoding.EOF);
-        this.msg.set_status (Soup.KnownStatusCode.OK);
+        this.msg.set_status (Soup.Status.OK);
     }
 }