feat: add TestBed

BREAKING CHANGE: The new TestBed system replaces DependencyScope and DependencyInjector's static methods. They have been removed.

Assets/UIComponents.Benchmarks/BenchmarkUtils.cs

@@ -1,10 +1,11 @@
-using Unity.PerformanceTesting;
+using UIComponents.DependencyInjection;
+using Unity.PerformanceTesting;
 
 namespace UIComponents.Benchmarks
 {
     public static class BenchmarkUtils
     {
-        public const string Version = "0.18.0.0";
+        public const string Version = "0.19.0.0";
 
         private static SampleGroup[] GetProfilerMarkers()
         {
@@ -23,7 +24,7 @@ public static void MeasureComponentInitWithColdCache<TComponent>() where TCompon
                 .SetUp(() =>
                 {
                     UIComponent.ClearCache<TComponent>();
-                    DependencyInjector.Container.Clear();
+                    DiContext.Current.Container.Clear();
                 })
                 .SampleGroup(new SampleGroup("Cold Cache Time"))
                 .ProfilerMarkers(GetProfilerMarkers())

Assets/UIComponents.Tests/AssetPathAttributeTests.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using NSubstitute;
 using NUnit.Framework;
+using UIComponents.Testing;
 using UIComponents.Tests.Utilities;
 
 namespace UIComponents.Tests
@@ -15,27 +16,29 @@ private class UIComponentWithAssetPaths : UIComponent {}
         [AssetPath("Path3")]
         [AssetPath("Path4")]
         private class UIComponentSubclassWithAssetPaths : UIComponentWithAssetPaths {}
+
+        private TestBed _testBed;
+        private IAssetResolver _mockResolver;
 
-        private IAssetResolver _resolver;
-
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
+        [SetUp]
+        public void SetUp()
         {
-            _resolver = MockUtilities.CreateMockResolver();
-            DependencyInjector.SetDependency<UIComponentWithAssetPaths, IAssetResolver>(_resolver);
+            _mockResolver = MockUtilities.CreateMockResolver();
+            _testBed = TestBed.Create()
+                .WithSingleton(_mockResolver)
+                .Build();
         }
 
         [TearDown]
         public void TearDown()
         {
-            _resolver.ClearReceivedCalls();
-            DependencyInjector.ResetProvidedInstance<UIComponentWithAssetPaths, IAssetResolver>();
+            _mockResolver.ClearReceivedCalls();
         }
 
         [Test]
         public void Specified_Asset_Paths_Are_Stored()
         {
-            var component = new UIComponentWithAssetPaths();
+            var component = _testBed.CreateComponent<UIComponentWithAssetPaths>();
 
             var assetPaths = component.GetAssetPaths().ToList();
 
@@ -48,7 +51,7 @@ public void Specified_Asset_Paths_Are_Stored()
         [Test]
         public void Asset_Path_Are_Inherited_From_Parent_Classes()
         {
-            var component = new UIComponentSubclassWithAssetPaths();
+            var component = _testBed.CreateComponent<UIComponentSubclassWithAssetPaths>();
 
             var assetPaths = component.GetAssetPaths().ToList();
 

Assets/UIComponents.Tests/DependencyInjectorTests.cs

@@ -1,5 +1,6 @@
 using System;
 using NUnit.Framework;
+using UIComponents.DependencyInjection;
 
 namespace UIComponents.Tests
 {
@@ -20,7 +21,7 @@ public void Can_Be_Created_Using_DependencyAttributes()
                 new DependencyAttribute(typeof(IDependency), typeof(DependencyOne))
             };
 
-            var injector = new DependencyInjector(dependencyAttributes);
+            var injector = new DependencyInjector(dependencyAttributes, DiContext.Current.Container);
 
             Assert.That(injector.Provide<IDependency>(), Is.InstanceOf<DependencyOne>());
         }
@@ -31,15 +32,15 @@ public class Provide
             [Test]
             public void Returns_Desired_Dependency()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
                 injector.SetDependency<IDependency>(new DependencyOne());
                 Assert.That(injector.Provide<IDependency>(), Is.InstanceOf<DependencyOne>());
             }
 
             [Test]
             public void Throws_If_No_Provider_Exists()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 var exception = Assert.Throws<MissingProviderException>(
                     () => injector.Provide<IDependency>()
@@ -55,7 +56,7 @@ public class TryProvide
             [Test]
             public void Returns_If_Dependency_Could_Be_Provided()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 Assert.That(injector.TryProvide<IDependency>(out _), Is.False);
 
@@ -70,7 +71,7 @@ public void Returns_If_Dependency_Could_Be_Provided()
             [Test]
             public void Yields_Null_If_Dependency_Can_Not_Be_Provided()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 injector.TryProvide<IDependency>(out var instance);
 
@@ -84,7 +85,7 @@ public class SetDependency
             [Test]
             public void Switches_The_Dependency()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 injector.SetDependency<IDependency>(new DependencyOne());
                 injector.SetDependency<IDependency>(new DependencyTwo());
@@ -95,7 +96,7 @@ public void Switches_The_Dependency()
             [Test]
             public void Throws_Exception_If_Null_Is_Given_As_Parameter()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 Assert.Throws<ArgumentNullException>(
                     () => injector.SetDependency<IDependency>(null)
@@ -109,7 +110,7 @@ public class ClearDependency
             [Test]
             public void Removes_Dependency_Instance()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 injector.SetDependency<IDependency>(new DependencyOne());
 
@@ -121,7 +122,7 @@ public void Removes_Dependency_Instance()
             [Test]
             public void Does_Not_Throw_If_Dependency_Does_Not_Exist()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 Assert.DoesNotThrow(() => injector.ClearDependency<IDependency>());
             }
@@ -133,13 +134,13 @@ public class ResetProvidedInstance
             [SetUp]
             public void SetUp()
             {
-                DependencyInjector.Container.Clear();
+                DiContext.Current.Container.Clear();
             }
 
             [Test]
             public void Throws_If_No_Default_Dependency_Exists()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 Assert.Throws<InvalidOperationException>(
                     () => injector.ResetProvidedInstance<IDependency>()
@@ -157,7 +158,7 @@ public void Throws_If_No_Default_Dependency_Exists()
             [Test]
             public void Restores_Singleton_Instance()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
 
                 var singletonInstance = new DependencyOne();
 
@@ -171,7 +172,7 @@ public void Restores_Singleton_Instance()
             [Test]
             public void Creates_New_Transient_Instance()
             {
-                var injector = new DependencyInjector();
+                var injector = new DependencyInjector(DiContext.Current.Container);
                 var transientInstance = new DependencyOne();
 
                 injector.SetDependency<IDependency>(transientInstance, Scope.Transient);

Assets/UIComponents.Tests/DependencyTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using UIComponents.DependencyInjection;
 
 namespace UIComponents.Tests
 {