Prism v9.0.271-pre Navigation Region Tests

Upgrading-Prism.md

@@ -38,7 +38,9 @@ As we all know, not everything is straight forward between these two XAML techno
 ### Changes
 
 * `Samples` folder renamed to `e2e`
-* Prism.Dialogs - _See section for more info_
+* Prism.Dialogs
+  * _Various updates, see section before for more info_
+* `NavigationResult` returns the property `Success` instead of `Result`
 
 #### Dialogs
 
@@ -112,6 +114,13 @@ As we all know, not everything is straight forward between these two XAML techno
 | RegionManagerRequestNavigateFixture.cs
 | RegionViewRegistryFixture.cs
 
+### Future Feature Work To Add
+
+| Project | Class |
+|-|-|
+| Prism.Avalonia.Tests | ItemsControlRegionAdapterFixture
+| Prism.Avalonia.Tests | SelectorRegionAdapterFixture
+
 ## Upgrading from Prism 7.2 to 8.1
 
 * Basis of comparison: [Prism Library v7.2.0.1422...v8.1.97](https://github.com/PrismLibrary/Prism/compare/v7.2.0.1422...v8.1.97)

src/Prism.Avalonia/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs

@@ -64,12 +64,12 @@ private static void ClearChildViews(IRegion region)
         {
             foreach (var view in region.Views)
             {
-                AvaloniaObject dependencyObject = view as AvaloniaObject;
-                if (dependencyObject != null)
+                AvaloniaObject avaloniaObject = view as AvaloniaObject;
+                if (avaloniaObject != null)
                 {
-                    if (GetClearChildViews(dependencyObject))
+                    if (GetClearChildViews(avaloniaObject))
                     {
-                        dependencyObject.ClearValue(RegionManager.RegionManagerProperty);
+                        avaloniaObject.ClearValue(RegionManager.RegionManagerProperty);
                     }
                 }
             }

src/Prism.Avalonia/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs

@@ -53,6 +53,7 @@ public AvaloniaObject HostControl
                 {
                     throw new InvalidOperationException(Resources.HostControlCannotBeSetAfterAttach);
                 }
+
                 hostControl = value;
             }
         }
@@ -126,16 +127,16 @@ public void OnUpdatingRegions(object sender, EventArgs e)
             TryRegisterRegion();
         }
 
