Skip to content

Add Container.OnDisposing event for ordered teardown #147

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

Open
svermeulen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Container.OnDisposing event for ordered teardown #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 36 additions & 1 deletion Assets/Reflex.EditModeTests/DisposeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,40 @@ Service Factory(Container container)
container.Dispose();
service.Disposed.Should().Be(1);
}

[Test]
public void OnDisposing_ShouldFire_BeforeRegisteredDisposablesAreDisposed()
{
var service = new Service();
var observedDisposedAtEvent = -1;

var container = new ContainerBuilder()
.RegisterValue(service)
.Build();

container.OnDisposing += _ => observedDisposedAtEvent = service.Disposed;
container.Dispose();

observedDisposedAtEvent.Should().Be(0);
service.Disposed.Should().Be(1);
}

[Test]
public void OnDisposing_ShouldFire_BeforeChildContainersAreDisposed()
{
var parentEventOrder = -1;
var childDisposeOrder = -1;
var counter = 0;

var parent = new ContainerBuilder().Build();
var child = parent.Scope();
child.OnDisposing += _ => childDisposeOrder = ++counter;
parent.OnDisposing += _ => parentEventOrder = ++counter;

parent.Dispose();

parentEventOrder.Should().Be(1);
childDisposeOrder.Should().Be(2);
}
}
}
}
3 changes: 3 additions & 0 deletions Assets/Reflex/Core/Container.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public sealed class Container : IDisposable
public static Container RootContainer { get; internal set; }
public string Name { get; }
public Container Parent { get; }
public event Action<Container> OnDisposing;
internal List<Container> Children { get; } = new();
internal Dictionary<Type, List<IResolver>> ResolversByContract { get; }
internal DisposableCollection Disposables { get; }
Expand Down Expand Up @@ -52,6 +53,8 @@ public bool HasBinding(Type type)

public void Dispose()
{
OnDisposing?.Invoke(this);

foreach (var child in Children.Reversed())
{
child.Dispose();
Expand Down