From 4f52615f33c2fb7e3997b3027fc167abbc6c7fac Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Thu, 26 Sep 2024 01:11:45 +0200
Subject: [PATCH] [UITesting] Moved
 ButtonHandler.ImageSourceInitializesCorrectly to appium

---
 .../TestCases.HostApp/Issues/Issue24916.xaml  | 32 +++++++++++++++++++
 .../Issues/Issue24916.xaml.cs                 | 12 +++++++
 .../Tests/Issues/Issue24916.cs                | 21 ++++++++++++
 .../Handlers/Button/ButtonHandlerTests.cs     | 21 ------------
 .../ImageButton/ImageButtonHandlerTests.cs    | 25 ---------------
 5 files changed, 65 insertions(+), 46 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24916.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml
new file mode 100644
index 000000000000..d8b80964a9b5
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue24916"
+             Title="Issue 24916">
+    <ContentPage.Resources>
+        <Style TargetType="Button">
+            <Setter Property="WidthRequest"
+                    Value="100"/>
+            <Setter Property="HeightRequest"
+                    Value="100"/>
+            <Setter Property="BackgroundColor"
+                    Value="Black"/>
+        </Style>
+        <Style TargetType="ImageButton">
+            <Setter Property="WidthRequest"
+                    Value="100"/>
+            <Setter Property="HeightRequest"
+                    Value="100"/>
+            <Setter Property="BackgroundColor"
+                    Value="Black"/>
+        </Style>
+    </ContentPage.Resources>
+    <VerticalStackLayout>
+        <Label Text="Buttons:" AutomationId="label"/>
+        <Button ImageSource="oasis.png"/>
+        <Button ImageSource="dotnet_bot.png"/>
+        <Label Text="Image buttons:"/>
+        <ImageButton Source="oasis.png"/>
+        <ImageButton Source="dotnet_bot.png"/>
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml.cs
new file mode 100644
index 000000000000..21ae9c300b13
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24916.xaml.cs
@@ -0,0 +1,12 @@
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 24916, "Image Source in Button initializes correctly", PlatformAffected.All)]
+	public partial class Issue24916 : ContentPage
+	{
+		public Issue24916()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24916.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24916.cs
new file mode 100644
index 000000000000..4c2e29be2d5d
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24916.cs
@@ -0,0 +1,21 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue24916 : _IssuesUITest
+	{
+		public Issue24916(TestDevice testDevice) : base(testDevice){}
+
+		public override string Issue => "Image Source in Button initializes correctly";
+		
+		[Test]
+		[Category(UITestCategories.Button)]
+		public void ImageSourceInitializesCorrectly()
+		{
+			App.WaitForElement("label");
+			VerifyScreenshot();
+		}
+	}
+}
diff --git a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
index 8db8e6f47f52..28e958b56a10 100644
--- a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
@@ -65,27 +65,6 @@ public async Task ClickEventFires()
 			Assert.True(clicked);
 		}
 
-		[Theory(DisplayName = "ImageSource Initializes Correctly")]
-		[InlineData("red.png", "#FF0000")]
-		[InlineData("green.png", "#00FF00")]
-		[InlineData("black.png", "#000000")]
-		public async Task ImageSourceInitializesCorrectly(string filename, string colorHex)
-		{
-			var image = new ButtonStub
-			{
-				Background = new SolidPaintStub(Colors.Black),
-				ImageSource = new FileImageSourceStub(filename),
-			};
-
-			await AttachAndRun(image, async (handler) =>
-			{
-				await AssertEventually(() => ImageSourceLoaded(handler));
-
-				var expectedColor = Color.FromArgb(colorHex);
-				await handler.PlatformView.AssertContainsColor(expectedColor, MauiContext);
-			});
-		}
-
 		[Theory(DisplayName = "Padding Initializes Correctly")]
 		[InlineData(0, 0, 0, 0)]
 		[InlineData(1, 1, 1, 1)]
diff --git a/src/Core/tests/DeviceTests/Handlers/ImageButton/ImageButtonHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ImageButton/ImageButtonHandlerTests.cs
index 2abfcdfbb71e..432acce0bfb9 100644
--- a/src/Core/tests/DeviceTests/Handlers/ImageButton/ImageButtonHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ImageButton/ImageButtonHandlerTests.cs
@@ -33,31 +33,6 @@ public async Task ClickEventFires()
 			Assert.True(clicked);
 		}
 
-		[Theory(DisplayName = "ImageSource Initializes Correctly")]
-		[InlineData("red.png", "#FF0000")]
-		[InlineData("green.png", "#00FF00")]
-		[InlineData("black.png", "#000000")]
-		public async Task ImageSourceInitializesCorrectly(string filename, string colorHex)
-		{
-			var imageButton = new ImageButtonStub
-			{
-				Background = new SolidPaintStub(Colors.Black),
-				ImageSource = new FileImageSourceStub(filename),
-			};
-
-			var order = new List<string>();
-
-			await InvokeOnMainThreadAsync(async () =>
-			{
-				var handler = CreateHandler(imageButton);
-
-				await AssertEventually(() => ImageSourceLoaded(handler));
-
-				var expectedColor = Color.FromArgb(colorHex);
-				await handler.PlatformView.AssertContainsColor(expectedColor, MauiContext);
-			});
-		}
-
 		[Fact(DisplayName = "LoadingCompleted event fires")]
 		public async Task LoadingCompletedEventFires()
 		{