-        private IRegionManager FindRegionManager(AvaloniaObject dependencyObject)
+        private IRegionManager FindRegionManager(AvaloniaObject avaloniaObject)
         {
-            var regionmanager = RegionManagerAccessor.GetRegionManager(dependencyObject);
+            var regionmanager = RegionManagerAccessor.GetRegionManager(avaloniaObject);
             if (regionmanager != null)
             {
                 return regionmanager;
             }
 
             //TODO: this is should be ok in Avalonia. I have to test it
-            AvaloniaObject parent = ((dependencyObject as Visual)?.GetVisualParent() ?? null) as AvaloniaObject;
+            AvaloniaObject parent = ((avaloniaObject as Visual)?.GetVisualParent() ?? null) as AvaloniaObject;
             if (parent != null)
             {
                 return FindRegionManager(parent);

src/Prism.Avalonia/Navigation/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs

@@ -18,7 +18,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
-using System.Windows.Controls.Primitives;
+using Avalonia.Controls.Primitives;
 
 namespace Prism.Navigation.Regions.Behaviors
 {

src/Prism.Avalonia/Navigation/Regions/Region.cs

@@ -207,7 +207,7 @@ protected virtual ObservableCollection<ItemMetadata> ItemMetadataCollection
         /// <overloads>Adds a new view to the region.</overloads>
         /// <summary>Adds a new view to the region.</summary>
         /// <param name="viewName">The view to add.</param>
-        /// <returns>The <see cref="IRegionManager"/> that is set on the view if it is a <see cref="DependencyObject"/>. It will be the current region manager when using this overload.</returns>
+        /// <returns>The <see cref="IRegionManager"/> that is set on the view if it is a <see cref="AvaloniaObject"/>. It will be the current region manager when using this overload.</returns>
         public IRegionManager Add(string viewName)
         {
             var view = ContainerLocator.Container.Resolve<object>(viewName);

tests/Avalonia/Prism.Avalonia.Tests/Mocks/MockDependencyObject.cs

@@ -1,8 +1,9 @@
-using Avalonia;
+using Avalonia;
 
 namespace Prism.Avalonia.Tests.Mocks
 {
     /// <summary>MockAvaloniaObject.</summary>
+    /// <remarks>TODO: Rename to MockAvaloniaObject.</remarks>
     public class MockDependencyObject : AvaloniaObject
     {
     }

tests/Avalonia/Prism.Avalonia.Tests/Mocks/MockPresentationRegion.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace Prism.Avalonia.Tests.Mocks
 {
@@ -11,6 +11,9 @@ public MockPresentationRegion()
         {
             Behaviors = new MockRegionBehaviorCollection();
         }
+
+        public IRegionManager Add(string viewName) => throw new NotImplementedException();
+
         public IRegionManager Add(object view)
         {
             MockViews.Items.Add(view);
@@ -74,7 +77,7 @@ public object Context
             }
         }
 
-        public NavigationParameters NavigationParameters
+        public INavigationParameters NavigationParameters
         {
             get { throw new System.NotImplementedException(); }
             set { throw new System.NotImplementedException(); }
@@ -83,22 +86,19 @@ public NavigationParameters NavigationParameters
         private string name;
         public string Name
         {
-            get { return this.name; }
+            get { return name; }
             set
             {
-                this.name = value;
-                this.OnPropertyChange("Name");
+                name = value;
+                OnPropertyChange("Name");
             }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
         public void OnPropertyChange(string propertyName)
         {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         public bool Navigate(Uri source)
@@ -111,7 +111,7 @@ public void RequestNavigate(Uri target, Action<NavigationResult> navigationCallb
             throw new NotImplementedException();
         }
 
-        public void RequestNavigate(Uri target, Action<NavigationResult> navigationCallback, NavigationParameters navigationParameters)
+        public void RequestNavigate(Uri target, Action<NavigationResult> navigationCallback, INavigationParameters navigationParameters)
         {
             throw new NotImplementedException();
         }
@@ -127,7 +127,6 @@ public IRegionNavigationService NavigationService
             set { throw new System.NotImplementedException(); }
         }
 
-
         public Comparison<object> SortComparison
         {
             get

tests/Avalonia/Prism.Avalonia.Tests/Mocks/MockRegion.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace Prism.Avalonia.Tests.Mocks
 {
@@ -26,14 +26,16 @@ public object Context
             set { throw new System.NotImplementedException(); }
         }
 
-        public NavigationParameters NavigationParameters
+        public INavigationParameters NavigationParameters
         {
             get { throw new System.NotImplementedException(); }
             set { throw new System.NotImplementedException(); }
         }
 
         public string Name { get; set; }
 
+        public IRegionManager Add(string viewName) => throw new NotImplementedException();
+
         public IRegionManager Add(object view)
         {
             this.views.Add(view);
@@ -87,7 +89,7 @@ public void RequestNavigate(System.Uri target, System.Action<NavigationResult> n
             throw new System.NotImplementedException();
         }
 
-        public void RequestNavigate(System.Uri target, System.Action<NavigationResult> navigationCallback, NavigationParameters navigationParameters)
+        public void RequestNavigate(System.Uri target, System.Action<NavigationResult> navigationCallback, INavigationParameters navigationParameters)
         {
             throw new System.NotImplementedException();
         }

tests/Avalonia/Prism.Avalonia.Tests/Mocks/MockRegionAdapter.cs

@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 
 namespace Prism.Avalonia.Tests.Mocks
 {

tests/Avalonia/Prism.Avalonia.Tests/Mocks/MockRegionManager.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 
 namespace Prism.Avalonia.Tests.Mocks
 {
@@ -33,7 +33,7 @@ public IRegionManager RegisterViewWithRegion(string regionName, Type viewType)
             throw new NotImplementedException();
         }
 
-        public IRegionManager RegisterViewWithRegion(string regionName, Func<object> getContentDelegate)
+        public IRegionManager RegisterViewWithRegion(string regionName, Func<IContainerProvider, object> getContentDelegate)
         {
             throw new NotImplementedException();
         }
@@ -58,22 +58,22 @@ public void RequestNavigate(string regionName, string source)
             throw new NotImplementedException();
         }
 
-        public void RequestNavigate(string regionName, Uri target, Action<NavigationResult> navigationCallback, NavigationParameters navigationParameters)
+        public void RequestNavigate(string regionName, Uri target, Action<NavigationResult> navigationCallback, INavigationParameters navigationParameters)
         {
             throw new NotImplementedException();
         }
 
-        public void RequestNavigate(string regionName, string target, Action<NavigationResult> navigationCallback, NavigationParameters navigationParameters)
+        public void RequestNavigate(string regionName, string target, Action<NavigationResult> navigationCallback, INavigationParameters navigationParameters)
         {
             throw new NotImplementedException();
         }
 
-        public void RequestNavigate(string regionName, Uri target, NavigationParameters navigationParameters)
+        public void RequestNavigate(string regionName, Uri target, INavigationParameters navigationParameters)
         {
             throw new NotImplementedException();
         }
 
-        public void RequestNavigate(string regionName, string target, NavigationParameters navigationParameters)
+        public void RequestNavigate(string regionName, string target, INavigationParameters navigationParameters)
         {
             throw new NotImplementedException();
         }