test: use DependencyInjector.RestoreDefaultDependency

jonisavo · Jun 18, 2022 · b4cccca · b4cccca
1 parent de1bc0c
commit b4cccca
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/Assets/UIComponents.Tests/AssetPathAttributeTests.cs b/Assets/UIComponents.Tests/AssetPathAttributeTests.cs
@@ -29,6 +29,7 @@ public void OneTimeSetUp()
         public void TearDown()
         {
             _resolver.ClearReceivedCalls();
+            DependencyInjector.RestoreDefaultDependency<UIComponentWithAssetPaths, IAssetResolver>();
         }
 
         [Test]

diff --git a/Assets/UIComponents.Tests/LayoutAttributeTests.cs b/Assets/UIComponents.Tests/LayoutAttributeTests.cs
@@ -43,6 +43,15 @@ public void OneTimeSetUp()
                 _assetResolver
             );
         }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            DependencyInjector.RestoreDefaultDependency<UIComponentWithLayout, IAssetResolver>();
+            DependencyInjector.RestoreDefaultDependency<InheritedComponentWithoutAttribute, IAssetResolver>();
+            DependencyInjector.RestoreDefaultDependency<InheritedComponentWithAttribute, IAssetResolver>();
+            DependencyInjector.RestoreDefaultDependency<UIComponentWithNullLayout, IAssetResolver>();
+        }
 
         [TearDown]
         public void TearDown()

diff --git a/Assets/UIComponents.Tests/PathAttributeTests.cs b/Assets/UIComponents.Tests/PathAttributeTests.cs
@@ -35,6 +35,13 @@ public void OneTimeSetUp()
                 DependencyInjector.SetDependency<UIComponentWithValidAssetPath, IAssetResolver>(_assetResolver);
                 DependencyInjector.SetDependency<UIComponentWithInvalidAssetPath, IAssetResolver>(_assetResolver);
             }
+
+            [OneTimeTearDown]
+            public void OneTimeTearDown()
+            {
+                DependencyInjector.RestoreDefaultDependency<UIComponentWithValidAssetPath, IAssetResolver>();
+                DependencyInjector.RestoreDefaultDependency<UIComponentWithInvalidAssetPath, IAssetResolver>();
+            }
 
             [Test]
             public void Should_Return_Empty_String_If_No_Path_Is_Configured()

diff --git a/Assets/UIComponents.Tests/StylesheetAttributeTests.cs b/Assets/UIComponents.Tests/StylesheetAttributeTests.cs
@@ -34,6 +34,13 @@ public void OneTimeSetUp()
             DependencyInjector.SetDependency<UIComponentWithTwoStylesheets, IAssetResolver>(_resolver);
             DependencyInjector.SetDependency<InheritedComponent, IAssetResolver>(_resolver);
         }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            DependencyInjector.RestoreDefaultDependency<UIComponentWithTwoStylesheets, IAssetResolver>();
+            DependencyInjector.RestoreDefaultDependency<InheritedComponent, IAssetResolver>();
+        }
 
         [TearDown]
         public void TearDown()

diff --git a/Assets/UIComponents.Tests/UIComponentNoAttributesTests.cs b/Assets/UIComponents.Tests/UIComponentNoAttributesTests.cs
@@ -19,6 +19,12 @@ public void OneTimeSetUp()
             DependencyInjector.SetDependency<UIComponentNoAttributes, IAssetResolver>(_resolver);
         }
 
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            DependencyInjector.RestoreDefaultDependency<UIComponentNoAttributes, IAssetResolver>();
+        }
+
         [TearDown]
         public void TearDown()
         {