From c973b1fee91afc211e12bca90417109c37fb8168 Mon Sep 17 00:00:00 2001 From: NafeelaNazhir Date: Thu, 14 Aug 2025 14:42:50 +0530 Subject: [PATCH 1/3] Added issue link --- .../Tests/FeatureMatrix/DatePickerFeatureTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs index 284b44f892a4..18e4f7caec79 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs @@ -19,6 +19,7 @@ protected override void FixtureSetup() App.NavigateToGallery(DatePickerFeatureMatrix); } +#if TEST_FAILS_ON_WINDOWS //Issue Link: https://github.com/dotnet/maui/issues/30736 [Test, Order(1)] [Category(UITestCategories.DatePicker)] public void DatePicker_InitialState_VerifyVisualState() @@ -85,6 +86,7 @@ public void DatePicker_OldDateAndNewDate_VerifyVisualState() #endif VerifyScreenshot(); } +#endif #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/30066 [Test, Order(4)] From bc9ee2bbe46b7a2065d2319f201d0ebef06de3b6 Mon Sep 17 00:00:00 2001 From: NafeelaNazhir Date: Thu, 14 Aug 2025 17:45:46 +0530 Subject: [PATCH 2/3] Added test fails attribute --- .../FeatureMatrix/DatePickerFeatureTests.cs | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs index 18e4f7caec79..4837cbba4e88 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs @@ -19,7 +19,7 @@ protected override void FixtureSetup() App.NavigateToGallery(DatePickerFeatureMatrix); } -#if TEST_FAILS_ON_WINDOWS //Issue Link: https://github.com/dotnet/maui/issues/30736 +#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS //Issue Link: https://github.com/dotnet/maui/issues/30736, https://github.com/dotnet/maui/issues/31167 [Test, Order(1)] [Category(UITestCategories.DatePicker)] public void DatePicker_InitialState_VerifyVisualState() @@ -88,7 +88,7 @@ public void DatePicker_OldDateAndNewDate_VerifyVisualState() } #endif -#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/30066 +#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS // Issue Links - https://github.com/dotnet/maui/issues/30066, https://github.com/dotnet/maui/issues/31167 [Test, Order(4)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetCharacterSpacingAndDate_VerifyVisualState() @@ -145,7 +145,7 @@ public void DatePicker_SetDateAndFormat_VerifyVisualState() } #endif -#if TEST_FAILS_ON_CATALYST // Issue Links -https://github.com/dotnet/maui/issues/20904 +#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Links -https://github.com/dotnet/maui/issues/20904, https://github.com/dotnet/maui/issues/31167 [Test, Order(7)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetDateAndTextColor_VerifyVisualState() @@ -177,7 +177,7 @@ public void DatePicker_SetDateAndFlowDirection_VerifyVisualState() } #endif -#if TEST_FAILS_ON_CATALYST +#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/31167 [Test, Order(9)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState() @@ -193,9 +193,7 @@ public void DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState() App.WaitForElementTillPageNavigationSettled("DatePickerControl"); VerifyScreenshot(); } -#endif - -#if TEST_FAILS_ON_CATALYST + [Test, Order(10)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetFontAttributesAndFontSize_VerifyVisualState() @@ -212,6 +210,23 @@ public void DatePicker_SetFontAttributesAndFontSize_VerifyVisualState() App.WaitForElementTillPageNavigationSettled("DatePickerControl"); VerifyScreenshot(); } + + [Test, Order(12)] + [Category(UITestCategories.DatePicker)] + public void DatePicker_SetFontFamilyAndFontSize_VerifyVisualState() + { + App.WaitForElement("Options"); + App.Tap("Options"); + App.WaitForElement("FontFamilyDokdoButton"); + App.Tap("FontFamilyDokdoButton"); + App.WaitForElement("FontSizeEntry"); + App.ClearText("FontSizeEntry"); + App.EnterText("FontSizeEntry", "20"); + App.WaitForElement("Apply"); + App.Tap("Apply"); + App.WaitForElementTillPageNavigationSettled("DatePickerControl"); + VerifyScreenshot(); + } #endif #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/23793, https://github.com/dotnet/maui/issues/29099, https://github.com/dotnet/maui/issues/30011 @@ -235,25 +250,6 @@ public void DatePicker_SetFontAttributesAndFormat_VerifyVisualState() } #endif -#if TEST_FAILS_ON_CATALYST - [Test, Order(12)] - [Category(UITestCategories.DatePicker)] - public void DatePicker_SetFontFamilyAndFontSize_VerifyVisualState() - { - App.WaitForElement("Options"); - App.Tap("Options"); - App.WaitForElement("FontFamilyDokdoButton"); - App.Tap("FontFamilyDokdoButton"); - App.WaitForElement("FontSizeEntry"); - App.ClearText("FontSizeEntry"); - App.EnterText("FontSizeEntry", "20"); - App.WaitForElement("Apply"); - App.Tap("Apply"); - App.WaitForElementTillPageNavigationSettled("DatePickerControl"); - VerifyScreenshot(); - } -#endif - #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/23793, https://github.com/dotnet/maui/issues/29099, https://github.com/dotnet/maui/issues/30011 [Test, Order(13)] [Category(UITestCategories.DatePicker)] @@ -299,6 +295,7 @@ public void DatePicker_SetFontSizeAndFormat_VerifyVisualState() } #endif +#if TEST_FAILS_ON_IOS //Issue Link: https://github.com/dotnet/maui/issues/31167 [Test, Order(15)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetDateAndIsEnabled_VerifyVisualState() @@ -314,6 +311,7 @@ public void DatePicker_SetDateAndIsEnabled_VerifyVisualState() App.Tap("DatePickerControl"); VerifyScreenshot(); } +#endif [Test, Order(16)] [Category(UITestCategories.DatePicker)] @@ -329,7 +327,7 @@ public void DatePicker_SetDateAndIsVisible_VerifyVisualState() VerifyScreenshot(); } -#if TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/29812 +#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS// Issue Links - https://github.com/dotnet/maui/issues/29812, https://github.com/dotnet/maui/issues/31167 [Test, Order(17)] [Category(UITestCategories.DatePicker)] public void DatePicker_SetDateAndShadowOpacity_VerifyVisualState() From 65aaf4df0587bbb66e65279d91ac87819abb5187 Mon Sep 17 00:00:00 2001 From: NafeelaNazhir Date: Thu, 14 Aug 2025 18:27:40 +0530 Subject: [PATCH 3/3] changes updated --- .../Tests/FeatureMatrix/GraphicsViewFeatureTests.cs | 2 ++ .../tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs index c2071396bfd7..7bff08acdb06 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs @@ -132,6 +132,7 @@ public void GraphicsView_StringDrawable_VerifyTypeAndRendering() VerifyShapeScreenshot(); } +#if TEST_FAILS_ON_ANDROID // Issue Link: https://github.com/dotnet/maui/issues/30783 [Test] [Category(UITestCategories.GraphicsView)] public void GraphicsView_ImageDrawable_VerifyTypeAndRendering() @@ -147,6 +148,7 @@ public void GraphicsView_ImageDrawable_VerifyTypeAndRendering() Assert.That(App.FindElement("DrawableTypeLabel").GetText(), Is.EqualTo("Image")); VerifyShapeScreenshot(); } +#endif #if TEST_FAILS_ON_ANDROID //See issue : https://github.com/dotnet/maui/issues/29394 [Test] diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs index 9e8ce2b335ad..72f1bf3fb05f 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +#if TEST_FAILS_ON_ANDROID // https://github.com/dotnet/maui/issues/30783 +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -19,3 +20,4 @@ public void Issue18430ExceptionShouldNotThrown() App.WaitForElement("Issue18430DescriptionLabel"); } } +#endif \ No newline at end of file