Added container dispose callback Unit Tests

hadashiA · Dec 23, 2023 · f57c782 · f57c782
1 parent 8b00eaa
commit f57c782
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/VContainer/Assets/Tests/ContainerTest.cs b/VContainer/Assets/Tests/ContainerTest.cs
@@ -566,5 +566,24 @@ public void Inject()
             var ctorInjectable = new ServiceA(new NoDependencyServiceA());
             Assert.DoesNotThrow(() => container.Inject(ctorInjectable));
         }
+
+        [Test]
+        public void OnContainerDisposeCallback()
+        {
+            NoDependencyServiceA resolvedJustBeforeDispose = null;
+
+            var builder = new ContainerBuilder();
+
+            builder.Register<NoDependencyServiceA>(Lifetime.Scoped);
+            builder.RegisterDisposeCallback(resolver => resolvedJustBeforeDispose = resolver.Resolve<NoDependencyServiceA>());
+
+            var container = builder.Build();
+
+            Assert.That(resolvedJustBeforeDispose, Is.Null);
+
+            container.Dispose();
+
+            Assert.That(resolvedJustBeforeDispose, Is.Not.Null);
+        }
     }
 }
diff --git a/VContainer/Assets/VContainer/Runtime/ContainerBuilderExtensions.cs b/VContainer/Assets/VContainer/Runtime/ContainerBuilderExtensions.cs
@@ -145,7 +145,7 @@ public static RegistrationBuilder RegisterFactory<TParam1, TParam2, TParam3, TPa
             Lifetime lifetime)
             => builder.Register(new FuncRegistrationBuilder(factoryFactory, typeof(Func<TParam1, TParam2, TParam3, TParam4, T>), lifetime));
 
-        public static void RegisterDisposeCallback(this IContainerBuilder builder, Action<IDisposable> callback)
+        public static void RegisterDisposeCallback(this IContainerBuilder builder, Action<IObjectResolver> callback)
         {
             builder.Register(container => new ActionDisposable(callback, container), Lifetime.Scoped);
         }