Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplifying the code with new DryIoc features + test stabilization #98

Merged
merged 3 commits into from
Mar 25, 2020
Merged

Simplifying the code with new DryIoc features + test stabilization #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2628cd4
updating the code to use the new DryIoc features
Mar 25, 2020
a66cdc9
fixed the test to be run sequentially
Mar 25, 2020
0e69396
explicitly disable parallelization for the collection, see https://xu…
Mar 25, 2020
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
2 changes: 1 addition & 1 deletion src/Prism.DryIoc.Extensions/Prism.DryIoc.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DryIoc.dll" Version="4.1.1" />
<PackageReference Include="DryIoc.dll" Version="4.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 13 additions & 10 deletions src/Prism.DryIoc.Extensions/PrismContainerExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public static IContainerExtension<IContainer> Current
internal static void Reset()
{
_current = null;
GC.Collect();
GC.Collect(Int32.MaxValue, GCCollectionMode.Forced);
GC.WaitForFullGCComplete();
}

public static IContainerExtension Create() =>
Expand Down Expand Up @@ -78,12 +79,14 @@ private PrismContainerExtension(IContainer container)
{
_current = this;
Instance = container;
Instance.RegisterInstance<PrismContainerExtension>(this);
Instance.RegisterMapping<IContainerExtension, PrismContainerExtension>();
Instance.RegisterMapping<IContainerRegistry, PrismContainerExtension>();
Instance.RegisterMapping<IContainerProvider, PrismContainerExtension>();
Instance.RegisterMapping<IServiceProvider, PrismContainerExtension>();
Instance.RegisterMapping<IServiceScopeFactory, PrismContainerExtension>();
Instance.RegisterInstanceMany(new[]
{
typeof(IContainerExtension),
typeof(IContainerRegistry),
typeof(IContainerProvider),
typeof(IServiceProvider),
typeof(IServiceScopeFactory)
}, this);
}

private ServiceScope _currentScope;
Expand Down Expand Up @@ -168,7 +171,7 @@ public IContainerRegistry RegisterDelegate(Type serviceType, Func<object> factor

public IContainerRegistry RegisterDelegate(Type serviceType, Func<IContainerProvider, object> factoryMethod)
{
Instance.RegisterDelegate(serviceType, r => factoryMethod(r.Resolve<IContainerProvider>()));
Instance.RegisterDelegate(serviceType, factoryMethod);
return this;
}

Expand All @@ -186,7 +189,7 @@ public IContainerRegistry RegisterSingletonFromDelegate(Type serviceType, Func<o

public IContainerRegistry RegisterSingletonFromDelegate(Type serviceType, Func<IContainerProvider, object> factoryMethod)
{
Instance.RegisterDelegate(serviceType, r => factoryMethod(r.Resolve<IContainerProvider>()), Reuse.Singleton);
Instance.RegisterDelegate(serviceType, factoryMethod, Reuse.Singleton);
return this;
}

Expand All @@ -213,7 +216,7 @@ public IContainerRegistry RegisterScopedFromDelegate(Type serviceType, Func<obje

public IContainerRegistry RegisterScopedFromDelegate(Type serviceType, Func<IContainerProvider, object> factoryMethod)
{
Instance.RegisterDelegate(serviceType, r => factoryMethod(r.Resolve<IContainerProvider>()), Reuse.ScopedOrSingleton);
Instance.RegisterDelegate(serviceType, factoryMethod, Reuse.ScopedOrSingleton);
return this;
}

Expand Down
1 change: 1 addition & 0 deletions src/Prism.Unity.Extensions/PrismContainerExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public static IContainerExtension Create(IUnityContainer container)

return new PrismContainerExtension(container);
}

private PrismContainerExtension()
: this(new UnityContainer())
{
Expand Down
1 change: 1 addition & 0 deletions ...Prism.Container.Extensions.Shared.Tests/Prism.Container.Extensions.Shared.Tests.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Mocks\GenericService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Mocks\MockDbContext.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Tests\SharedTestCollection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Tests\CommonAspNetServiceTests.cs" />
</ItemGroup>
</Project>
8 changes: 6 additions & 2 deletions tests/Prism.Container.Extensions.Shared.Tests/Tests/CommonAspNetServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,14 @@

namespace Prism.Container.Extensions.Shared.Tests
{
[Collection(nameof(SharedTests))]
public class CommonAspNetServiceTests
{
public CommonAspNetServiceTests()
{
PrismContainerExtension.Reset();
}

[Fact]
public void CreatingServicesDoesNotThrowException()
{
Expand Down Expand Up @@ -91,7 +97,6 @@ public void ScopingProvidesNewInstance()
[Fact]
public void RegisterServicesExtensionsAddsServicesToContainer()
{
PrismContainerExtension.Reset();
PrismContainerExtension.Current.RegisterServices(s =>
{
s.AddHttpClient();
Expand All @@ -102,7 +107,6 @@ public void RegisterServicesExtensionsAddsServicesToContainer()

private void ConfigureServices()
{
PrismContainerExtension.Reset();
var services = new ServiceCollection();
services.AddDbContext<MockDbContext>(o => o.UseInMemoryDatabase("test"));
services.AddHttpClient();
Expand Down
11 changes: 11 additions & 0 deletions tests/Prism.Container.Extensions.Shared.Tests/Tests/SharedTestCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Xunit;

namespace Prism.Container.Extensions.Shared.Tests
{
public class SharedTests { }

[CollectionDefinition(nameof(SharedTests), DisableParallelization = true)]
public class SharedTestCollection : ICollectionFixture<SharedTests>
{
}
}
Loading