chore: fixing tests

PrismLibrary · Aug 15, 2023 · 5c4867c · 5c4867c
1 parent 58f6aa2
commit 5c4867c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/tests/Containers/Prism.Container.Shared/Tests/ContainerResolutionExceptionFixture.cs b/tests/Containers/Prism.Container.Shared/Tests/ContainerResolutionExceptionFixture.cs
@@ -43,7 +43,7 @@ public void GetErrorsDoesNotThrowException()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
             Setup.Registry.Register<object, BadView>("BadView");
 
             var ex = Record.Exception(() => container.Resolve<object>("BadView"));
@@ -60,7 +60,7 @@ public void GetErrorsLocatesIssueWithBadView()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
             Setup.Registry.Register<object, BadView>("BadView");
 
             var ex = Record.Exception(() => container.Resolve<object>("BadView"));
@@ -77,7 +77,7 @@ public void GetErrorsLocatesTargetInvocationException()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
             Setup.Registry.Register<object, BadView>("BadView");
 
             var ex = Record.Exception(() => container.Resolve<object>("BadView"));
@@ -94,7 +94,7 @@ public void GetErrorsLocatesXamlParseException()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
             Setup.Registry.Register<object, BadView>("BadView");
 
             var ex = Record.Exception(() => container.Resolve<object>("BadView"));
@@ -111,7 +111,7 @@ public void LocatesUnregisteredServiceType()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
 
             var ex = Record.Exception(() => container.Resolve<ConstructorArgumentViewModel>());
 
@@ -127,7 +127,7 @@ public void LocatesUnregisteredServiceWithMissingRegistration()
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
 
             var ex = Record.Exception(() => container.Resolve<ConstructorArgumentViewModel>());
 

diff --git a/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs b/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs
@@ -19,7 +19,7 @@ public class ContainerLocatorFixture
         public void FactoryCreatesContainerExtension()
         {
             Prism.Ioc.ContainerLocator.ResetContainer();
-            Assert.Null(Prism.Ioc.ContainerLocator.Current);
+            Assert.Throws<InvalidOperationException>(() => Prism.Ioc.ContainerLocator.Current);
             Prism.Ioc.ContainerLocator.SetContainerExtension(new Mock<IContainerExtension>().Object);
             Assert.NotNull(Prism.Ioc.ContainerLocator.Current);
         }
@@ -28,11 +28,11 @@ public void FactoryCreatesContainerExtension()
         public void ResetNullsCurrentContainer()
         {
             Prism.Ioc.ContainerLocator.ResetContainer();
-            Assert.Null(Prism.Ioc.ContainerLocator.Current);
+            Assert.Throws<InvalidOperationException>(() => Prism.Ioc.ContainerLocator.Current);
             Prism.Ioc.ContainerLocator.SetContainerExtension(new Mock<IContainerExtension>().Object);
             Assert.NotNull(Prism.Ioc.ContainerLocator.Current);
             Prism.Ioc.ContainerLocator.ResetContainer();
-            Assert.Null(Prism.Ioc.ContainerLocator.Current);
+            Assert.Throws<InvalidOperationException>(() => Prism.Ioc.ContainerLocator.Current);
         }
 
         [Fact]

diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs
@@ -1,3 +1,4 @@
+using System;
 using Moq;
 using Prism.Container.Wpf.Mocks;
 using Prism.Events;
@@ -154,7 +155,7 @@ public void RunShouldCallRegisterTypes()
         public void SetsContainerLocatorCurrentContainer()
         {
             ContainerLocator.ResetContainer();
-            Assert.Null(ContainerLocator.Container);
+            Assert.Throws<InvalidOperationException>(() => ContainerLocator.Container);
             var bootstrapper = new MockBootstrapper();
 
             bootstrapper.Run();