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

[Fixes #4353] Cleanup application part discovery

This commit is contained in:
jacalvar 2016-05-17 17:31:29 -07:00
parent 93be3dee6e
commit b1054a28c7
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
View File

@ -69,7 +69,7 @@ namespace Microsoft.Extensions.DependencyInjection
manager = new ApplicationPartManager();
var environment = GetServiceFromCollection<IHostingEnvironment>(services);
if (environment == null)
if (string.IsNullOrEmpty(environment?.ApplicationName))
{
return manager;
}

39
test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.AspNetCore.Mvc.Internal;
using Microsoft.AspNetCore.Mvc.Razor.Internal;
@ -10,12 +11,50 @@ using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.DependencyInjection;
using Moq;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.Razor.Test.DependencyInjection
{
public class MvcRazorMvcCoreBuilderExtensionsTest
{
[Fact]
public void AddMvcCore_OnServiceCollectionWithoutIHostingEnvironmentInstance_DoesNotDiscoverApplicationParts()
{
// Arrange
var services = new ServiceCollection();
// Act
var builder = services
.AddMvcCore();
// Assert
Assert.Empty(builder.PartManager.ApplicationParts);
}
[Theory]
[InlineData("")]
[InlineData(null)]
public void AddMvcCore_OnServiceCollectionWithIHostingEnvironmentInstanceWithInvalidApplicationName_DoesNotDiscoverApplicationParts(string applicationName)
{
// Arrange
var services = new ServiceCollection();
var hostingEnvironment = new Mock<IHostingEnvironment>();
hostingEnvironment
.Setup(h => h.ApplicationName)
.Returns(applicationName);
services.AddSingleton(hostingEnvironment.Object);
// Act
var builder = services
.AddMvcCore();
// Assert
Assert.Empty(builder.PartManager.ApplicationParts);
}
[Fact]
public void AddTagHelpersAsServices_ReplacesTagHelperActivatorAndTagHelperTypeResolver()
{