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

React to StringSegment changes

This commit is contained in:
Chris R 2017-05-19 14:09:31 -07:00
parent 3c7a2dc847
commit 53c56f558b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
View File

@ -185,7 +185,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
for (var i = 0; i < acceptValues.Count; i++) for (var i = 0; i < acceptValues.Count; i++)
{ {
var charset = acceptValues[i].Value; var charset = acceptValues[i].Value;
if (!string.IsNullOrEmpty(charset)) if (!StringSegment.IsNullOrEmpty(charset))
{ {
for (var j = 0; j < SupportedEncodings.Count; j++) for (var j = 0; j < SupportedEncodings.Count; j++)
{ {

2
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
View File

@ -477,7 +477,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
var headers = new HeaderDictionary(); var headers = new HeaderDictionary();
request.Setup(r => r.ContentType).Returns(contentType.ToString()); request.Setup(r => r.ContentType).Returns(contentType.ToString());
request.SetupGet(r => r.Headers).Returns(headers); request.SetupGet(r => r.Headers).Returns(headers);
headers[HeaderNames.AcceptCharset] = contentType.Charset; headers[HeaderNames.AcceptCharset] = contentType.Charset.ToString();
var response = new Mock<HttpResponse>(); var response = new Mock<HttpResponse>();
response.SetupGet(f => f.Body).Returns(responseStream ?? new MemoryStream()); response.SetupGet(f => f.Body).Returns(responseStream ?? new MemoryStream());
var httpContext = new Mock<HttpContext>(); var httpContext = new Mock<HttpContext>();

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
View File

@ -645,7 +645,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
var request = new Mock<HttpRequest>(); var request = new Mock<HttpRequest>();
var headers = new HeaderDictionary(); var headers = new HeaderDictionary();
headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset; headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset.ToString();
request.Setup(r => r.ContentType).Returns(contentType); request.Setup(r => r.ContentType).Returns(contentType);
request.SetupGet(r => r.Headers).Returns(headers); request.SetupGet(r => r.Headers).Returns(headers);

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
View File

@ -406,7 +406,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
var request = new Mock<HttpRequest>(); var request = new Mock<HttpRequest>();
var headers = new HeaderDictionary(); var headers = new HeaderDictionary();
headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset; headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset.ToString();
request.Setup(r => r.ContentType).Returns(contentType); request.Setup(r => r.ContentType).Returns(contentType);
request.SetupGet(r => r.Headers).Returns(headers); request.SetupGet(r => r.Headers).Returns(headers);

12
test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
View File

@ -53,9 +53,9 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
.Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue)); .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue));
foreach (var cookieTempDataProviderCookie in cookieTempDataProviderCookies) foreach (var cookieTempDataProviderCookie in cookieTempDataProviderCookies)
{ {
Assert.NotNull(cookieTempDataProviderCookie.Value); Assert.NotNull(cookieTempDataProviderCookie.Value.Value);
Assert.Equal("/", cookieTempDataProviderCookie.Path); Assert.Equal("/", cookieTempDataProviderCookie.Path);
Assert.Null(cookieTempDataProviderCookie.Domain); Assert.Null(cookieTempDataProviderCookie.Domain.Value);
Assert.False(cookieTempDataProviderCookie.Secure); Assert.False(cookieTempDataProviderCookie.Secure);
} }
@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.NotNull(setCookieHeaderValue); Assert.NotNull(setCookieHeaderValue);
Assert.Equal(string.Empty, setCookieHeaderValue.Value); Assert.Equal(string.Empty, setCookieHeaderValue.Value);
Assert.Equal("/", setCookieHeaderValue.Path); Assert.Equal("/", setCookieHeaderValue.Path);
Assert.Null(setCookieHeaderValue.Domain); Assert.Null(setCookieHeaderValue.Domain.Value);
Assert.NotNull(setCookieHeaderValue.Expires); Assert.NotNull(setCookieHeaderValue.Expires);
Assert.True(setCookieHeaderValue.Expires < DateTimeOffset.Now); // expired cookie Assert.True(setCookieHeaderValue.Expires < DateTimeOffset.Now); // expired cookie
@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
.FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName); .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
Assert.NotNull(setCookieHeader); Assert.NotNull(setCookieHeader);
Assert.Equal("/", setCookieHeader.Path); Assert.Equal("/", setCookieHeader.Path);
Assert.Null(setCookieHeader.Domain); Assert.Null(setCookieHeader.Domain.Value);
Assert.False(setCookieHeader.Secure); Assert.False(setCookieHeader.Secure);
Assert.Null(setCookieHeader.Expires); Assert.Null(setCookieHeader.Expires);
@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.NotNull(setCookieHeader); Assert.NotNull(setCookieHeader);
Assert.Equal(string.Empty, setCookieHeader.Value); Assert.Equal(string.Empty, setCookieHeader.Value);
Assert.Equal("/", setCookieHeader.Path); Assert.Equal("/", setCookieHeader.Path);
Assert.Null(setCookieHeader.Domain); Assert.Null(setCookieHeader.Domain.Value);
Assert.NotNull(setCookieHeader.Expires); Assert.NotNull(setCookieHeader.Expires);
Assert.True(setCookieHeader.Expires < DateTimeOffset.Now); // expired cookie Assert.True(setCookieHeader.Expires < DateTimeOffset.Now); // expired cookie
} }
@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
.FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName); .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
Assert.NotNull(setCookieHeader); Assert.NotNull(setCookieHeader);
Assert.Equal("/", setCookieHeader.Path); Assert.Equal("/", setCookieHeader.Path);
Assert.Null(setCookieHeader.Domain); Assert.Null(setCookieHeader.Domain.Value);
Assert.Equal(secureRequest, setCookieHeader.Secure); Assert.Equal(secureRequest, setCookieHeader.Secure);
Assert.Null(setCookieHeader.Expires); Assert.Null(setCookieHeader.Expires);
} }