Add public Border PopupBorder { get; } and simplify unit tests

Author: TheCodeTraveler

src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs

@@ -192,7 +192,7 @@ public void ShowPopupAsync_WithViewType_SetsCorrectDefaults()
 		navigation.ShowPopup(label);
 
 		popupPage = (PopupPage)navigation.ModalStack[0];
-		autogeneratedPopup = (Popup)(((Border)popupPage.Content.Children.Last()).Content ?? throw new InvalidOperationException("Border Content cannot be null"));
+		autogeneratedPopup = (Popup)(popupPage.Content.PopupBorder.Content ?? throw new InvalidOperationException("Border Content cannot be null"));
 
 		// Assert
 		Assert.Equal(PopupDefaults.BackgroundColor, autogeneratedPopup.BackgroundColor);
@@ -435,7 +435,7 @@ public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Children.OfType<Border>().Single();
+		var border = popupPageContent.PopupBorder;
 		var popup = border.Content;
 
 		// Assert
@@ -507,7 +507,7 @@ public void ShowPopupAsync_Shell_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)shellNavigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Children.OfType<Border>().Single();
+		var border = popupPageContent.PopupBorder;
 		var popup = border.Content;
 
 		// Assert
@@ -579,7 +579,7 @@ public void ShowPopupAsyncWithView_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Children.OfType<Border>().Single();
+		var border = popupPageContent.PopupBorder;
 		var popup = (Popup)(border.Content ?? throw new InvalidCastException());
 
 		// Assert
@@ -660,7 +660,7 @@ public void ShowPopupAsyncWithView_Shell_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)shellNavigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Children.OfType<Border>().Single();
+		var border = popupPageContent.PopupBorder;
 		var popup = (Popup)(border.Content ?? throw new InvalidCastException());
 
 		// Assert

src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs

@@ -166,7 +166,7 @@ public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageLayout = popupPage.Content;
-		var border = popupPageLayout.Children.OfType<Border>().Single();
+		var border = popupPageLayout.PopupBorder;
 		var popup = border.Content;
 
 		// Assert

src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs

@@ -481,7 +481,7 @@ public void PopupPage_ShouldRespectLayoutOptions()
 
 		// Act
 		var popupPage = new PopupPage(view, PopupOptions.Empty);
-		var border = popupPage.Content.Children.OfType<Border>().Single();
+		var border = popupPage.Content.PopupBorder;
 
 		// Assert
 		Assert.Equal(LayoutOptions.Start, border.VerticalOptions);

src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs

@@ -188,29 +188,31 @@ public PopupPageLayout(in Popup popupContent, in IPopupOptions options, in IComm
 			tappableBackground.GestureRecognizers.Add(new TapGestureRecognizer { Command = tapOutsideOfPopupCommand });
 			Children.Add(tappableBackground); // Add the Tappable Background to the PopupPageLayout Grid before adding the Border to ensure the Border is displayed on top
 
-			var border = new Border
+			PopupBorder = new Border
 			{
 				BackgroundColor = popupContent.BackgroundColor ??= PopupDefaults.BackgroundColor,
 				Content = popupContent
 			};
 
 			// Bind `Popup` values through to Border using OneWay Bindings 
-			border.SetBinding(Border.MarginProperty, static (Popup popup) => popup.Margin, source: popupContent, mode: BindingMode.OneWay);
-			border.SetBinding(Border.PaddingProperty, static (Popup popup) => popup.Padding, source: popupContent, mode: BindingMode.OneWay);
-			border.SetBinding(Border.BackgroundProperty, static (Popup popup) => popup.Background, source: popupContent, mode: BindingMode.OneWay);
-			border.SetBinding(Border.BackgroundColorProperty, static (Popup popup) => popup.BackgroundColor, source: popupContent, mode: BindingMode.OneWay);
-			border.SetBinding(Border.VerticalOptionsProperty, static (Popup popup) => popup.VerticalOptions, source: popupContent, mode: BindingMode.OneWay);
-			border.SetBinding(Border.HorizontalOptionsProperty, static (Popup popup) => popup.HorizontalOptions, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.MarginProperty, static (Popup popup) => popup.Margin, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.PaddingProperty, static (Popup popup) => popup.Padding, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.BackgroundProperty, static (Popup popup) => popup.Background, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.BackgroundColorProperty, static (Popup popup) => popup.BackgroundColor, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.VerticalOptionsProperty, static (Popup popup) => popup.VerticalOptions, source: popupContent, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.HorizontalOptionsProperty, static (Popup popup) => popup.HorizontalOptions, source: popupContent, mode: BindingMode.OneWay);
 
 			// Bind `PopupOptions` values through to Border using OneWay Bindings
-			border.SetBinding(Border.ShadowProperty, static (IPopupOptions options) => options.Shadow, source: options, mode: BindingMode.OneWay);
-			border.SetBinding(Border.StrokeProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeConverter(), mode: BindingMode.OneWay);
-			border.SetBinding(Border.StrokeShapeProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay);
-			border.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeThicknessConverter(), mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.ShadowProperty, static (IPopupOptions options) => options.Shadow, source: options, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.StrokeProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeConverter(), mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.StrokeShapeProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay);
+			PopupBorder.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeThicknessConverter(), mode: BindingMode.OneWay);
 
-			Children.Add(border);
+			Children.Add(PopupBorder);
 		}
 
+		public Border PopupBorder { get; }
+
 		sealed partial class BorderStrokeThicknessConverter : BaseConverterOneWay<Shape?, double>
 		{
 			public override double DefaultConvertReturnValue { get; set; } = PopupOptionsDefaults.BorderStrokeThickness;