Modified test

Author: kubaflo

src/Controls/tests/TestCases.HostApp/Issues/Issue18797.xaml.cs

@@ -1,7 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Xaml;
-
-namespace Maui.Controls.Sample.Issues
+namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	[Issue(IssueTracker.Github, 18797, "[Android] Datepicker focus and unfocus event not firing on android", PlatformAffected.Android)]
@@ -12,12 +9,12 @@ public Issue18797()
 			InitializeComponent();
 		}
 
-		void DatePicker_Focused(System.Object sender, Microsoft.Maui.Controls.FocusEventArgs e)
+		void DatePicker_Focused(object sender, FocusEventArgs e)
 		{
 			FocusedLabel.Text = "Focused: true";
 		}
 
-		void DatePicker_Unfocused(System.Object sender, Microsoft.Maui.Controls.FocusEventArgs e)
+		void DatePicker_Unfocused(object sender, FocusEventArgs e)
 		{
 			UnfocusedLabel.Text = "Unfocused: true";
 		}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18797.cs

@@ -22,14 +22,14 @@ public void DatePickerFocusedAndUnfocusedEventsShouldFire()
 			_ = App.WaitForElement("datePicker");
 
 			App.Click("datePicker");
-
-			((AppiumApp)App).Driver.FindElements(MobileBy.XPath("//android.widget.Button[@resource-id=\"android:id/button1\"]")).First().Click();
-
+			App.WaitForElement("Cancel");
+			App.Click("Cancel");
+			App.WaitForElement("focusedLabel");
 			var focusedLabelText = App.FindElement("focusedLabel").GetText();
 			var unfocusedLabelText = App.FindElement("unfocusedLabel").GetText();
 
-			ClassicAssert.True(focusedLabelText == "Focused: true");
-			ClassicAssert.True(unfocusedLabelText == "Unfocused: true");
+			Assert.That(focusedLabelText, Is.EqualTo("Focused: true"));
+			Assert.That(unfocusedLabelText, Is.EqualTo("Unfocused: true"));
 		}
 	}
 }