Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,47 @@ public void TransientServiceCanBeResolvedFromScope()
}
}

[Theory]
[InlineData(ServiceLifetime.Scoped)]
[InlineData(ServiceLifetime.Transient)]
public void NonSingletonService_WithInjectedProvider_ResolvesScopeProvider(ServiceLifetime lifetime)
{
// Arrange
var collection = new TestServiceCollection();
collection.AddScoped<IFakeService, FakeService>();
collection.Add(new ServiceDescriptor(typeof(ClassWithServiceProvider), typeof(ClassWithServiceProvider), lifetime));
var provider = CreateServiceProvider(collection);

// Act
IFakeService fakeServiceFromScope1 = null;
IFakeService otherFakeServiceFromScope1 = null;
IFakeService fakeServiceFromScope2 = null;
IFakeService otherFakeServiceFromScope2 = null;

using (var scope1 = provider.CreateScope())
{
var serviceWithProvider = scope1.ServiceProvider.GetRequiredService<ClassWithServiceProvider>();
fakeServiceFromScope1 = serviceWithProvider.ServiceProvider.GetRequiredService<IFakeService>();

serviceWithProvider = scope1.ServiceProvider.GetRequiredService<ClassWithServiceProvider>();
otherFakeServiceFromScope1 = serviceWithProvider.ServiceProvider.GetRequiredService<IFakeService>();
}

using (var scope2 = provider.CreateScope())
{
var serviceWithProvider = scope2.ServiceProvider.GetRequiredService<ClassWithServiceProvider>();
fakeServiceFromScope2 = serviceWithProvider.ServiceProvider.GetRequiredService<IFakeService>();

serviceWithProvider = scope2.ServiceProvider.GetRequiredService<ClassWithServiceProvider>();
otherFakeServiceFromScope2 = serviceWithProvider.ServiceProvider.GetRequiredService<IFakeService>();
}

// Assert
Assert.Same(fakeServiceFromScope1, otherFakeServiceFromScope1);
Assert.Same(fakeServiceFromScope2, otherFakeServiceFromScope2);
Assert.NotSame(fakeServiceFromScope1, fakeServiceFromScope2);
}

[Fact]
public void SingletonServiceCanBeResolvedFromScope()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@

namespace Microsoft.Extensions.DependencyInjection.Specification
{
public class LightInjectDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
public class LightInjectDependencyInjectionSpecificationTests : SkippableDependencyInjectionSpecificationTests
{
public override bool SupportsIServiceProviderIsService => false;

protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
public override string[] SkippedTests => new string[]
{
"NonSingletonService_WithInjectedProvider_ResolvesScopeProvider"
};

protected override IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection)
{
var builder = new ContainerBuilder();
builder.Populate(serviceCollection);
Expand Down