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

Fix a null reference exception and add some null checks

This commit is contained in:
Javier Calvarro Nelson 2017-07-04 13:55:14 -07:00
parent 8d9c16132a
commit ef43b100a6
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Microsoft.AspNetCore.Mvc.Testing/MvcWebApplicationBuilder.cs
View File

@ -93,6 +93,16 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// <returns>An instance of this <see cref="MvcWebApplicationBuilder{TStartup}"/></returns>
public MvcWebApplicationBuilder<TStartup> UseRequestCulture(string culture, string uiCulture)
{
if (culture == null)
{
throw new ArgumentNullException(nameof(culture));
}
if (uiCulture == null)
{
throw new ArgumentNullException(nameof(uiCulture));
}
ConfigureBeforeStartup(services =>
{
services.TryAddSingleton(new TestCulture
@ -116,6 +126,16 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// <returns>An instance of this <see cref="MvcWebApplicationBuilder{TStartup}"/></returns>
public MvcWebApplicationBuilder<TStartup> UseStartupCulture(string culture, string uiCulture)
{
if (culture == null)
{
throw new ArgumentNullException(nameof(culture));
}
if (uiCulture == null)
{
throw new ArgumentNullException(nameof(uiCulture));
}
_systemCulture = new TestCulture { Culture = culture, UICulture = uiCulture };
return this;
}
@ -130,6 +150,11 @@ namespace Microsoft.AspNetCore.Mvc.Testing
string solutionRelativePath,
string solutionName = "*.sln")
{
if (solutionRelativePath == null)
{
throw new ArgumentNullException(nameof(solutionRelativePath));
}
var applicationBasePath = AppContext.BaseDirectory;
var directoryInfo = new DirectoryInfo(applicationBasePath);
@ -160,6 +185,11 @@ namespace Microsoft.AspNetCore.Mvc.Testing
.UseContentRoot(ContentRoot)
.ConfigureServices(InitializeServices);
if (_systemCulture == null)
{
return new TestServer(builder);
}
var originalCulture = CultureInfo.CurrentCulture;
var originalUICulture = CultureInfo.CurrentUICulture;
try