From 9a98c10abfa31824fd33c8a7a96949529e1e155b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?= Date: Mon, 23 Mar 2026 12:39:17 +0100 Subject: [PATCH] Updated PipsPager render tests --- .../Controls/PipsPagerTests.cs | 40 ++++++------------ .../PipsPager/PipsPager_Default.expected.png | Bin 1300 -> 1407 bytes .../PipsPager_Preselected_Index.expected.png | Bin 1273 -> 1384 bytes 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs b/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs index 30de6119e5..5464da08b6 100644 --- a/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs +++ b/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs @@ -8,16 +8,20 @@ using Avalonia.Platform; using Avalonia.Themes.Simple; using Xunit; +#if AVALONIA_SKIA namespace Avalonia.Skia.RenderTests +#else +namespace Avalonia.Direct2D1.RenderTests.Controls +#endif { public class PipsPagerTests : TestBase { public PipsPagerTests() - : base(@"Controls/PipsPager") + : base(@"Controls\PipsPager") { } - - private static Border CreateTarget(int selectedPageIndex) + + private Decorator CreateTarget(int selectedPageIndex) { var pipsPager = new PipsPager { @@ -27,28 +31,20 @@ namespace Avalonia.Skia.RenderTests VerticalAlignment = VerticalAlignment.Center }; - var target = new Border + var target = new Decorator { - Padding = new Thickness(20), - Background = Brushes.White, - Child = pipsPager, Width = 400, - Height = 150 + Height = 150, + Child = new Border + { + Background = Brushes.White, + Child = pipsPager + } }; AvaloniaLocator.CurrentMutable.Bind().ToConstant(new CursorFactoryStub()); target.Styles.Add(new SimpleTheme()); - target.Resources["ThemeForegroundBrush"] = Brushes.Black; - target.Resources["ThemeControlLowBrush"] = Brushes.Gray; - target.Resources["ThemeControlHighBrush"] = Brushes.Gray; - target.Resources["ThemeControlMidBrush"] = Brushes.LightGray; - target.Resources["ThemeBorderLowBrush"] = Brushes.Gray; - target.Resources["ThemeBorderMidBrush"] = Brushes.Gray; - target.Resources["ThemeAccentBrush"] = Brushes.Red; - target.Resources["ThemeAccentBrush2"] = Brushes.Red; - target.Resources["ThemeAccentBrush3"] = Brushes.Red; - return target; } @@ -56,10 +52,6 @@ namespace Avalonia.Skia.RenderTests public async Task PipsPager_Default() { var target = CreateTarget(1); - - target.Measure(new Size(400, 150)); - target.Arrange(new Rect(0, 0, 400, 150)); - await RenderToFile(target); CompareImages(skipImmediate: true); } @@ -68,10 +60,6 @@ namespace Avalonia.Skia.RenderTests public async Task PipsPager_Preselected_Index() { var target = CreateTarget(3); - - target.Measure(new Size(400, 150)); - target.Arrange(new Rect(0, 0, 400, 150)); - await RenderToFile(target); CompareImages(skipImmediate: true); } diff --git a/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png b/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png index 71f6e2c5bec2649ea0b807309a7a46b247f75be4..7375bc602e4e758d3619f41d22081958cd27b918 100644 GIT binary patch delta 960 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 US#&Bsxc~qF07*qoM6N<$f)nB8-T(jq delta 808 zcmV+@1K0fM3i%0;GiC&^NklCh(fQwSSoPsU)!NzwXXB#N)6+UVJ*}z|5$47%EIRdTJlcBq?%kz} z_pe5yQSI;VFYSCicyKu$f4@39IuA?>hlhvt{Q2`%d%&awgwD(|9!=BK+1c5R>wdfw zSho2Z4y!(Wx^e#JJCPPdgn1DVIx)+5)V~+-Hft9>KUEZ32BbuUIS~*#vA4H3vv^e1 z&kw98@#V{xrJJuQ0#wJxldrwT;o)Jue*JnTd%;x%g#VrKczmnpf2-|0%!z=|i8pWF z)W*if%=TMfUvIT`(eu^sPdq=>+G}iYZ@2!+G+akO=)~&k>P#cjpW>o=)!IeR*I+R5 z{8VdyV|#ns*LmrjfY6y)Mx@{GSFhK*ab2(1`)vRgIbVZ8)z;RH^R>0rIw0b~ya))L znq@?GcXzM7i1&KEf7;#MUE2Bj`0@IPY;B#dX+b=gC%;6eb3Y=ox3^cDo15`ID=RBC z7!0aunrfQn(xXIfy3Mrc`C421?{^-<;pIn}w0P&Sv9aM%Cd{3HFc+(