From 5fad681e9e36cf3f2dca23a93f237df64e5ec937 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Thu, 16 Apr 2020 11:36:54 -0700 Subject: [PATCH] fixing names --- src/Prism.Core/Ioc/ContainerLocator.cs | 8 ++- .../Legacy/DryIocBootstrapper.cs | 2 +- .../Legacy/UnityBootstrapper.cs | 3 +- src/Wpf/Prism.Wpf/PrismApplicationBase.cs | 2 +- .../Regions/RegionBehaviorFactory.cs | 20 +++--- .../Regions/RegionNavigationService.cs | 70 ++++++++----------- .../Ioc/ContainerLocatorFixture.cs | 8 +-- .../RegionNavigationContentLoaderFixture.cs | 2 +- .../Fixtures/ContainerLocatorFixture.cs | 2 +- .../Fixtures/ContainerLocatorFixture.cs | 2 +- .../Prism.Wpf.Tests/BootstrapperFixture.cs | 6 +- .../Regions/RegionAdapterMappingsFixture.cs | 2 +- .../Prism.Wpf.Tests/Regions/RegionFixture.cs | 2 +- .../Regions/RegionManagerFixture.cs | 6 +- 14 files changed, 62 insertions(+), 73 deletions(-) diff --git a/src/Prism.Core/Ioc/ContainerLocator.cs b/src/Prism.Core/Ioc/ContainerLocator.cs index 36b4887986..65b3f3a866 100644 --- a/src/Prism.Core/Ioc/ContainerLocator.cs +++ b/src/Prism.Core/Ioc/ContainerLocator.cs @@ -9,8 +9,6 @@ namespace Prism.Ioc [EditorBrowsable(EditorBrowsableState.Never)] public static class ContainerLocator { - // NOTE: We want to use Lazy Initialization in case the container is first created - // prior to Prism initializing which could be the case with Shiny private static Lazy _lazyContainer; private static IContainerExtension _current; @@ -32,7 +30,11 @@ public static class ContainerLocator /// Sets the Container Factory to use if the Current is null /// /// - public static void SetContainerFactory(Func factory) => + /// + /// NOTE: We want to use Lazy Initialization in case the container is first created + /// prior to Prism initializing which could be the case with Shiny + /// + public static void SetContainerExtension(Func factory) => _lazyContainer = new Lazy(factory); /// diff --git a/src/Wpf/Prism.DryIoc.Wpf/Legacy/DryIocBootstrapper.cs b/src/Wpf/Prism.DryIoc.Wpf/Legacy/DryIocBootstrapper.cs index 7dc7bf4f2f..f732e737a5 100644 --- a/src/Wpf/Prism.DryIoc.Wpf/Legacy/DryIocBootstrapper.cs +++ b/src/Wpf/Prism.DryIoc.Wpf/Legacy/DryIocBootstrapper.cs @@ -65,7 +65,7 @@ public override void Run(bool runWithDefaultConfiguration) throw new InvalidOperationException(Resources.NullDryIocContainerException); } - ContainerLocator.SetContainerFactory(CreateContainerExtension); + ContainerLocator.SetContainerExtension(CreateContainerExtension); ContainerExtension = ContainerLocator.Current; Logger.Log(Resources.ConfiguringContainer, Category.Debug, Priority.Low); diff --git a/src/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs b/src/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs index 7d19bcb377..f9e9806c76 100644 --- a/src/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs +++ b/src/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs @@ -67,7 +67,7 @@ public override void Run(bool runWithDefaultConfiguration) throw new InvalidOperationException(Resources.NullUnityContainerException); } - ContainerLocator.SetContainerFactory(CreateContainerExtension); + ContainerLocator.SetContainerExtension(CreateContainerExtension); ContainerExtension = ContainerLocator.Current; this.Logger.Log(Resources.ConfiguringContainer, Category.Debug, Priority.Low); @@ -133,7 +133,6 @@ protected virtual void ConfigureContainer() RegisterTypeIfMissing(typeof(IDialogService), typeof(DialogService), true); RegisterTypeIfMissing(typeof(IDialogWindow), typeof(DialogWindow), false); - // RegisterTypeIfMissing(typeof(IServiceLocator), typeof(UnityServiceLocatorAdapter), true); RegisterTypeIfMissing(typeof(IModuleInitializer), typeof(ModuleInitializer), true); RegisterTypeIfMissing(typeof(IModuleManager), typeof(ModuleManager), true); RegisterTypeIfMissing(typeof(RegionAdapterMappings), typeof(RegionAdapterMappings), true); diff --git a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs index d752efd44a..3e91c6a317 100644 --- a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs +++ b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs @@ -61,7 +61,7 @@ protected virtual void ConfigureViewModelLocator() /// public virtual void Initialize() { - ContainerLocator.SetContainerFactory(CreateContainerExtension); + ContainerLocator.SetContainerExtension(CreateContainerExtension); _containerExtension = ContainerLocator.Current; _moduleCatalog = CreateModuleCatalog(); RegisterRequiredTypes(_containerExtension); diff --git a/src/Wpf/Prism.Wpf/Regions/RegionBehaviorFactory.cs b/src/Wpf/Prism.Wpf/Regions/RegionBehaviorFactory.cs index 314c34f7d1..847e23a259 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionBehaviorFactory.cs +++ b/src/Wpf/Prism.Wpf/Regions/RegionBehaviorFactory.cs @@ -14,8 +14,8 @@ namespace Prism.Regions [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification = "It is more of a factory than a collection")] public class RegionBehaviorFactory : IRegionBehaviorFactory { - private readonly IContainerProvider container; - private readonly Dictionary registeredBehaviors = new Dictionary(); + private readonly IContainerProvider _container; + private readonly Dictionary _registeredBehaviors = new Dictionary(); /// /// Initializes a new instance of . @@ -23,7 +23,7 @@ public class RegionBehaviorFactory : IRegionBehaviorFactory /// used to create the instance of the behavior from its . public RegionBehaviorFactory(IContainerExtension container) { - this.container = container; + _container = container; } /// @@ -51,12 +51,12 @@ public void AddIfMissing(string behaviorKey, Type behaviorType) } // Only add the behaviorKey if it doesn't already exists. - if (this.registeredBehaviors.ContainsKey(behaviorKey)) + if (_registeredBehaviors.ContainsKey(behaviorKey)) { return; } - this.registeredBehaviors.Add(behaviorKey, behaviorType); + _registeredBehaviors.Add(behaviorKey, behaviorType); } /// @@ -66,13 +66,13 @@ public void AddIfMissing(string behaviorKey, Type behaviorType) /// A new instance of the behavior. public IRegionBehavior CreateFromKey(string key) { - if (!this.ContainsKey(key)) + if (!ContainsKey(key)) { throw new ArgumentException( string.Format(Thread.CurrentThread.CurrentCulture, Resources.TypeWithKeyNotRegistered, key), nameof(key)); } - return (IRegionBehavior)this.container.Resolve(this.registeredBehaviors[key]); + return (IRegionBehavior)_container.Resolve(_registeredBehaviors[key]); } @@ -85,7 +85,7 @@ public IRegionBehavior CreateFromKey(string key) /// 1 public IEnumerator GetEnumerator() { - return this.registeredBehaviors.Keys.GetEnumerator(); + return _registeredBehaviors.Keys.GetEnumerator(); } /// @@ -97,7 +97,7 @@ public IEnumerator GetEnumerator() /// 2 IEnumerator IEnumerable.GetEnumerator() { - return this.GetEnumerator(); + return GetEnumerator(); } /// @@ -109,7 +109,7 @@ IEnumerator IEnumerable.GetEnumerator() /// public bool ContainsKey(string behaviorKey) { - return this.registeredBehaviors.ContainsKey(behaviorKey); + return _registeredBehaviors.ContainsKey(behaviorKey); } } } diff --git a/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs b/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs index b6702c975e..2f267b6037 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs +++ b/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs @@ -14,10 +14,9 @@ namespace Prism.Regions /// public class RegionNavigationService : IRegionNavigationService { - private readonly IContainerProvider container; - private readonly IRegionNavigationContentLoader regionNavigationContentLoader; - private readonly IRegionNavigationJournal journal; - private NavigationContext currentNavigationContext; + private readonly IContainerProvider _container; + private readonly IRegionNavigationContentLoader _regionNavigationContentLoader; + private NavigationContext _currentNavigationContext; /// /// Initializes a new instance of the class. @@ -27,10 +26,10 @@ public class RegionNavigationService : IRegionNavigationService /// The journal. public RegionNavigationService(IContainerExtension container, IRegionNavigationContentLoader regionNavigationContentLoader, IRegionNavigationJournal journal) { - this.container = container ?? throw new ArgumentNullException(nameof(container)); - this.regionNavigationContentLoader = regionNavigationContentLoader ?? throw new ArgumentNullException(nameof(regionNavigationContentLoader)); - this.journal = journal ?? throw new ArgumentNullException(nameof(journal)); - this.journal.NavigationTarget = this; + _container = container ?? throw new ArgumentNullException(nameof(container)); + _regionNavigationContentLoader = regionNavigationContentLoader ?? throw new ArgumentNullException(nameof(regionNavigationContentLoader)); + Journal = journal ?? throw new ArgumentNullException(nameof(journal)); + Journal.NavigationTarget = this; } /// @@ -43,13 +42,7 @@ public RegionNavigationService(IContainerExtension container, IRegionNavigationC /// Gets the journal. /// /// The journal. - public IRegionNavigationJournal Journal - { - get - { - return this.journal; - } - } + public IRegionNavigationJournal Journal { get; private set; } /// /// Raised when the region is about to be navigated to content. @@ -105,11 +98,11 @@ public void RequestNavigate(Uri target, Action navigationCallb try { - this.DoNavigate(target, navigationCallback, navigationParameters); + DoNavigate(target, navigationCallback, navigationParameters); } catch (Exception e) { - this.NotifyNavigationFailed(new NavigationContext(this, target), navigationCallback, e); + NotifyNavigationFailed(new NavigationContext(this, target), navigationCallback, e); } } @@ -118,16 +111,16 @@ private void DoNavigate(Uri source, Action navigationCallback, if (source == null) throw new ArgumentNullException(nameof(source)); - if (this.Region == null) + if (Region == null) throw new InvalidOperationException(Resources.NavigationServiceHasNoRegion); - this.currentNavigationContext = new NavigationContext(this, source, navigationParameters); + _currentNavigationContext = new NavigationContext(this, source, navigationParameters); // starts querying the active views RequestCanNavigateFromOnCurrentlyActiveView( - this.currentNavigationContext, + _currentNavigationContext, navigationCallback, - this.Region.ActiveViews.ToArray(), + Region.ActiveViews.ToArray(), 0); } @@ -139,8 +132,7 @@ private void RequestCanNavigateFromOnCurrentlyActiveView( { if (currentViewIndex < activeViews.Length) { - var vetoingView = activeViews[currentViewIndex] as IConfirmNavigationRequest; - if (vetoingView != null) + if (activeViews[currentViewIndex] is IConfirmNavigationRequest vetoingView) { // the current active view implements IConfirmNavigationRequest, request confirmation // providing a callback to resume the navigation request @@ -148,7 +140,7 @@ private void RequestCanNavigateFromOnCurrentlyActiveView( navigationContext, canNavigate => { - if (this.currentNavigationContext == navigationContext && canNavigate) + if (_currentNavigationContext == navigationContext && canNavigate) { RequestCanNavigateFromOnCurrentlyActiveViewModel( navigationContext, @@ -158,7 +150,7 @@ private void RequestCanNavigateFromOnCurrentlyActiveView( } else { - this.NotifyNavigationFailed(navigationContext, navigationCallback, null); + NotifyNavigationFailed(navigationContext, navigationCallback, null); } }); } @@ -183,13 +175,9 @@ private void RequestCanNavigateFromOnCurrentlyActiveViewModel( object[] activeViews, int currentViewIndex) { - var frameworkElement = activeViews[currentViewIndex] as FrameworkElement; - - if (frameworkElement != null) + if (activeViews[currentViewIndex] is FrameworkElement frameworkElement) { - var vetoingViewModel = frameworkElement.DataContext as IConfirmNavigationRequest; - - if (vetoingViewModel != null) + if (frameworkElement.DataContext is IConfirmNavigationRequest vetoingViewModel) { // the data model for the current active view implements IConfirmNavigationRequest, request confirmation // providing a callback to resume the navigation request @@ -197,7 +185,7 @@ private void RequestCanNavigateFromOnCurrentlyActiveViewModel( navigationContext, canNavigate => { - if (this.currentNavigationContext == navigationContext && canNavigate) + if (_currentNavigationContext == navigationContext && canNavigate) { RequestCanNavigateFromOnCurrentlyActiveView( navigationContext, @@ -207,7 +195,7 @@ private void RequestCanNavigateFromOnCurrentlyActiveViewModel( } else { - this.NotifyNavigationFailed(navigationContext, navigationCallback, null); + NotifyNavigationFailed(navigationContext, navigationCallback, null); } }); @@ -229,21 +217,21 @@ private void ExecuteNavigation(NavigationContext navigationContext, object[] act { NotifyActiveViewsNavigatingFrom(navigationContext, activeViews); - object view = this.regionNavigationContentLoader.LoadContent(this.Region, navigationContext); + object view = _regionNavigationContentLoader.LoadContent(Region, navigationContext); // Raise the navigating event just before activing the view. - this.RaiseNavigating(navigationContext); + RaiseNavigating(navigationContext); - this.Region.Activate(view); + Region.Activate(view); // Update the navigation journal before notifying others of navigaton - IRegionNavigationJournalEntry journalEntry = this.container.Resolve(); + IRegionNavigationJournalEntry journalEntry = _container.Resolve(); journalEntry.Uri = navigationContext.Uri; journalEntry.Parameters = navigationContext.Parameters; bool persistInHistory = PersistInHistory(view); - this.journal.RecordNavigation(journalEntry, persistInHistory); + Journal.RecordNavigation(journalEntry, persistInHistory); // The view can be informed of navigation Action action = (n) => n.OnNavigatedTo(navigationContext); @@ -252,11 +240,11 @@ private void ExecuteNavigation(NavigationContext navigationContext, object[] act navigationCallback(new NavigationResult(navigationContext, true)); // Raise the navigated event when navigation is completed. - this.RaiseNavigated(navigationContext); + RaiseNavigated(navigationContext); } catch (Exception e) { - this.NotifyNavigationFailed(navigationContext, navigationCallback, e); + NotifyNavigationFailed(navigationContext, navigationCallback, e); } } @@ -273,7 +261,7 @@ private void NotifyNavigationFailed(NavigationContext navigationContext, Action< e != null ? new NavigationResult(navigationContext, e) : new NavigationResult(navigationContext, false); navigationCallback(navigationResult); - this.RaiseNavigationFailed(navigationContext, e); + RaiseNavigationFailed(navigationContext, e); } private static void NotifyActiveViewsNavigatingFrom(NavigationContext navigationContext, object[] activeViews) diff --git a/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs b/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs index 2f4c613119..eddbb272cd 100644 --- a/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs +++ b/tests/Prism.Core.Tests/Ioc/ContainerLocatorFixture.cs @@ -21,7 +21,7 @@ public class ContainerLocatorFixture public void FactoryCreatesContainerExtension() { Assert.Null(Prism.Ioc.ContainerLocator.Current); - Prism.Ioc.ContainerLocator.SetContainerFactory(() => new MockContainerExtension()); + Prism.Ioc.ContainerLocator.SetContainerExtension(() => new MockContainerExtension()); Assert.NotNull(Prism.Ioc.ContainerLocator.Current); } @@ -30,7 +30,7 @@ public void ResetNullsCurrentContainer() { Prism.Ioc.ContainerLocator.ResetContainer(); Assert.Null(Prism.Ioc.ContainerLocator.Current); - Prism.Ioc.ContainerLocator.SetContainerFactory(() => new MockContainerExtension()); + Prism.Ioc.ContainerLocator.SetContainerExtension(() => new MockContainerExtension()); Assert.NotNull(Prism.Ioc.ContainerLocator.Current); Prism.Ioc.ContainerLocator.ResetContainer(); Assert.Null(Prism.Ioc.ContainerLocator.Current); @@ -43,10 +43,10 @@ public void FactoryOnlySetsContainerOnce() var container = new MockContainerExtension(); var container2 = new Mock2ContainerExtension(); - Prism.Ioc.ContainerLocator.SetContainerFactory(() => container); + Prism.Ioc.ContainerLocator.SetContainerExtension(() => container); Assert.Same(container, Prism.Ioc.ContainerLocator.Container); - Prism.Ioc.ContainerLocator.SetContainerFactory(() => container2); + Prism.Ioc.ContainerLocator.SetContainerExtension(() => container2); Assert.IsNotType(Prism.Ioc.ContainerLocator.Container); Assert.Same(container, Prism.Ioc.ContainerLocator.Container); } diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs index 6c9610b929..a011bd4f6a 100644 --- a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs +++ b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs @@ -20,7 +20,7 @@ public RegionNavigationContentLoaderFixture() _container.Register(typeof(IRegionNavigationContentLoader), RegionNavigationContentLoaderType); _container.Register(); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => _container); + ContainerLocator.SetContainerExtension(() => _container); } [StaFact] diff --git a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs index eb4cb7a6cb..8ac36ad470 100644 --- a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs +++ b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs @@ -16,7 +16,7 @@ public void ShouldForwardResolveToInnerContainer() var containerExtension = new DryIocContainerExtension(mockContainer.Object); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerExtension); + ContainerLocator.SetContainerExtension(() => containerExtension); var resolved = ContainerLocator.Container.Resolve(typeof(object)); mockContainer.Verify(c => c.Resolve(typeof(object), IfUnresolved.Throw)); diff --git a/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs b/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs index b65341b9b3..dc9143ea09 100644 --- a/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs +++ b/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/ContainerLocatorFixture.cs @@ -20,7 +20,7 @@ public void ShouldForwardResolveToInnerContainer() mockContainer.Setup(c => c.Resolve(typeof(object), null, It.IsAny())).Returns(myInstance); var containerExtension = new UnityContainerExtension(mockContainer.Object); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerExtension); + ContainerLocator.SetContainerExtension(() => containerExtension); var resolved = ContainerLocator.Container.Resolve(typeof(object)); mockContainer.Verify(c => c.Resolve(typeof(object), null, It.IsAny()), Times.Once); Assert.Same(myInstance, resolved); diff --git a/tests/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs b/tests/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs index 02fff265d8..0b863e451d 100644 --- a/tests/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs @@ -80,7 +80,7 @@ private static void CreateAndConfigureServiceLocatorForViewModelLocator() var container = new MockContainerAdapter(); container.ResolvedInstances.Add(typeof(MockViewModel), new MockViewModel()); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => container); + ContainerLocator.SetContainerExtension(() => container); } [Fact] @@ -153,7 +153,7 @@ private static void CreateAndConfigureServiceLocatorWithRegionAdapters() container.Setup(sl => sl.Resolve(typeof(ContentControlRegionAdapter))).Returns(new ContentControlRegionAdapter(regionBehaviorFactory)); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => container.Object); + ContainerLocator.SetContainerExtension(() => container.Object); } [Fact] @@ -175,7 +175,7 @@ private static void CreateAndConfigureServiceLocatorWithDefaultRegionBehaviors() containerExtension.Setup(sl => sl.Resolve(typeof(IRegionBehaviorFactory))).Returns(new RegionBehaviorFactory(containerExtension.Object)); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerExtension.Object); + ContainerLocator.SetContainerExtension(() => containerExtension.Object); } [Fact] diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs index 4ddcb10d31..b48bafb39b 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs @@ -52,7 +52,7 @@ public void ShouldGetRegisteredMapping_UsingGenericControlAndAdapter() containerMock.Setup(c => c.Resolve(typeof(MockRegionAdapter))) .Returns(regionAdapter); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerMock.Object); + ContainerLocator.SetContainerExtension(() => containerMock.Object); regionAdapterMappings.RegisterMapping(); diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs index 676dabfff2..6f3a8f0fde 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs @@ -552,7 +552,7 @@ public void NavigateDelegatesToIRegionNavigationService() var containerMock = new Mock(); containerMock.Setup(x => x.Resolve(typeof(IRegionNavigationService))).Returns(mockRegionNavigationService.Object); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerMock.Object); + ContainerLocator.SetContainerExtension(() => containerMock.Object); // Act region.RequestNavigate(uri, navigationCallback, navigationParameters); diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs index 2373fcbbfa..953852855a 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs @@ -344,7 +344,7 @@ public void CanRegisterViewType() }; var containerMock = new Mock(); containerMock.Setup(c => c.Resolve(typeof(IRegionViewRegistry))).Returns(mockRegionContentRegistry); - ContainerLocator.SetContainerFactory(() => containerMock.Object); + ContainerLocator.SetContainerExtension(() => containerMock.Object); var regionManager = new RegionManager(); @@ -380,7 +380,7 @@ public void CanRegisterViewTypeGeneric() var containerMock = new Mock(); containerMock.Setup(c => c.Resolve(typeof(IRegionViewRegistry))).Returns(mockRegionContentRegistry); ContainerLocator.ResetContainer(); - ContainerLocator.SetContainerFactory(() => containerMock.Object); + ContainerLocator.SetContainerExtension(() => containerMock.Object); var regionManager = new RegionManager(); @@ -417,7 +417,7 @@ public void CanRegisterDelegate() }; var containerMock = new Mock(); containerMock.Setup(c => c.Resolve(typeof(IRegionViewRegistry))).Returns(mockRegionContentRegistry); - ContainerLocator.SetContainerFactory(() => containerMock.Object); + ContainerLocator.SetContainerExtension(() => containerMock.Object); var regionManager = new RegionManager();