Merge pull request #2698 from esdrubal/iosxmlarray

[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 510a2d63d45122db80bf3d145cbcc953051b807f..4d9265a6ac76f8e3640e82e2e75e1fa6189b8ee6 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
@@ -152,15 +152,16 @@ namespace MonoTests.System.Net.Http
 
                const int WaitTimeout = 5000;
 
-               string port, TestHost, LocalServer;
+               string TestHost, LocalServer;
+               int port;
 
                [SetUp]
                public void SetupFixture ()
                {
                        if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
-                               port = "810";
+                               port = 810;
                        } else {
-                               port = "8810";
+                               port = 8810;
                        }
 
                        TestHost = "localhost:" + port;
@@ -996,10 +997,30 @@ namespace MonoTests.System.Net.Http
                [Category ("MobileNotWorking")] // Missing encoding
                public void GetString_Many ()
                {
-                       var client = new HttpClient ();
-                       var t1 = client.GetStringAsync ("http://www.google.com");
-                       var t2 = client.GetStringAsync ("http://www.google.com");
-                       Assert.IsTrue (Task.WaitAll (new [] { t1, t2 }, WaitTimeout));          
+                       Action<HttpListenerContext> context = (HttpListenerContext l) => {
+                               var response = l.Response;
+                               response.StatusCode = 200;
+                               response.OutputStream.WriteByte (0x68);
+                               response.OutputStream.WriteByte (0x65);
+                               response.OutputStream.WriteByte (0x6c);
+                               response.OutputStream.WriteByte (0x6c);
+                               response.OutputStream.WriteByte (0x6f);
+                       };
+
+                       var listener = CreateListener (context); // creates a default request handler
+                       AddListenerContext (listener, context);  // add another request handler for the second request
+
+                       try {
+                               var client = new HttpClient ();
+                               var t1 = client.GetStringAsync (LocalServer);
+                               var t2 = client.GetStringAsync (LocalServer);
+                               Assert.IsTrue (Task.WaitAll (new [] { t1, t2 }, WaitTimeout));
+                               Assert.AreEqual ("hello", t1.Result, "#1");
+                               Assert.AreEqual ("hello", t2.Result, "#2");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
                }
 
                [Test]
@@ -1060,9 +1081,20 @@ namespace MonoTests.System.Net.Http
                                var response = l.Response;
 
                                response.StatusCode = (int)HttpStatusCode.Moved;
-                               response.RedirectLocation = "http://xamarin.com/";
+                               response.RedirectLocation = "http://localhost:8811/";
                        });
 
+                       var listener2 = CreateListener (l => {
+                               var response = l.Response;
+
+                               response.StatusCode = (int)HttpStatusCode.OK;
+                               response.OutputStream.WriteByte (0x68);
+                               response.OutputStream.WriteByte (0x65);
+                               response.OutputStream.WriteByte (0x6c);
+                               response.OutputStream.WriteByte (0x6c);
+                               response.OutputStream.WriteByte (0x6f);
+                       }, 8811);
+
                        try {
                                var chandler = new HttpClientHandler ();
                                chandler.AllowAutoRedirect = true;
@@ -1071,10 +1103,13 @@ namespace MonoTests.System.Net.Http
                                var r = client.GetAsync (LocalServer);
                                Assert.IsTrue (r.Wait (WaitTimeout), "#1");
                                var resp = r.Result;
-                               Assert.AreEqual ("http://xamarin.com/", resp.RequestMessage.RequestUri.AbsoluteUri, "#2");
+                               Assert.AreEqual ("http://localhost:8811/", resp.RequestMessage.RequestUri.AbsoluteUri, "#2");
+                               Assert.AreEqual ("hello", resp.Content.ReadAsStringAsync ().Result, "#3");
                        } finally {
                                listener.Abort ();
                                listener.Close ();
+                               listener2.Abort ();
+                               listener2.Close ();
                        }
                }
 
@@ -1131,10 +1166,22 @@ namespace MonoTests.System.Net.Http
                }
 
                HttpListener CreateListener (Action<HttpListenerContext> contextAssert)
+               {
+                       return CreateListener (contextAssert, port);
+               }
+
+               HttpListener CreateListener (Action<HttpListenerContext> contextAssert, int port)
                {
                        var l = new HttpListener ();
                        l.Prefixes.Add (string.Format ("http://+:{0}/", port));
                        l.Start ();
+                       AddListenerContext(l, contextAssert);
+
+                       return l;
+               }
+
+               HttpListener AddListenerContext (HttpListener l, Action<HttpListenerContext> contextAssert)
+               {
                        l.BeginGetContext (ar => {
                                var ctx = l.EndGetContext (ar);