Merge pull request #2020 from tomjepp/master

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

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
index 413e459526e155331dd378ae912f78f61e99554e..e56094741263210f94b21d56a8bb6093ffb410ff 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
@@ -36,6 +36,7 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Net;
 using System.Linq;
+using System.Text;
 
 namespace MonoTests.System.Net.Http
 {
@@ -90,6 +91,20 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
+               class CannotSeekStream : MemoryStream
+               {
+                       public CannotSeekStream ()
+                               : base (new byte [11])
+                       {
+                       }
+
+                       public override bool CanSeek {
+                               get {
+                                       return false;
+                               }
+                       }
+               }
+
                [Test]
                public void Ctor_Invalid ()
                {
@@ -146,7 +161,7 @@ namespace MonoTests.System.Net.Http
                 * The .NET runtime hits the "#9" assertion.
                 * The test succeeds with Mono.
                 */
-               [Category ("NotWorking")]
+               [Category ("NotDotNet")]
                public void CopyToAsync ()
                {
                        var ms = new MemoryStream ();
@@ -208,6 +223,7 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (330, scm.Headers.ContentLength, "#2");
 
                        headers.Allow.Add ("a1");
+                       headers.ContentDisposition = new ContentDispositionHeaderValue ("cd1");
                        headers.ContentEncoding.Add ("ce1");
                        headers.ContentLanguage.Add ("cl1");
                        headers.ContentLength = 23;
@@ -220,6 +236,12 @@ namespace MonoTests.System.Net.Http
 
 
                        headers.Add ("allow", "a2");
+                       try {
+                               headers.Add ("content-disposition", "cd2");
+                               Assert.Fail ("content-disposition");
+                       } catch (FormatException) {
+                       }
+
                        headers.Add ("content-encoding", "ce3");
                        headers.Add ("content-language", "cl2");
 
@@ -293,6 +315,26 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (new MediaTypeHeaderValue ("multipart/*"), headers.ContentType);
                        Assert.AreEqual (new DateTimeOffset (DateTime.Today), headers.Expires);
                        Assert.AreEqual (new DateTimeOffset (DateTime.Today), headers.LastModified);
+                       Assert.AreEqual (new ContentDispositionHeaderValue ("cd1"), headers.ContentDisposition);
+               }
+
+               [Test]
+               public void Headers_ToString ()
+               {
+                       var sc = new StreamContent (new MemoryStream ());
+                       var headers = sc.Headers;
+                       headers.ContentMD5 = new byte[] { 3, 5 };
+
+                       Assert.AreEqual ("Content-MD5: AwU=\r\n", headers.ToString (), "#1");
+               }
+
+               [Test]
+               public void Headers_ContentLength ()
+               {
+                       var content = new StreamContent (new MemoryStream (Encoding.UTF8.GetBytes ("test")));
+                       Assert.AreEqual ("", content.Headers.ToString ());
+                       var length = content.Headers.ContentLength;
+                       Assert.AreEqual ("Content-Length: 4\r\n", content.Headers.ToString ());
                }
 
                [Test]
@@ -407,5 +449,13 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (0, stream_read.Position, "#3");        
                        Assert.AreEqual (1, stream_read.Length, "#4");
                }
+
+               [Test]
+               public void ContentLengthAfterLoad ()
+               {
+                       var sc = new StreamContent (new CannotSeekStream ());
+                       Assert.IsTrue (sc.LoadIntoBufferAsync ().Wait (3000), "#1");
+                       Assert.AreEqual (11, sc.Headers.ContentLength, "#2");
+               }
        }
 }