diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla29128Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla29128Test.png new file mode 100644 index 000000000000..4a50a65cdef1 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla29128Test.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla36802Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla36802Test.png new file mode 100644 index 000000000000..c838eb1eab9f Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla36802Test.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla53834Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla53834Test.png new file mode 100644 index 000000000000..0cc083564996 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Bugzilla53834Test.png differ diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla38723.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla38723.cs index 62b8a1bb40f9..35f4b57fb4ab 100644 --- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla38723.cs +++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla38723.cs @@ -19,7 +19,12 @@ protected override void Init() picker.SelectedIndexChanged += (sender, args) => { - label.Text = "Selected"; + //Android and Windows crashes when adding a View to a Layout that is already in another Layout + //For more information : https://github.com/dotnet/maui/issues/15920 + var label = new Label + { + Text = "Selected" + }; Content = label; }; diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla29128Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla29128Test.png new file mode 100644 index 000000000000..d071fdf8437b Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla29128Test.png differ diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla36802Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla36802Test.png new file mode 100644 index 000000000000..19094f450693 Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla36802Test.png differ diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png new file mode 100644 index 000000000000..e4c3c4768e1d Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png differ diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla29128.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla29128.cs index 715268c37022..753309906b34 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla29128.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla29128.cs @@ -1,4 +1,6 @@ -using NUnit.Framework; +#if TEST_FAILS_ON_WINDOWS //Background Color updates on Slider Track +//For more information : https://github.com/dotnet/maui/issues/25921 +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -15,12 +17,11 @@ public Bugzilla29128(TestDevice testDevice) : base(testDevice) [Test] [Category(UITestCategories.LifeCycle)] [Category(UITestCategories.Compatibility)] - [FailsOnIOSWhenRunningOnXamarinUITest] - [FailsOnMacWhenRunningOnXamarinUITest] public void Bugzilla29128Test() { App.WaitForElement("SliderId"); - App.Screenshot("Slider and button should be centered"); + VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla33612.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla33612.cs index ba2219b7a0ef..7b8b6ae38d8a 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla33612.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla33612.cs @@ -1,5 +1,4 @@ -#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS && TEST_FAILS_ON_WINDOWS -using NUnit.Framework; +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -21,17 +20,12 @@ public void Issue33612RemovePagesWithoutRenderers() App.Tap("Go To Page 2"); App.WaitForElement("This is Page 2"); - App.Screenshot("At Page 2"); App.Tap("Go To Page 3"); App.WaitForElement("This is Page 3"); - App.WaitForElement("Return To Page 2", - timeout: TimeSpan.FromSeconds(15)); - App.Screenshot("At Page 3"); + App.WaitForElement("Return To Page 2"); App.Tap("Return To Page 2"); - + App.WaitForElement("If you are seeing this, nothing crashed."); - App.Screenshot("Success Page"); } } -#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36802.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36802.cs index 8b29579fd31d..7b4c21081cb1 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36802.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36802.cs @@ -1,4 +1,6 @@ -#if IOS +#if TEST_FAILS_ON_WINDOWS +// While using this GroupShortNameBinding property it throws an exception on Windows +// for more information:https://github.com/dotnet/maui/issues/26534. using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -16,12 +18,10 @@ public Bugzilla36802(TestDevice testDevice) : base(testDevice) [Test] [Category(UITestCategories.ListView)] [Category(UITestCategories.Compatibility)] - [FailsOnIOSWhenRunningOnXamarinUITest] - [FailsOnMacWhenRunningOnXamarinUITest] public void Bugzilla36802Test() { App.WaitForElement("TestReady"); - App.Screenshot("AccessoryView partially hidden test"); + VerifyScreenshot(); } } } diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37462.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37462.cs index 85b557c015e7..cb0f50ac614a 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37462.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37462.cs @@ -1,5 +1,4 @@ -#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS && TEST_FAILS_ON_WINDOWS -using NUnit.Framework; +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -17,7 +16,6 @@ public Bugzilla37462(TestDevice testDevice) : base(testDevice) [Category(UITestCategories.Navigation)] public void CanRemoveIntermediatePagesAndPopToFirstPage() { - // Start at page 1 App.WaitForElement("Go To 2"); App.WaitForElement("This is a label on page 1"); App.Tap("Go To 2"); @@ -31,10 +29,7 @@ public void CanRemoveIntermediatePagesAndPopToFirstPage() App.WaitForElement("Back to 1"); App.Tap("Back to 1"); - // Clicking "Back to 1" should remove pages 2 and 3 from the stack - // Then call PopAsync, which should return to page 1 App.WaitForElement("Go To 2"); App.WaitForElement("This is a label on page 1"); } } -#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38112.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38112.cs index fdc11ae030eb..4da012aca442 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38112.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38112.cs @@ -1,4 +1,6 @@ -#if TEST_FAILS_ON_WINDOWS +#if TEST_FAILS_ON_WINDOWS +//After Button Click removes all Items in TableView +//For more information: https://github.com/dotnet/maui/issues/26699 using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -13,9 +15,7 @@ public Bugzilla38112(TestDevice testDevice) : base(testDevice) } public override string Issue => "Switch becomes reenabled when previous ViewCell is removed from TableView"; - [Test] - [FailsOnIOSWhenRunningOnXamarinUITest] public void Bugzilla38112_SwitchIsStillOnScreen() { App.WaitForElement("Click"); @@ -24,7 +24,6 @@ public void Bugzilla38112_SwitchIsStillOnScreen() } [Test] - [FailsOnAllPlatformsWhenRunningOnXamarinUITest] public void Bugzilla38112_SwitchIsStillDisabled() { App.WaitForElement("Click"); @@ -32,8 +31,6 @@ public void Bugzilla38112_SwitchIsStillDisabled() App.WaitForElement("switch3"); App.Tap("switch3"); App.WaitForNoElement("FAIL"); - Assert.That(App.FindElement("resultlabel").GetText()?.Equals("FAIL", - StringComparison.OrdinalIgnoreCase), Is.False); } } -#endif +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38723.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38723.cs index f9b66950eeac..a451b5d4e4ce 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38723.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla38723.cs @@ -15,12 +15,12 @@ public Bugzilla38723(TestDevice testDevice) : base(testDevice) [Test] [Category(UITestCategories.Picker)] [Category(UITestCategories.Compatibility)] - [FailsOnAllPlatformsWhenRunningOnXamarinUITest] public void Bugzilla38723Test() { + App.WaitForElement("SELECT"); App.Tap("SELECT"); - App.WaitForNoElement("Selected"); + App.WaitForElement("Selected"); App.WaitForNoElement("SELECT"); } } -} \ No newline at end of file +} diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla39489.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla39489.cs index 0c8dbfa823b8..43d89ff3c007 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla39489.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla39489.cs @@ -1,4 +1,4 @@ -#if IOS +#if TEST_FAILS_ON_WINDOWS // Maps Control not supported in Windows using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -17,10 +17,7 @@ public Bugzilla39489(TestDevice testDevice) : base(testDevice) [Category(UITestCategories.Maps)] [Category(UITestCategories.Performance)] [Category(UITestCategories.Compatibility)] - [FailsOnAndroidWhenRunningOnXamarinUITest] - [FailsOnIOSWhenRunningOnXamarinUITest] - [FailsOnMacWhenRunningOnXamarinUITest] - public async Task Bugzilla39489Test() + public void Bugzilla39489Test() { // Original bug report (https://bugzilla.xamarin.com/show_bug.cgi?id=39489) had a crash (OOM) after 25-30 // page loads. Obviously it's going to depend heavily on the device and amount of available memory, but @@ -32,8 +29,7 @@ public async Task Bugzilla39489Test() App.WaitForElement("NewPage"); App.Tap("NewPage"); App.WaitForElement("NewPage"); - await Task.Delay(1000); - App.Back(); + App.TapBackArrow(); } } } diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53834.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53834.cs index df70b5fe2ce3..e2964842d28f 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53834.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53834.cs @@ -1,5 +1,4 @@ -#if IOS -using NUnit.Framework; +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -15,14 +14,10 @@ public Bugzilla53834(TestDevice testDevice) : base(testDevice) [Test] [Category(UITestCategories.ListView)] - [Category(UITestCategories.Compatibility)] - [FailsOnIOSWhenRunningOnXamarinUITest] - [FailsOnMacWhenRunningOnXamarinUITest] public void Bugzilla53834Test() { App.WaitForElement("TestReady"); - App.Screenshot("Incorrect row heights test"); + VerifyScreenshot(); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png new file mode 100644 index 000000000000..ad5430775a36 Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png differ diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla29128Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla29128Test.png new file mode 100644 index 000000000000..963b98310235 Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla29128Test.png differ diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla36802Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla36802Test.png new file mode 100644 index 000000000000..17c2dff3eb55 Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla36802Test.png differ diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla53834Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla53834Test.png new file mode 100644 index 000000000000..10f155c5c7ad Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla53834Test.png differ