huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix breaks from GetFormAsync, IReadableStringCollection.Keys.

This commit is contained in:
Chris Ross 2014-06-26 10:56:56 -07:00
parent e6ec6e0aba
commit 1d3e6b0dd0
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/FormValueProviderFactory.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
if (IsSupportedContentType(request)) if (IsSupportedContentType(request))
{ {
var culture = GetCultureInfo(request); var culture = GetCultureInfo(request);
return new ReadableStringCollectionValueProvider(request.GetFormAsync, culture); return new ReadableStringCollectionValueProvider(() => request.GetFormAsync(), culture);
} }
return null; return null;

4
src/Microsoft.AspNet.Mvc.ModelBinding/ValueProviders/ReadableStringCollectionValueProvider.cs
View File

@ -96,10 +96,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
if (_prefixContainer == null) if (_prefixContainer == null)
{ {
// Initialization race is OK providing data remains read-only and object identity is not significant // Initialization race is OK providing data remains read-only and object identity is not significant
// TODO: Fix this once https://github.com/aspnet/HttpAbstractions/issues/3 is sorted out.
var collection = await GetValueCollectionAsync(); var collection = await GetValueCollectionAsync();
_prefixContainer = new PrefixContainer(collection.Select(v => v.Key).ToArray()); _prefixContainer = new PrefixContainer(collection.Keys);
} }
return _prefixContainer; return _prefixContainer;
} }

7
test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/AntiForgeryTokenStoreTest.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Moq; using Moq;
@ -125,7 +126,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test
var requestContext = new Mock<HttpRequest>(); var requestContext = new Mock<HttpRequest>();
IReadableStringCollection formsCollection = IReadableStringCollection formsCollection =
new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", string.Empty } }); new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", string.Empty } });
requestContext.Setup(o => o.GetFormAsync()) requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
.Returns(Task.FromResult(formsCollection)); .Returns(Task.FromResult(formsCollection));
mockHttpContext.Setup(o => o.Request) mockHttpContext.Setup(o => o.Request)
.Returns(requestContext.Object); .Returns(requestContext.Object);
@ -154,7 +155,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test
new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "invalid-value" } }); new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "invalid-value" } });
var requestContext = new Mock<HttpRequest>(); var requestContext = new Mock<HttpRequest>();
requestContext.Setup(o => o.GetFormAsync()) requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
.Returns(Task.FromResult(formsCollection)); .Returns(Task.FromResult(formsCollection));
var mockHttpContext = new Mock<HttpContext>(); var mockHttpContext = new Mock<HttpContext>();
@ -194,7 +195,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test
var requestContext = new Mock<HttpRequest>(); var requestContext = new Mock<HttpRequest>();
IReadableStringCollection formsCollection = IReadableStringCollection formsCollection =
new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "valid-value" } }); new MockCookieCollection(new Dictionary<string, string>() { { "form-field-name", "valid-value" } });
requestContext.Setup(o => o.GetFormAsync()) requestContext.Setup(o => o.GetFormAsync(CancellationToken.None))
.Returns(Task.FromResult(formsCollection)); .Returns(Task.FromResult(formsCollection));
mockHttpContext.Setup(o => o.Request) mockHttpContext.Setup(o => o.Request)
.Returns(requestContext.Object); .Returns(requestContext.Object);