Rename BaseHandlerTest -> BaseViewTest

TheCodeTraveler · TheCodeTraveler · commit c3c79ba9f3c1 · 2025-06-22T16:24:05.000-07:00
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -61,4 +61,4 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		var cameraView = (CameraView)bindable;
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
-}
+}
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs
@@ -173,8 +173,8 @@ void SetSystemBarsVisibility()
 					| SystemUiFlags.Fullscreen
 					| SystemUiFlags.Immersive;
 			}
-			
-			if(windowInsetsControllerCompat is not null)
+
+			if (windowInsetsControllerCompat is not null)
 			{
 				windowInsetsControllerCompat.Hide(barTypes);
 				windowInsetsControllerCompat.SystemBarsBehavior = WindowInsetsControllerCompat.BehaviorShowTransientBarsBySwipe;
@@ -195,12 +195,12 @@ void SetSystemBarsVisibility()
 				currentWindow.DecorView.SystemUiFlags = (SystemUiFlags)defaultSystemUiVisibility;
 			}
 
-			if(windowInsetsControllerCompat is not null)
+			if (windowInsetsControllerCompat is not null)
 			{
 				windowInsetsControllerCompat.Show(barTypes);
 				windowInsetsControllerCompat.SystemBarsBehavior = WindowInsetsControllerCompat.BehaviorDefault;
 			}
-			
+
 			WindowCompat.SetDecorFitsSystemWindows(currentWindow, true);
 		}
 	}
diff --git a/src/CommunityToolkit.Maui.UnitTests/BaseViewTest.cs b/src/CommunityToolkit.Maui.UnitTests/BaseViewTest.cs
@@ -1,15 +1,13 @@
 ﻿using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.UnitTests.Mocks;
 using CommunityToolkit.Maui.UnitTests.Services;
 using FluentAssertions;
-using Xunit;
 
 namespace CommunityToolkit.Maui.UnitTests;
 
-public abstract class BaseHandlerTest : BaseTest
+public abstract class BaseViewTest : BaseTest
 {
-	protected BaseHandlerTest()
+	protected BaseViewTest()
 	{
 		InitializeServicesAndSetMockApplication(out var serviceProvider);
 		ServiceProvider = serviceProvider;
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/BaseConverterTest.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/BaseConverterTest.cs
@@ -45,7 +45,7 @@ public void InvalidConvertBackValue_ShouldSuppressExceptionsInConverters_ShouldR
 	}
 }
 
