diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CorrectItemShouldBeSelectedWhenOpeningPicker.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CorrectItemShouldBeSelectedWhenOpeningPicker.png index 6552f23ad0ae..0b78c318b9a8 100644 Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CorrectItemShouldBeSelectedWhenOpeningPicker.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CorrectItemShouldBeSelectedWhenOpeningPicker.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldAppearItemsWhenTappingOnPickerUsingPushModalAsync.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldAppearItemsWhenTappingOnPickerUsingPushModalAsync.png index 76dae75546ad..097b5554f401 100644 Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldAppearItemsWhenTappingOnPickerUsingPushModalAsync.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldAppearItemsWhenTappingOnPickerUsingPushModalAsync.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayPickerItemsWhenOpeningPicker.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayPickerItemsWhenOpeningPicker.png index b6f190af2bbb..0fcfa2d73a48 100644 Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayPickerItemsWhenOpeningPicker.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayPickerItemsWhenOpeningPicker.png differ diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderViewModal.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderViewModal.cs index c605f1cd2461..8d0b2c02b37c 100644 --- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderViewModal.cs +++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderViewModal.cs @@ -11,22 +11,10 @@ public class SliderViewModel : INotifyPropertyChanged private double _minimum = 0; private double _maximum = 1; private double _value = 0; -#if ANDROID // // Set all color properties to null for Windows as default values, and define platform-specific colors for Android, iOS, and Mac Catalyst. - private Color _thumbColor = Color.FromRgba(1,122,255,255); - private Color _minTrackColor = Color.FromRgba(1,122,255,255) ; - private Color _maxTrackColor = Color.FromRgba(227,227,229,255); - private Color _backgroundColor = Colors.Transparent ; -#elif IOS || MACCATALYST - private Color _thumbColor = Color.FromRgba(255, 255, 255, 255); - private Color _minTrackColor = Color.FromRgba(1, 122, 255, 255); - private Color _maxTrackColor = Color.FromRgba(227, 227, 229, 255); - private Color _backgroundColor = Colors.Transparent; -#else - private Color _thumbColor = null; - private Color _minTrackColor = null; - private Color _maxTrackColor = null; - private Color _backgroundColor = null; -#endif + private Color _thumbColor; + private Color _minTrackColor; + private Color _maxTrackColor; + private Color _backgroundColor; private FlowDirection _flowDirection = FlowDirection.LeftToRight; private bool _isEnabled = true; private bool _isVisible = true; diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png index 0bae56ddcc24..c8ee9c77e2c2 100644 Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png differ diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30690.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30690.cs index 58a018cec83e..661aa60ed0b4 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30690.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30690.cs @@ -114,6 +114,9 @@ public void IsEnabledDisablesEntireViewAndPreventsChildInteraction() } #if TEST_FAILS_ON_CATALYST // App.ScrollUp does nothing: https://github.com/dotnet/maui/issues/31216 + +#if TEST_FAILS_ON_WINDOWS //Flaky test, disabling for Windows. + [Test] public void PullToRefreshWorksWhenEnabled() { @@ -127,7 +130,7 @@ public void PullToRefreshWorksWhenEnabled() // Wait for refresh to complete and verify it worked Assert.That(App.WaitForTextToBePresentInElement(StatusLabel, "Refresh completed", timeout: TimeSpan.FromSeconds(5)), Is.True); } - +#endif [Test] public void PullToRefreshBlockedWhenIsRefreshEnabledFalse() { diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png index f55b4a457e52..8a799c5e62c5 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png index 5d5a4fd4c1c1..2f53896d6fc2 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png index 2d029f5c668b..5e8f75ee1200 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png index 978a003624e0..8609904fbad1 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png index 6f7f4d0e9503..c40bc3c2befb 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png index 24f48b65ed04..8cc4e5ed6f73 100644 Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png differ diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SliderThumbImageShouldRespectColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SliderThumbImageShouldRespectColor.png index 0e4b10b4a626..432b64d1cd51 100644 Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SliderThumbImageShouldRespectColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SliderThumbImageShouldRespectColor.png differ