- added additional tests

Author: PureWeen

src/Controls/tests/DeviceTests/Elements/VisualElementTree/FindVisualTreeElementInsideTestCase.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Xunit.Abstractions;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public class FindVisualTreeElementInsideTestCase : IXunitSerializable
+	{
+		VisualElement _visualElement;
+		public VisualElement VisualElement => _visualElement ??= CreateVisualElement();
+		public VisualElement ViewToLocate { get; private set; }
+
+		public string TestCaseName { get; private set; }
+
+		public FindVisualTreeElementInsideTestCase() { }
+
+		public FindVisualTreeElementInsideTestCase(string testCaseName)
+		{
+			TestCaseName = testCaseName;
+		}
+
+		public void Deserialize(IXunitSerializationInfo info)
+		{
+			TestCaseName = info.GetValue<string>(nameof(TestCaseName));
+		}
+
+		public void Serialize(IXunitSerializationInfo info)
+		{
+			info.AddValue(nameof(TestCaseName), TestCaseName, typeof(string));
+		}
+
+		public override string ToString()
+		{
+			return TestCaseName;
+		}
+
+		private VisualElement CreateVisualElement()
+		{
+			switch (TestCaseName)
+			{
+				case "CollectionView":
+					{
+						var cv = new CollectionView();
+						NestingView view = new NestingView();
+						ViewToLocate = view;
+						cv.ItemTemplate = new DataTemplate(() =>
+						{
+							return view;
+						});
+						cv.ItemsSource = new[] { 0 };
+						return cv;
+					}
+				case "ContentView":
+					{
+						var contentView = new ContentView();
+						NestingView view = new NestingView();
+						ViewToLocate = view;
+						contentView.ControlTemplate = new ControlTemplate(() =>
+						{
+							return view;
+						});
+						return contentView;
+					}
+			}
+
+			throw new Exception(String.Concat(TestCaseName, " ", "Not Found"));
+		}
+	}
+
+	public class FindVisualTreeElementInsideTestCases : IEnumerable<object[]>
+	{
+		private readonly List<object[]> _data = new()
+			{
+				new object[] { new FindVisualTreeElementInsideTestCase("CollectionView") },
+				new object[] { new FindVisualTreeElementInsideTestCase("ContentView") }
+			};
+
+		public IEnumerator<object[]> GetEnumerator()
+			=> _data.GetEnumerator();
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+	}
+}

src/Controls/tests/DeviceTests/Elements/VisualElementTreeTests.cs renamed to src/Controls/tests/DeviceTests/Elements/VisualElementTree/VisualElementTreeTests.cs

@@ -7,6 +7,8 @@
 using Microsoft.Maui.Platform;
 using Xunit;
 using System.Collections.Generic;
+using ContentView = Microsoft.Maui.Controls.ContentView;
+using Microsoft.Maui.Controls.Handlers.Items;
 #if ANDROID || IOS || MACCATALYST
 using ShellHandler = Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer;
 #endif
@@ -23,31 +25,18 @@ void SetupBuilder()
 		{
 			EnsureHandlerCreated(builder =>
 			{
+				builder.SetupShellHandlers();
+
 				builder.ConfigureMauiHandlers(handlers =>
 				{
-					handlers.AddHandler(typeof(Controls.Shell), typeof(ShellHandler));
 #if IOS || MACCATALYST
 					handlers.AddHandler(typeof(Controls.NavigationPage), typeof(Controls.Handlers.Compatibility.NavigationRenderer));
 #else
 					handlers.AddHandler(typeof(Controls.NavigationPage), typeof(NavigationViewHandler));
 #endif
-					handlers.AddHandler<Layout, LayoutHandler>();
-					handlers.AddHandler<Image, ImageHandler>();
-					handlers.AddHandler<Label, LabelHandler>();
-					handlers.AddHandler<Page, PageHandler>();
-					handlers.AddHandler<Toolbar, ToolbarHandler>();
-					handlers.AddHandler<MenuBar, MenuBarHandler>();
-					handlers.AddHandler<MenuBarItem, MenuBarItemHandler>();
-					handlers.AddHandler<MenuFlyoutItem, MenuFlyoutItemHandler>();
-					handlers.AddHandler<MenuFlyoutSubItem, MenuFlyoutSubItemHandler>();
-					handlers.AddHandler<Button, ButtonHandler>();
-					handlers.AddHandler<ScrollView, ScrollViewHandler>();
 					handlers.AddHandler<NestingView, NestingViewHandler>();
-#if WINDOWS
-					handlers.AddHandler<ShellItem, ShellItemHandler>();
-					handlers.AddHandler<ShellSection, ShellSectionHandler>();
-					handlers.AddHandler<ShellContent, ShellContentHandler>();
-#endif
+					handlers.AddHandler<ContentView, ContentViewHandler>();
+					handlers.AddHandler<CollectionView, CollectionViewHandler>();
 				});
 			});
 		}
@@ -203,5 +192,19 @@ await CreateHandlerAndAddToWindow<NestingViewHandler>(view, (handler) =>
 					Assert.Null(foundTreeElement);
 			});
 		}
+
+		[Theory]
+		[ClassData(typeof(FindVisualTreeElementInsideTestCases))]
+		public async Task FindPlatformViewInsideView(FindVisualTreeElementInsideTestCase testCase)
+		{
+			SetupBuilder();
+
+			await CreateHandlerAndAddToWindow(testCase.VisualElement, () =>
+			{
+				var platformView = testCase.ViewToLocate.ToPlatform();
+				var foundTreeElement = platformView.GetVisualTreeElement();
+				Assert.Equal(testCase.ViewToLocate, foundTreeElement);
+			});
+		}
 	}
 }