From 7b6198911ab94e584af6ce7ef3760b7eeef8ab93 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 8 Jul 2024 13:49:11 +0300 Subject: [PATCH] chore: Adjust tests for fluent --- .../UnoSamples_Test_FrameworkElement.cs | 2 +- .../PasswordBoxTests/PasswordBoxTests.cs | 7 ++++++- .../SwipeControlTests/SwipeControlTests.cs | 2 +- .../GradientBrushTests/LinearGradientBrush_Tests.cs | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FrameworkElementTests/UnoSamples_Test_FrameworkElement.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FrameworkElementTests/UnoSamples_Test_FrameworkElement.cs index 7b74394fc36f..c6f94db5ece0 100644 --- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FrameworkElementTests/UnoSamples_Test_FrameworkElement.cs +++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FrameworkElementTests/UnoSamples_Test_FrameworkElement.cs @@ -99,7 +99,7 @@ void AssertHasColorAtCenterAndBorder(string element, Color centerColor, Color bo var rect = _app.GetPhysicalRect(element); var borderCenterOffset = rect.Width / 50f * 7.5f; - const byte tolerance = 4; + const byte tolerance = 6; ImageAssert.HasColorAt(scrn, rect.CenterX, rect.CenterY, centerColor, tolerance); ImageAssert.HasColorAt(scrn, rect.X + borderCenterOffset, rect.CenterY, borderColor, tolerance); diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/PasswordBoxTests/PasswordBoxTests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/PasswordBoxTests/PasswordBoxTests.cs index 7308f48ad417..ba3d7429b0ac 100644 --- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/PasswordBoxTests/PasswordBoxTests.cs +++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/PasswordBoxTests/PasswordBoxTests.cs @@ -17,8 +17,13 @@ public void PasswordShouldBeObscured() Run("UITests.Shared.Windows_UI_Xaml_Controls.PasswordBoxTests.PasswordBoxPage"); var passwordBox = _app.Marked("redPasswordBox"); passwordBox.EnterText(" "); + + // PasswordBox has to be unfocused for Foreground to be red. + // Otherwise, animations from template would take precedence and set the Foreground to black. + var rect = _app.Query("redPasswordBox").Single().Rect; + _app.TapCoordinates(rect.CenterX, rect.Bottom + 5); using var screenshot = TakeScreenshot("Spaces typed in PasswordBox."); - ImageAssert.HasColorInRectangle(screenshot, _app.Query("redPasswordBox").Single().Rect.ToRectangle(), Color.Red); + ImageAssert.HasColorInRectangle(screenshot, rect.ToRectangle(), Color.Red); } [Test] diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs index cd23b074de81..c5a164dc5474 100644 --- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs +++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs @@ -87,7 +87,7 @@ private async Task When_InScrollableContainer(string testName) Run(testName, skipInitialScreenshot: true); var sutPhyRect = _app.GetPhysicalRect(sut); - var item2PhyPosition = new Point((int)sutPhyRect.X + 150, (int)sutPhyRect.Y + 150).LogicalToPhysicalPixels(_app); + var item2PhyPosition = new Point((int)sutPhyRect.CenterX, (int)sutPhyRect.Y + 150).LogicalToPhysicalPixels(_app); // Validate initial state var initial = TakeScreenshot("initial"); diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Media/GradientBrushTests/LinearGradientBrush_Tests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Media/GradientBrushTests/LinearGradientBrush_Tests.cs index 489b28cbfcba..e0c24134d5ea 100644 --- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Media/GradientBrushTests/LinearGradientBrush_Tests.cs +++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Media/GradientBrushTests/LinearGradientBrush_Tests.cs @@ -45,7 +45,7 @@ public void When_Opacity_Is_Specified() var grid = _app.Query("TestGrid").Single().Rect; using var screenshot = TakeScreenshot(nameof(When_Opacity_Is_Specified)); - ImageAssert.HasColorAt(screenshot, grid.CenterX, grid.CenterY, Color.FromArgb(255, 255, 128, 128)); + ImageAssert.HasColorAt(screenshot, grid.CenterX, grid.CenterY, Color.FromArgb(255, 249, 122, 122)); } } }