Merge pull request #2020 from tomjepp/master

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

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/ByteArrayContentTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/ByteArrayContentTest.cs
index 410c9a2965e092e715ea9ca5464dcf29b4d097a8..24101a2ce61a1970fba20c187cb162c5fc6c2e79 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/ByteArrayContentTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/ByteArrayContentTest.cs
@@ -30,6 +30,7 @@ using System;
 using NUnit.Framework;
 using System.Net.Http;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace MonoTests.System.Net.Http
 {
@@ -73,47 +74,11 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
-               [Test]
-               public void ContentReadStream ()
-               {
-                       byte[] b = { 4, 2 };
-
-                       var sc = new ByteArrayContent (b);
-                       var s = sc.ContentReadStream;
-                       Assert.AreEqual (4, s.ReadByte (), "#1");
-                       Assert.AreEqual (2, s.ReadByte (), "#2");
-               }
-
                [Test]
                public void CopyTo_Invalid ()
                {
                        var m = new MemoryStream ();
 
-                       var sc = new ByteArrayContent (new byte[0]);
-                       try {
-                               sc.CopyTo (null);
-                               Assert.Fail ("#1");
-                       } catch (ArgumentNullException) {
-                       }
-               }
-
-               [Test]
-               public void CopyTo ()
-               {
-                       byte[] b = { 4, 2 };
-
-                       var sc = new ByteArrayContent (b);
-
-                       var dest = new MemoryStream ();
-                       sc.CopyTo (dest);
-                       Assert.AreEqual (2, dest.Length, "#1");
-
-                       sc.CopyTo (dest, null);
-               }
-
-               [Test]
-               public void CopyToAsync_Invalid ()
-               {
                        var sc = new ByteArrayContent (new byte[0]);
                        try {
                                sc.CopyToAsync (null);
@@ -131,42 +96,43 @@ namespace MonoTests.System.Net.Http
 
                        var dest = new MemoryStream ();
                        var task = sc.CopyToAsync (dest);
-                       task.Wait ();
+                       Assert.IsTrue (task.Wait (500));
                        Assert.AreEqual (2, dest.Length, "#1");
                }
 
                [Test]
-               public void LoadIntoBuffer ()
+               public void LoadIntoBufferAsync ()
                {
                        byte[] b = { 4 };
 
                        var sc = new ByteArrayContent (b);
-                       sc.LoadIntoBuffer (400);
+                       var t = sc.LoadIntoBufferAsync (400);
+                       Assert.IsTrue (t.Wait (500));
                }
 
                [Test]
-               public void ReadAsByteArray ()
+               public void ReadAsByteArrayAsync ()
                {
                        byte[] b = { 4, 55 };
 
                        var sc = new ByteArrayContent (b, 1, 1);
-                       var res = sc.ReadAsByteArray ();
+                       var res = sc.ReadAsByteArrayAsync ().Result;
                        Assert.AreEqual (1, res.Length, "#1");
                        Assert.AreEqual (55, res[0], "#2");
 
                        sc = new ByteArrayContent (b);
-                       res = sc.ReadAsByteArray ();
+                       res = sc.ReadAsByteArrayAsync ().Result;
                        Assert.AreEqual (2, res.Length, "#10");
                        Assert.AreEqual (55, res[1], "#11");
                }
 
                [Test]
-               public void ReadAsString ()
+               public void ReadAsStringAsync ()
                {
                        byte[] b = { 77, 55 };
 
                        var sc = new ByteArrayContent (b);
-                       var res = sc.ReadAsString ();
+                       var res = sc.ReadAsStringAsync ().Result;
                        Assert.AreEqual ("M7", res, "#1");
                }
        }