-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for IServiceProviderIsService (#54047)
* Add support for IServiceProviderIsService - This optional service lets consumers query to see if a service is resolvable without side effects (not having to explicitly resolve the service). - Added new spec tests to verify the baseline behavior based on IServiceCollection features. - Handle built in services as part of IsServce - Special case built in services as part of the IsService check - Make the tests part of the core DI tests and enable skipping via a property Co-authored-by: Travis Illig <tillig@paraesthesia.com>
- Loading branch information
Showing
13 changed files
with
207 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...es/Microsoft.Extensions.DependencyInjection.Abstractions/src/IServiceProviderIsService.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System; | ||
|
||
namespace Microsoft.Extensions.DependencyInjection | ||
{ | ||
/// <summary> | ||
/// Optional service used to determine if the specified type is available from the <see cref="IServiceProvider"/>. | ||
/// </summary> | ||
public interface IServiceProviderIsService | ||
{ | ||
/// <summary> | ||
/// Determines if the specified service type is available from the <see cref="IServiceProvider"/>. | ||
/// </summary> | ||
/// <param name="serviceType">An object that specifies the type of service object to test.</param> | ||
/// <returns>true if the specified service is a available, false if it is not.</returns> | ||
bool IsService(Type serviceType); | ||
} | ||
} |
127 changes: 127 additions & 0 deletions
127
...DependencyInjection.Specification.Tests/src/ServiceProviderIsServiceSpecificationTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
using System.Text; | ||
using Microsoft.Extensions.DependencyInjection.Specification.Fakes; | ||
using Xunit; | ||
|
||
namespace Microsoft.Extensions.DependencyInjection.Specification | ||
{ | ||
public abstract partial class DependencyInjectionSpecificationTests | ||
{ | ||
public virtual bool SupportsIServiceProviderIsService => true; | ||
|
||
[Fact] | ||
public void ExplictServiceRegisterationWithIsService() | ||
{ | ||
if (!SupportsIServiceProviderIsService) | ||
{ | ||
return; | ||
} | ||
|
||
// Arrange | ||
var collection = new TestServiceCollection(); | ||
collection.AddTransient(typeof(IFakeService), typeof(FakeService)); | ||
var provider = CreateServiceProvider(collection); | ||
|
||
// Act | ||
var serviceProviderIsService = provider.GetService<IServiceProviderIsService>(); | ||
|
||
// Assert | ||
Assert.NotNull(serviceProviderIsService); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IFakeService))); | ||
Assert.False(serviceProviderIsService.IsService(typeof(FakeService))); | ||
} | ||
|
||
[Fact] | ||
public void OpenGenericsWithIsService() | ||
{ | ||
if (!SupportsIServiceProviderIsService) | ||
{ | ||
return; | ||
} | ||
|
||
// Arrange | ||
var collection = new TestServiceCollection(); | ||
collection.AddTransient(typeof(IFakeOpenGenericService<>), typeof(FakeOpenGenericService<>)); | ||
var provider = CreateServiceProvider(collection); | ||
|
||
// Act | ||
var serviceProviderIsService = provider.GetService<IServiceProviderIsService>(); | ||
|
||
// Assert | ||
Assert.NotNull(serviceProviderIsService); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IFakeOpenGenericService<IFakeService>))); | ||
Assert.False(serviceProviderIsService.IsService(typeof(IFakeOpenGenericService<>))); | ||
} | ||
|
||
[Fact] | ||
public void ClosedGenericsWithIsService() | ||
{ | ||
if (!SupportsIServiceProviderIsService) | ||
{ | ||
return; | ||
} | ||
|
||
// Arrange | ||
var collection = new TestServiceCollection(); | ||
collection.AddTransient(typeof(IFakeOpenGenericService<IFakeService>), typeof(FakeOpenGenericService<IFakeService>)); | ||
var provider = CreateServiceProvider(collection); | ||
|
||
// Act | ||
var serviceProviderIsService = provider.GetService<IServiceProviderIsService>(); | ||
|
||
// Assert | ||
Assert.NotNull(serviceProviderIsService); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IFakeOpenGenericService<IFakeService>))); | ||
} | ||
|
||
[Fact] | ||
public void IEnumerableWithIsServiceAlwaysReturnsTrue() | ||
{ | ||
if (!SupportsIServiceProviderIsService) | ||
{ | ||
return; | ||
} | ||
|
||
// Arrange | ||
var collection = new TestServiceCollection(); | ||
collection.AddTransient(typeof(IFakeService), typeof(FakeService)); | ||
var provider = CreateServiceProvider(collection); | ||
|
||
// Act | ||
var serviceProviderIsService = provider.GetService<IServiceProviderIsService>(); | ||
|
||
// Assert | ||
Assert.NotNull(serviceProviderIsService); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IEnumerable<IFakeService>))); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IEnumerable<FakeService>))); | ||
Assert.False(serviceProviderIsService.IsService(typeof(IEnumerable<>))); | ||
} | ||
|
||
[Fact] | ||
public void BuiltInServicesWithIsServiceReturnsTrue() | ||
{ | ||
if (!SupportsIServiceProviderIsService) | ||
{ | ||
return; | ||
} | ||
|
||
// Arrange | ||
var collection = new TestServiceCollection(); | ||
collection.AddTransient(typeof(IFakeService), typeof(FakeService)); | ||
var provider = CreateServiceProvider(collection); | ||
|
||
// Act | ||
var serviceProviderIsService = provider.GetService<IServiceProviderIsService>(); | ||
|
||
// Assert | ||
Assert.NotNull(serviceProviderIsService); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IServiceProvider))); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IServiceScopeFactory))); | ||
Assert.True(serviceProviderIsService.IsService(typeof(IServiceProviderIsService))); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters