HttpMessageHandlerMock に同期的なデリゲートを受け付けられるように修正

diff --git a/OpenTween.Tests/HttpMessageHandlerMock.cs b/OpenTween.Tests/HttpMessageHandlerMock.cs
index 6be327b..f93ec26 100644 (file)
--- a/OpenTween.Tests/HttpMessageHandlerMock.cs
+++ b/OpenTween.Tests/HttpMessageHandlerMock.cs
@@ -31,9 +31,19 @@ namespace OpenTween
 {
     public class HttpMessageHandlerMock : HttpMessageHandler
     {
-        public readonly Queue<Func<HttpRequestMessage, Task<HttpResponseMessage>>> Queue =
+        private readonly Queue<Func<HttpRequestMessage, Task<HttpResponseMessage>>> Queue =
             new Queue<Func<HttpRequestMessage, Task<HttpResponseMessage>>>();
 
+        public void Enqueue(Func<HttpRequestMessage, Task<HttpResponseMessage>> handler)
+        {
+            this.Queue.Enqueue(handler);
+        }
+
+        public void Enqueue(Func<HttpRequestMessage, HttpResponseMessage> handler)
+        {
+            this.Queue.Enqueue(x => Task.FromResult(handler(x)));
+        }
+
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             var handler = this.Queue.Dequeue();

diff --git a/OpenTween.Tests/ShortUrlTest.cs b/OpenTween.Tests/ShortUrlTest.cs
index 4b12b7e..a4e34f3 100644 (file)
--- a/OpenTween.Tests/ShortUrlTest.cs
+++ b/OpenTween.Tests/ShortUrlTest.cs
@@ -30,8 +30,6 @@ using System.Threading.Tasks;
 using Xunit;
 using Xunit.Extensions;
 
-#pragma warning disable 1998 // awaitが無いasyncラムダ式に対する警告を抑制
-
 namespace OpenTween
 {
     public class ShortUrlTest
@@ -43,7 +41,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://example.com/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -64,7 +62,7 @@ namespace OpenTween
             shortUrl.DisableExpanding = true;
 
             // http://t.co/hoge1 -> http://example.com/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 // このリクエストは実行されないはず
                 Assert.True(false);
@@ -82,7 +80,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://bit.ly/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -91,7 +89,7 @@ namespace OpenTween
             });
 
             // http://bit.ly/hoge2 -> http://example.com/hoge3
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://bit.ly/hoge2"), x.RequestUri);
@@ -110,7 +108,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://bit.ly/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -119,7 +117,7 @@ namespace OpenTween
             });
 
             // http://bit.ly/hoge2 -> http://tinyurl.com/hoge3
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://bit.ly/hoge2"), x.RequestUri);
@@ -128,7 +126,7 @@ namespace OpenTween
             });
 
             // http://tinyurl.com/hoge3 -> http://example.com/hoge4
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 // このリクエストは実行されないはず
                 Assert.True(false);
@@ -146,7 +144,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://example.com/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -165,7 +163,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://example.com/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -184,7 +182,7 @@ namespace OpenTween
             var handler = new HttpMessageHandlerMock();
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 // リクエストは送信されないはず
                 Assert.True(false);
@@ -202,7 +200,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> 503 Service Unavailable
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 return new HttpResponseMessage(HttpStatusCode.ServiceUnavailable);
             });
@@ -218,7 +216,7 @@ namespace OpenTween
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
             // http://t.co/hoge1 -> http://example.com/hoge2
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Head, x.Method);
                 Assert.Equal(new Uri("http://t.co/hoge1"), x.RequestUri);
@@ -243,7 +241,7 @@ namespace OpenTween
             var handler = new HttpMessageHandlerMock();
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(async x =>
             {
                 Assert.Equal(HttpMethod.Post, x.Method);
                 Assert.Equal(new Uri("http://tinyurl.com/api-create.php"), x.RequestUri);
@@ -265,7 +263,7 @@ namespace OpenTween
             var handler = new HttpMessageHandlerMock();
             var shortUrl = new ShortUrl(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Get, x.Method);
                 Assert.Equal("http://ux.nu/api/short?format=plain&url=http://example.com/hogehoge",

diff --git a/OpenTween.Tests/Thumbnail/Services/FoursquareCheckinTest.cs b/OpenTween.Tests/Thumbnail/Services/FoursquareCheckinTest.cs
index 82d6ea1..4495e06 100644 (file)
--- a/OpenTween.Tests/Thumbnail/Services/FoursquareCheckinTest.cs
+++ b/OpenTween.Tests/Thumbnail/Services/FoursquareCheckinTest.cs
@@ -34,8 +34,6 @@ using NSubstitute;
 using Xunit;
 using Xunit.Extensions;
 
-#pragma warning disable 1998 // awaitが無いasyncラムダ式に対する警告を抑制
-
 namespace OpenTween.Thumbnail.Services
 {
     public class FoursquareCheckinTest
@@ -60,7 +58,7 @@ namespace OpenTween.Thumbnail.Services
             var handler = new HttpMessageHandlerMock();
             var service = new FoursquareCheckin(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Get, x.Method);
                 Assert.Equal("https://api.foursquare.com/v2/checkins/xxxxxxxx",
@@ -93,7 +91,7 @@ namespace OpenTween.Thumbnail.Services
             var handler = new HttpMessageHandlerMock();
             var service = new FoursquareCheckin(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 Assert.Equal(HttpMethod.Get, x.Method);
                 Assert.Equal("https://api.foursquare.com/v2/checkins/xxxxxxxx",
@@ -126,7 +124,7 @@ namespace OpenTween.Thumbnail.Services
             var handler = new HttpMessageHandlerMock();
             var service = new FoursquareCheckin(new HttpClient(handler));
 
-            handler.Queue.Enqueue(async x =>
+            handler.Enqueue(x =>
             {
                 // このリクエストは実行されないはず
                 Assert.True(false);