-public abstract class ConverterTest<TConverter> : BaseHandlerTest where TConverter : ICommunityToolkitValueConverter, new()
+public abstract class ConverterTest<TConverter> : BaseViewTest where TConverter : ICommunityToolkitValueConverter, new()
 {
 	[Fact]
 	public void InvalidConvertValue_ShouldThrowException()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/AppThemeTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/AppThemeTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Essentials;
 
-public class AppThemeTests : BaseHandlerTest
+public class AppThemeTests : BaseViewTest
 {
 	readonly Label label = new();
 	readonly Window window;
diff --git a/src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs
@@ -9,7 +9,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Extensions;
 
-public class PopupExtensionsTests : BaseHandlerTest
+public class PopupExtensionsTests : BaseViewTest
 {
 	const string shellParameterViewModelTextValue = "Hello World";
 	static readonly Color shellParameterBackgroundColorValue = Colors.Green;
diff --git a/src/CommunityToolkit.Maui.UnitTests/ImageSources/GravatarImageSource/GravatarImageSourceTests.cs b/src/CommunityToolkit.Maui.UnitTests/ImageSources/GravatarImageSource/GravatarImageSourceTests.cs
@@ -4,7 +4,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.ImageSources;
 
-public class GravatarImageSourceTests : BaseHandlerTest
+public class GravatarImageSourceTests : BaseViewTest
 {
 	readonly TimeSpan cacheValidity = new(1, 0, 0);
 	readonly bool cachingEnabled = false;
diff --git a/src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs
@@ -7,7 +7,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Services;
 
-public class PopupServiceTests : BaseHandlerTest
+public class PopupServiceTests : BaseViewTest
 {
 	readonly INavigation navigation;
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewImageTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewImageTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class AvatarViewImageTests : BaseHandlerTest
+public class AvatarViewImageTests : BaseViewTest
 {
 	public AvatarViewImageTests()
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewInterfaceTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewInterfaceTests.cs
@@ -4,7 +4,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class AvatarViewInterfaceTests : BaseHandlerTest
+public class AvatarViewInterfaceTests : BaseViewTest
 {
 	public AvatarViewInterfaceTests()
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewTests.cs
@@ -6,7 +6,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class AvatarViewTests : BaseHandlerTest
+public class AvatarViewTests : BaseViewTest
 {
 	public AvatarViewTests()
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class CameraViewTests : BaseHandlerTest
+public class CameraViewTests : BaseViewTest
 {
 	readonly CameraView cameraView = new();
 	readonly MockCameraProvider mockCameraProvider;
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineCompletedEventArgsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineCompletedEventArgsTests.cs
@@ -6,7 +6,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class DrawingLineCompletedEventArgsTests : BaseHandlerTest
+public class DrawingLineCompletedEventArgsTests : BaseViewTest
 {
 	[Fact]
 	public void DrawingLineShouldBeEqualInDrawingLineCompletedEventArgs()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class DrawingLineTests : BaseHandlerTest
+public class DrawingLineTests : BaseViewTest
 {
 	readonly IDrawingLine drawingLine = new DrawingLine();
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs
@@ -9,7 +9,7 @@
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
 [Collection(nameof(DrawingViewTests)), CollectionDefinition(nameof(DrawingViewTests), DisableParallelization = true)]
-public class DrawingViewTests(ITestOutputHelper testOutputHelper) : BaseHandlerTest
+public class DrawingViewTests(ITestOutputHelper testOutputHelper) : BaseViewTest
 {
 	[Fact]
 	public void DrawingViewShouldBeAssignedToIDrawingView()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineCompletedEventArgsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineCompletedEventArgsTests.cs
@@ -6,7 +6,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class MauiDrawingLineCompletedEventArgsTests : BaseHandlerTest
+public class MauiDrawingLineCompletedEventArgsTests : BaseViewTest
 {
 	[Fact]
 	public void MauiDrawingLineShouldBeEqualInMauiDrawingLineCompletedEventArgs()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class MauiDrawingLineTests : BaseHandlerTest
+public class MauiDrawingLineTests : BaseViewTest
 {
 	readonly MauiDrawingLine drawingLine = new();
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingViewTests.cs
@@ -4,7 +4,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class MauiDrawingViewTests : BaseHandlerTest
+public class MauiDrawingViewTests : BaseViewTest
 {
 	readonly MauiDrawingView drawingView = new();
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpandedChangedEventArgsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpandedChangedEventArgsTests.cs
@@ -4,7 +4,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class ExpandedChangedEventArgsTests : BaseHandlerTest
+public class ExpandedChangedEventArgsTests : BaseViewTest
 {
 	[Theory]
 	[InlineData(true)]
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpanderTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpanderTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class ExpanderTests : BaseHandlerTest
+public class ExpanderTests : BaseViewTest
 {
 	readonly Maui.Views.Expander expander = new();
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/LazyView/LazyViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/LazyView/LazyViewTests.cs
@@ -3,7 +3,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class LazyViewTests : BaseHandlerTest
+public class LazyViewTests : BaseViewTest
 {
 	[Fact]
 	public void CheckHasLoadedFalseAfterConstruction()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/MediaElement/MediaElementTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/MediaElement/MediaElementTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class MediaElementTests : BaseHandlerTest
+public class MediaElementTests : BaseViewTest
 {
 	public MediaElementTests()
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/MediaElement/ParentWindowTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/MediaElement/ParentWindowTests.cs
@@ -5,7 +5,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class ParentWindowTests : BaseHandlerTest
+public class ParentWindowTests : BaseViewTest
 {
 	[Fact]
 	public void Exists_WhenParentWindowIsNull_ReturnsFalse()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
@@ -11,7 +11,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class PopupPageTests : BaseHandlerTest
+public class PopupPageTests : BaseViewTest
 {
 	[Fact]
 	public void Constructor_ShouldThrowArgumentNullException_WhenPopupIsNull()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
@@ -7,7 +7,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class PopupTests : BaseHandlerTest
+public class PopupTests : BaseViewTest
 {
 	[Fact]
 	public void PopupBackgroundColor_DefaultValue_ShouldBeWhite()
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/RatingView/RatingViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/RatingView/RatingViewTests.cs
@@ -9,7 +9,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class RatingViewTests : BaseHandlerTest
+public class RatingViewTests : BaseViewTest
 {
 	const string customShape = "M 12 0C5.388 0 0 5.388 0 12s5.388 12 12 12 12-5.38 12-12c0-6.612-5.38-12-12-12z";
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
@@ -4,7 +4,7 @@
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class SemanticOrderViewTests : BaseHandlerTest
+public class SemanticOrderViewTests : BaseViewTest
 {
 	readonly ISemanticOrderView semanticOrderView = new MockSemanticOrderView();
 
diff --git a/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs b/src/CommunityToolkit.Maui/Extensions/AppThemeResourceExtension.shared.cs
@@ -102,21 +102,21 @@ static bool TryFindResourceInVisualElement(object element, string key, [NotNullW
 		{
 			// Walk up the element tree to try to find the resource
 			case Element elementObj:
-			{
-				var parent = elementObj.Parent;
-				while (parent is not null)
 				{
-					if (parent is IResourcesProvider { IsResourcesCreated: true } parentProvider
-					    && parentProvider.Resources.TryGetValue(key, out resource))
+					var parent = elementObj.Parent;
+					while (parent is not null)
 					{
-						return true;
+						if (parent is IResourcesProvider { IsResourcesCreated: true } parentProvider
+							&& parentProvider.Resources.TryGetValue(key, out resource))
+						{
+							return true;
+						}
+
+						parent = parent.Parent;
 					}
 
-					parent = parent.Parent;
+					break;
 				}
-
-				break;
-			}
 			// If it's a ResourceDictionary, check it directly
 			case ResourceDictionary dict when dict.TryGetValue(key, out resource):
 				return true;

Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,4 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)`
`61`	`61`	`var cameraView = (CameraView)bindable;`
`62`	`62`	`return new Command(_ => cameraView.StopCameraPreview());`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ void SetSystemBarsVisibility()`
`173`	`173`	`\| SystemUiFlags.Fullscreen`
`174`	`174`	`\| SystemUiFlags.Immersive;`
`175`	`175`	`}`
`176`		`-`
`177`		`- if(windowInsetsControllerCompat is not null)`
	`176`	`+`
	`177`	`+ if (windowInsetsControllerCompat is not null)`
`178`	`178`	`{`
`179`	`179`	`windowInsetsControllerCompat.Hide(barTypes);`
`180`	`180`	`windowInsetsControllerCompat.SystemBarsBehavior = WindowInsetsControllerCompat.BehaviorShowTransientBarsBySwipe;`
`@@ -195,12 +195,12 @@ void SetSystemBarsVisibility()`
`195`	`195`	`currentWindow.DecorView.SystemUiFlags = (SystemUiFlags)defaultSystemUiVisibility;`
`196`	`196`	`}`
`197`	`197`
`198`		`- if(windowInsetsControllerCompat is not null)`
	`198`	`+ if (windowInsetsControllerCompat is not null)`
`199`	`199`	`{`
`200`	`200`	`windowInsetsControllerCompat.Show(barTypes);`
`201`	`201`	`windowInsetsControllerCompat.SystemBarsBehavior = WindowInsetsControllerCompat.BehaviorDefault;`
`202`	`202`	`}`
`203`		`-`
	`203`	`+`
`204`	`204`	`WindowCompat.SetDecorFitsSystemWindows(currentWindow, true);`
`205`	`205`	`}`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void InvalidConvertBackValue_ShouldSuppressExceptionsInConverters_ShouldR`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-public abstract class ConverterTest<TConverter> : BaseHandlerTest where TConverter : ICommunityToolkitValueConverter, new()`
	`48`	`+public abstract class ConverterTest<TConverter> : BaseViewTest where TConverter : ICommunityToolkitValueConverter, new()`
`49`	`49`	`{`
`50`	`50`	`[Fact]`
`51`	`51`	`public void InvalidConvertValue_ShouldThrowException()`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace CommunityToolkit.Maui.UnitTests.Essentials;`
`7`	`7`
`8`		`-public class AppThemeTests : BaseHandlerTest`
	`8`	`+public class AppThemeTests : BaseViewTest`
`9`	`9`	`{`
`10`	`10`	`readonly Label label = new();`
`11`	`11`	`readonly Window window;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace CommunityToolkit.Maui.UnitTests.Extensions;`
`11`	`11`
`12`		`-public class PopupExtensionsTests : BaseHandlerTest`
	`12`	`+public class PopupExtensionsTests : BaseViewTest`
`13`	`13`	`{`
`14`	`14`	`const string shellParameterViewModelTextValue = "Hello World";`
`15`	`15`	`static readonly Color shellParameterBackgroundColorValue = Colors.Green;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace CommunityToolkit.Maui.UnitTests.ImageSources;`
`6`	`6`
`7`		`-public class GravatarImageSourceTests : BaseHandlerTest`
	`7`	`+public class GravatarImageSourceTests : BaseViewTest`
`8`	`8`	`{`
`9`	`9`	`readonly TimeSpan cacheValidity = new(1, 0, 0);`
`10`	`10`	`readonly bool cachingEnabled = false;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace CommunityToolkit.Maui.UnitTests.Services;`
`9`	`9`
`10`		`-public class PopupServiceTests : BaseHandlerTest`
	`10`	`+public class PopupServiceTests : BaseViewTest`
`11`	`11`	`{`
`12`	`12`	`readonly INavigation navigation;`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace CommunityToolkit.Maui.UnitTests.Views;`
`7`	`7`
`8`		`-public class AvatarViewImageTests : BaseHandlerTest`
	`8`	`+public class AvatarViewImageTests : BaseViewTest`
`9`	`9`	`{`
`10`	`10`	`public AvatarViewImageTests()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace CommunityToolkit.Maui.UnitTests.Views;`
`6`	`6`
`7`		`-public class AvatarViewInterfaceTests : BaseHandlerTest`
	`7`	`+public class AvatarViewInterfaceTests : BaseViewTest`
`8`	`8`	`{`
`9`	`9`	`public AvatarViewInterfaceTests()`
`10`	`10`	`{`