Merge pull request #463 from strawd/concurrent-requests

[mono.git] / mcs / class / System.Net.Http / Test / System.Net.Http / HttpClientTest.cs

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
index e9c0c5d3ed08379c004c4feec2ac73dfb5d899e3..510a2d63d45122db80bf3d145cbcc953051b807f 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
@@ -249,7 +249,7 @@ namespace MonoTests.System.Net.Http
 
                        var httpClient = new HttpClient (handler) {
                                BaseAddress = new Uri ("https://google.com"),
-                               Timeout = TimeSpan.FromSeconds (1)
+                               Timeout = TimeSpan.FromMilliseconds (1)
                        };
 
                        try {
@@ -315,6 +315,24 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (response, client.SendAsync (request).Result, "#1");
                }
 
+               [Test]
+               public void Send_BaseAddress ()
+               {
+                       var mh = new HttpMessageHandlerMock ();
+
+                       var client = new HttpClient (mh);
+                       client.BaseAddress = new Uri ("http://localhost/");
+                       var response = new HttpResponseMessage ();
+
+                       mh.OnSend = l => {
+                               Assert.AreEqual ("http://localhost/relative", l.RequestUri.ToString (), "#2");
+                               return Task.FromResult (response);
+                       };
+
+                       Assert.AreEqual (response, client.GetAsync ("relative").Result, "#1");
+                       Assert.AreEqual (response, client.GetAsync ("/relative").Result, "#2");
+               }
+
                [Test]
                public void Send_DefaultRequestHeaders ()
                {
@@ -554,6 +572,130 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
+               [Test]
+               public void Send_Complete_CustomHeaders_SpecialSeparators ()
+               {
+                       bool? failed = null;
+
+                       var listener = CreateListener (l => {
+                               var request = l.Request;
+
+                               try {
+                                       Assert.AreEqual ("MLK Android Phone 1.1.9", request.UserAgent, "#1");
+                                       failed = false;
+                               } catch {
+                                       failed = true;
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+
+                               client.DefaultRequestHeaders.Add("User-Agent", "MLK Android Phone 1.1.9");
+
+                               var request = new HttpRequestMessage (HttpMethod.Get, LocalServer);
+
+                               var response = client.SendAsync (request, HttpCompletionOption.ResponseHeadersRead).Result;
+
+                               Assert.AreEqual ("", response.Content.ReadAsStringAsync ().Result, "#100");
+                               Assert.AreEqual (HttpStatusCode.OK, response.StatusCode, "#101");
+                               Assert.AreEqual (false, failed, "#102");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
+               }
+
+               [Test]
+               public void Send_Complete_CustomHeaders_Host ()
+               {
+                       bool? failed = null;
+                       var listener = CreateListener (l => {
+                               var request = l.Request;
+
+                               try {
+                                       Assert.AreEqual ("customhost", request.Headers["Host"], "#1");
+                                       failed = false;
+                               } catch {
+                                       failed = true;
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+
+                               client.DefaultRequestHeaders.Add("Host", "customhost");
+
+                               var request = new HttpRequestMessage (HttpMethod.Get, LocalServer);
+
+                               var response = client.SendAsync (request, HttpCompletionOption.ResponseHeadersRead).Result;
+
+                               Assert.AreEqual ("", response.Content.ReadAsStringAsync ().Result, "#100");
+                               Assert.AreEqual (HttpStatusCode.OK, response.StatusCode, "#101");
+                               Assert.AreEqual (false, failed, "#102");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
+               }
+
+               [Test]
+               public void Send_Transfer_Encoding_Chunked ()
+               {
+                       bool? failed = null;
+
+                       var listener = CreateListener (l => {
+                               var request = l.Request;
+
+                               try {
+                                       Assert.AreEqual (1, request.Headers.Count, "#1");
+                                       failed = false;
+                               } catch {
+                                       failed = true;
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+                               client.DefaultRequestHeaders.TransferEncodingChunked = true;
+
+                               client.GetAsync (LocalServer).Wait ();
+
+                               Assert.AreEqual (false, failed, "#102");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
+               }
+
+               [Test]
+               public void Send_Transfer_Encoding_Custom ()
+               {
+                       bool? failed = null;
+
+                       var listener = CreateListener (l => {
+                               failed = true;
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+                               client.DefaultRequestHeaders.TransferEncoding.Add (new TransferCodingHeaderValue ("chunked2"));
+
+                               var request = new HttpRequestMessage (HttpMethod.Get, LocalServer);
+
+                               try {
+                                       client.SendAsync (request, HttpCompletionOption.ResponseHeadersRead).Wait ();
+                                       Assert.Fail ("#1");
+                               } catch (AggregateException e) {
+                                       Assert.AreEqual (typeof (ProtocolViolationException), e.InnerException.GetType (), "#2");
+                               }
+                               Assert.IsNull (failed, "#102");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
+               }
+
                [Test]
                public void Send_Complete_Content ()
                {
@@ -748,7 +890,7 @@ namespace MonoTests.System.Net.Http
                                listener.Close ();
                        }
                }
-*/
+
                [Test]
                public void Send_Content_Put_CustomStream ()
                {
@@ -850,17 +992,6 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
-               [Test]
-               public void GetString_RelativeUri ()
-               {
-                       var client = new HttpClient ();
-                       client.BaseAddress = new Uri ("http://en.wikipedia.org/wiki/");
-                       var uri = new Uri ("Computer", UriKind.Relative);
-
-                       Assert.That (client.GetStringAsync (uri).Result != null);
-                       Assert.That (client.GetStringAsync ("Computer").Result != null);
-               }
-
                [Test]
                [Category ("MobileNotWorking")] // Missing encoding
                public void GetString_Many ()