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

Address feedback

This commit is contained in:
hishamco 2017-08-31 00:13:05 +03:00 committed by Pranav K
parent 9d0ad91f63
commit 8b03ee8c81
4 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Localization/RequestCultureProviderLoggerExtensions.cs → src/Microsoft.AspNetCore.Localization/Internal/RequestCultureProviderLoggerExtensions.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives;
namespace Microsoft.AspNetCore.Localization
namespace Microsoft.AspNetCore.Localization.Internal
{
internal static class RequestCultureProviderLoggerExtensions
{
@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Localization
_unsupportedUICulture = LoggerMessage.Define<string, IList<StringSegment>>(
LogLevel.Warning,
2,
"{requestCultureProvider} returned the following unsupported cultures '{cultures}'.");
"{requestCultureProvider} returned the following unsupported UI Cultures '{uiCultures}'.");
}
public static void UnsupportedCultures(this ILogger logger, string requestCultureProvider, IList<StringSegment> cultures)

3
src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Localization.Internal;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@ -98,7 +99,7 @@ namespace Microsoft.AspNetCore.Localization
if (uiCultureInfo == null)
{
EnsureLogger(context);
_logger?.UnsupportedCultures(provider.GetType().Name, uiCultures);
_logger?.UnsupportedUICultures(provider.GetType().Name, uiCultures);
}
}

77
test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs
View File

@ -146,14 +146,12 @@ namespace Microsoft.Extensions.Localization
}
}
[Theory]
[InlineData("??", "en-US", "CookieRequestCultureProvider returned the following unsupported cultures '??'.")]
[InlineData("en-US", "??", "CookieRequestCultureProvider returned the following unsupported cultures '??'.")]
public async Task UnsupportedCulturesShouldLogWarning(string culture, string uiCulture, string expectedMessage)
[Fact]
public async Task RequestLocalizationMiddleware_LogsWarningsForUnsupportedCultures()
{
var sink = new TestSink(
TestSink.EnableWithTypeName<CookieRequestCultureProvider>,
TestSink.EnableWithTypeName<CookieRequestCultureProvider>);
TestSink.EnableWithTypeName<RequestLocalizationMiddleware>,
TestSink.EnableWithTypeName<RequestLocalizationMiddleware>);
var loggerFactory = new TestLoggerFactory(sink, enabled: true);
var builder = new WebHostBuilder()
.Configure(app =>
@ -176,14 +174,7 @@ namespace Microsoft.Extensions.Localization
};
options.RequestCultureProviders.Insert(0, provider);
app.UseRequestLocalization(options);
app.Run(context =>
{
var requestCultureFeature = context.Features.Get<IRequestCultureFeature>();
var requestCulture = requestCultureFeature.RequestCulture;
Assert.Equal("en-US", requestCulture.Culture.Name);
Assert.NotNull(context.RequestServices.GetService<ILogger<RequestLocalizationMiddleware>>());
return Task.FromResult(0);
});
app.Run(context => Task.CompletedTask);
})
.ConfigureServices(services =>
{
@ -193,12 +184,70 @@ namespace Microsoft.Extensions.Localization
using (var server = new TestServer(builder))
{
var client = server.CreateClient();
var culture = "??";
var uiCulture = "ar-YE";
client.DefaultRequestHeaders.Add("Cookie", new CookieHeaderValue("Preferences", $"c={culture}|uic={uiCulture}").ToString());
var response = await client.GetAsync(string.Empty);
response.EnsureSuccessStatusCode();
}
var expectedMessage = $"{nameof(CookieRequestCultureProvider)} returned the following unsupported cultures '??'.";
var logMessages = sink.Writes;
var count = logMessages.Count;
Assert.Equal(1, count);
Assert.Equal(LogLevel.Warning, logMessages[0].LogLevel);
Assert.Equal(expectedMessage, logMessages[0].State.ToString());
}
[Fact]
public async Task RequestLocalizationMiddleware_LogsWarningsForUnsupportedUICultures()
{
var sink = new TestSink(
TestSink.EnableWithTypeName<RequestLocalizationMiddleware>,
TestSink.EnableWithTypeName<RequestLocalizationMiddleware>);
var loggerFactory = new TestLoggerFactory(sink, enabled: true);
var builder = new WebHostBuilder()
.Configure(app =>
{
var options = new RequestLocalizationOptions
{
DefaultRequestCulture = new RequestCulture("en-US"),
SupportedCultures = new List<CultureInfo>
{
new CultureInfo("ar-YE")
},
SupportedUICultures = new List<CultureInfo>
{
new CultureInfo("ar-YE")
}
};
var provider = new CookieRequestCultureProvider
{
CookieName = "Preferences"
};
options.RequestCultureProviders.Insert(0, provider);
app.UseRequestLocalization(options);
app.Run(context => Task.CompletedTask);
})
.ConfigureServices(services =>
{
services.AddSingleton(typeof(ILoggerFactory), loggerFactory);
});
using (var server = new TestServer(builder))
{
var client = server.CreateClient();
var culture = "ar-YE";
var uiCulture = "??";
client.DefaultRequestHeaders.Add("Cookie", new CookieHeaderValue("Preferences", $"c={culture}|uic={uiCulture}").ToString());
var response = await client.GetAsync(string.Empty);
response.EnsureSuccessStatusCode();
}
var expectedMessage = $"{nameof(CookieRequestCultureProvider)} returned the following unsupported UI Cultures '??'.";
var logMessages = sink.Writes;
var count = logMessages.Count;

4
test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj
View File

@ -11,9 +11,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />