chore: fixing tests

tests/Containers/Prism.Container.Shared/Tests/ContainerResolutionExceptionFixture.cs

@@ -43,7 +43,7 @@ namespace Prism.Ioc.Tests
         {
             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 @@ namespace Prism.Ioc.Tests
         {
             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 @@ namespace Prism.Ioc.Tests
         {
             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 @@ namespace Prism.Ioc.Tests
         {
             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 @@ namespace Prism.Ioc.Tests
         {
             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 @@ namespace Prism.Ioc.Tests
         {
             ContainerLocator.ResetContainer();
             var container = Setup.CreateContainer();
-            ContainerLocator.SetContainerExtension(Setup.Extension);
+            Assert.False(ContainerLocator.TrySetContainerExtension(Setup.Extension));
 
             var ex = Record.Exception(() => container.Resolve<ConstructorArgumentViewModel>());
 

tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs

@@ -19,7 +19,7 @@ namespace Prism.Tests.Ioc
         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 @@ namespace Prism.Tests.Ioc
         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]

tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs

+using System;
 using Moq;
 using Prism.Container.Wpf.Mocks;
 using Prism.Events;
@@ -154,7 +155,7 @@ namespace Prism.Container.Wpf.Tests.Bootstrapper
         public void SetsContainerLocatorCurrentContainer()
         {
             ContainerLocator.ResetContainer();
-            Assert.Null(ContainerLocator.Container);
+            Assert.Throws<InvalidOperationException>(() => ContainerLocator.Container);
             var bootstrapper = new MockBootstrapper();
 
             bootstrapper.Run();