[release/11.0.1xx-preview7] Bundle test-only stabilizations

.github/scripts/Set-ScreenResolution.Tests.ps1

@@ -0,0 +1,76 @@
+#!/usr/bin/env pwsh
+#Requires -Modules Pester
+
+BeforeAll {
+    $screenResolutionScript = Join-Path $PSScriptRoot '../../eng/scripts/Set-ScreenResolution.ps1'
+    $tokens = $null
+    $parseErrors = $null
+    $ast = [System.Management.Automation.Language.Parser]::ParseFile(
+        $screenResolutionScript,
+        [ref]$tokens,
+        [ref]$parseErrors)
+
+    if ($parseErrors.Count -gt 0) {
+        throw "Set-ScreenResolution.ps1 has parse errors: $($parseErrors -join '; ')"
+    }
+
+    $functionDefinitions = $ast.FindAll({
+        param($node)
+        $node -is [System.Management.Automation.Language.FunctionDefinitionAst]
+    }, $true)
+
+    foreach ($functionName in @(
+        'Get-ScreenResolutionProbeAction',
+        'Test-ScreenResolutionApplySucceeded'
+    )) {
+        $definition = $functionDefinitions |
+            Where-Object Name -EQ $functionName |
+            Select-Object -First 1
+
+        if ($null -eq $definition) {
+            throw "Function '$functionName' was not found in Set-ScreenResolution.ps1"
+        }
+
+        Invoke-Expression $definition.Extent.Text
+    }
+
+    $setResolutionDefinition = $functionDefinitions |
+        Where-Object Name -EQ 'Set-ScreenResolution' |
+        Select-Object -First 1
+
+    if ($null -eq $setResolutionDefinition) {
+        throw "Function 'Set-ScreenResolution' was not found in Set-ScreenResolution.ps1"
+    }
+
+    $setResolutionBody = $setResolutionDefinition.Extent.Text
+}
+
+Describe 'Set-ScreenResolution native result decisions' {
+    It 'returns <Expected> for CDS_TEST result <Result>' -ForEach @(
+        @{ Result = 0; Expected = 'Apply' }
+        @{ Result = -1; Expected = 'Apply' }
+        @{ Result = -2; Expected = 'Reject' }
+        @{ Result = -3; Expected = 'Apply' }
+        @{ Result = -4; Expected = 'Apply' }
+        @{ Result = -5; Expected = 'Apply' }
+    ) {
+        Get-ScreenResolutionProbeAction -Result $Result | Should -Be $Expected
+    }
+
+    It 'returns <Expected> for real apply result <Result>' -ForEach @(
+        @{ Result = 0; Expected = $true }
+        @{ Result = 1; Expected = $true }
+        @{ Result = -1; Expected = $false }
+        @{ Result = -2; Expected = $false }
+        @{ Result = -3; Expected = $false }
+        @{ Result = -4; Expected = $false }
+        @{ Result = -5; Expected = $false }
+    ) {
+        Test-ScreenResolutionApplySucceeded -Result $Result | Should -Be $Expected
+    }
+
+    It 'uses the pure decisions in the native flow' {
+        $setResolutionBody | Should -Match 'Get-ScreenResolutionProbeAction\s+-Result\s+\$testResult'
+        $setResolutionBody | Should -Match 'Test-ScreenResolutionApplySucceeded\s+-Result\s+\$changeResult'
+    }
+}

eng/scripts/Set-ScreenResolution.ps1

@@ -37,6 +37,26 @@ param (
 Set-StrictMode -Version 2.0
 $ErrorActionPreference = "Stop"
 
+function Get-ScreenResolutionProbeAction {
+    param (
+        [int]$Result
+    )
+
+    if ($Result -eq -2) {
+        return "Reject"
+    }
+
+    return "Apply"
+}
+
+function Test-ScreenResolutionApplySucceeded {
+    param (
+        [int]$Result
+    )
+
+    return ($Result -eq 0 -or $Result -eq 1)
+}
+
 function Set-ScreenResolution {
     param (
         [int]$Width,
@@ -167,34 +187,35 @@ namespace DisplaySettings
 
         if ($testResult -ne [DisplaySettings.NativeMethods]::DISP_CHANGE_SUCCESSFUL) {
             Write-Warning "Resolution test returned code: $testResult"
-
-            switch ($testResult) {
-                ([DisplaySettings.NativeMethods]::DISP_CHANGE_BADMODE) {
-                    Write-Error "The resolution ${Width}x${Height} is not supported by this display (BADMODE)"
-                    return $false
-                }
-                ([DisplaySettings.NativeMethods]::DISP_CHANGE_FAILED) {
-                    Write-Error "The resolution change test failed (FAILED)"
-                    return $false
-                }
-                default {
-                    Write-Warning "Unexpected test result, attempting to apply anyway..."
-                }
+
+            if ((Get-ScreenResolutionProbeAction -Result $testResult) -eq "Reject") {
+                Write-Error "The resolution ${Width}x${Height} is not supported by this display (BADMODE)"
+                return $false
+            }
+
+            if ($testResult -eq [DisplaySettings.NativeMethods]::DISP_CHANGE_FAILED) {
+                Write-Warning "CDS_TEST returned DISP_CHANGE_FAILED ($testResult) for target ${Width}x${Height}; attempting to apply the resolution anyway..."
+            }
+            else {
+                Write-Warning "Unexpected test result, attempting to apply anyway..."
             }
         }
 
         # Apply the resolution change
         $changeResult = [DisplaySettings.NativeMethods]::ChangeDisplaySettings([ref]$devMode, [DisplaySettings.NativeMethods]::CDS_UPDATEREGISTRY)
-
-        switch ($changeResult) {
-            ([DisplaySettings.NativeMethods]::DISP_CHANGE_SUCCESSFUL) {
-                Write-Host "Successfully set screen resolution to ${Width}x${Height}"
-                return $true
-            }
-            ([DisplaySettings.NativeMethods]::DISP_CHANGE_RESTART) {
+
+        if (Test-ScreenResolutionApplySucceeded -Result $changeResult) {
+            if ($changeResult -eq [DisplaySettings.NativeMethods]::DISP_CHANGE_RESTART) {
                 Write-Host "Screen resolution set to ${Width}x${Height}. A restart may be required for some applications."
-                return $true
             }
+            else {
+                Write-Host "Successfully set screen resolution to ${Width}x${Height}"
+            }
+
+            return $true
+        }
+
+        switch ($changeResult) {
             ([DisplaySettings.NativeMethods]::DISP_CHANGE_BADMODE) {
                 Write-Error "The resolution ${Width}x${Height} is not supported by this display"
                 return $false

src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.iOS.cs

@@ -41,6 +41,9 @@ await InvokeOnMainThreadAsync(async () =>
 				((IElementHandler)handler).DisconnectHandler();
 			});
 
+			// Allow UIKit to release controller-owned references before forcing managed GC.
+			await Task.Delay(100);
+
 			// Force garbage collection
 			await AssertionExtensions.WaitForGC(weakCarouselView, weakHandler);
 

src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs

@@ -722,6 +722,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(window, async handler =>
 		}
 #endif
 
+#if ANDROID
 		[Fact("Dont leak with Animation")]
 		public async Task ModalPageDontLeakWithAnimation()
 		{
@@ -751,6 +752,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(window, async handler =>
 
 			await AssertionExtensions.WaitForGC(references.ToArray());
 		}
+#endif
 
 		class PageTypes : IEnumerable<object[]>
 		{

src/Controls/tests/TestCases.HostApp/Issues/Issue33287.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Threading.Tasks;
+using System.ComponentModel;
 
 namespace Maui.Controls.Sample.Issues;
 
@@ -17,6 +17,12 @@ public Issue33287MainPage()
 	{
 		Title = "Issue 33287";
 
+		var statusLabel = new Label
+		{
+			Text = "Waiting for alert request",
+			AutomationId = "AlertStatusLabel"
+		};
+
 		Content = new VerticalStackLayout
 		{
 			Padding = 20,
@@ -28,23 +34,26 @@ public Issue33287MainPage()
 					Text = "Navigate to Second Page",
 					AutomationId = "NavigateButton",
 					Command = new Command(async () =>
-						await Navigation.PushAsync(new Issue33287SecondPage()))
+						await Navigation.PushAsync(new Issue33287SecondPage(status =>
+							statusLabel.Text = status)))
 				},
 				new Label
 				{
 					Text = "MainPage",
 					AutomationId = "MainPageLabel"
-				}
+				},
+				statusLabel
 			}
 		};
 	}
 }
 
 public class Issue33287SecondPage : ContentPage
 {
-	public Issue33287SecondPage()
+	public Issue33287SecondPage(Action<string> updateStatus)
 	{
 		Title = "Second Page";
+		PropertyChanged += OnPropertyChanged;
 
 		Content = new VerticalStackLayout
 		{
@@ -59,20 +68,18 @@ public Issue33287SecondPage()
 				}
 			}
 		};
-	}
 
-	protected override async void OnAppearing()
-	{
-		base.OnAppearing();
+		async void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName != nameof(Window) || Window is not null)
+				return;
 
-		// Wait long enough for the user/test to navigate back
-#if MACCATALYST
-		await Task.Delay(4000);
-#else
-		await Task.Delay(2000);
-#endif
+			PropertyChanged -= OnPropertyChanged;
+			updateStatus("Page detached");
 
-		// Without the fix this throws NullReferenceException and crashes the app
-		await DisplayAlertAsync("Test Alert", "This alert was delayed", "OK");
+			// Request the alert before handler teardown changes IsPlatformEnabled.
+			await DisplayAlertAsync("Test Alert", "This alert was delayed", "OK");
+			updateStatus("Alert request completed");
+		}
 	}
 }

src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs

@@ -33,50 +33,24 @@ public void DragEvents()
 			App.WaitForElement("LabelDragElement");
 			App.DragAndDrop("LabelDragElement", "DragTarget");
 
-			App.WaitForElement("DragStartEventsLabel");
-			var textAfterDragStart = App.FindElement("DragStartEventsLabel").GetText();
-
-			if (string.IsNullOrEmpty(textAfterDragStart))
-			{
-				Assert.Fail("Text was expected: Drag start event");
-			}
-			else
-			{
-				Assert.That(textAfterDragStart, Is.EqualTo("DragStarting"));
-			}
-
-			App.WaitForElement("DragOverEventsLabel");
-			var textAfterDragOver = App.FindElement("DragOverEventsLabel").GetText();
-			if (string.IsNullOrEmpty(textAfterDragOver))
-			{
-				Assert.Fail("Text was expected: Drag over event");
-			}
-			else
-			{
-				Assert.That(textAfterDragOver, Is.EqualTo("DragOver"));
-			}
-
-			App.WaitForElement("DragCompletedEventsLabel");
-			var textAfterDragComplete = App.FindElement("DragCompletedEventsLabel").GetText();
-			if (string.IsNullOrEmpty(textAfterDragComplete))
-			{
-				Assert.Fail("Text was expected: Drag complete event");
-			}
-			else
-			{
-				Assert.That(textAfterDragComplete, Is.EqualTo("DropCompleted"));
-			}
+			AssertEventText("DragStartEventsLabel", "DragStarting");
+			AssertEventText("DragOverEventsLabel", "DragOver");
+			AssertEventText("DragCompletedEventsLabel", "DropCompleted");
+			AssertEventText("DropEventsLabel", "Drop");
+		}
 
-			App.WaitForElement("DropEventsLabel");
-			var textAfterDrop = App.FindElement("DropEventsLabel").GetText();
-			if (string.IsNullOrEmpty(textAfterDrop))
-			{
-				Assert.Fail("Text was expected: Drop event");
-			}
-			else
-			{
-				Assert.That(textAfterDrop, Is.EqualTo("Drop"));
-			}
+		void AssertEventText(string automationId, string expectedText)
+		{
+			// Wait for the label's text to become EXACTLY the expected value. A substring wait is
+			// unreliable here because each label's placeholder (e.g. "DragOverEvents: ") already
+			// contains the expected event name (e.g. "DragOver"), so a Contains-based wait would pass
+			// immediately on the placeholder. WaitForTextEqualToElement polls until the text matches
+			// exactly, so the Assert below fails only on a genuine timeout; no separate GetText re-read
+			// is needed (it would only re-open a window for transient Appium flakiness).
+			Assert.That(
+				App.WaitForTextEqualToElement(automationId, expectedText),
+				Is.True,
+				$"Timed out waiting for {automationId} to become '{expectedText}'.");
 		}
 
 		[Test]
@@ -94,7 +68,7 @@ public void DragAndDropBetweenLayouts()
 			App.WaitForElement("Green");
 			App.DragAndDrop("Red", "Green");
 
-			App.WaitForElement("DragStartEventsLabel");
+			App.WaitForTextEqualToElement("DragStartEventsLabel", "DragStarting");
 			var textAfterDragStart = App.FindElement("DragStartEventsLabel").GetText();
 
 			if (string.IsNullOrEmpty(textAfterDragStart))
@@ -106,7 +80,7 @@ public void DragAndDropBetweenLayouts()
 				Assert.That(textAfterDragStart, Is.EqualTo("DragStarting"));
 			}
 
-			App.WaitForElement("DragOverEventsLabel");
+			App.WaitForTextEqualToElement("DragOverEventsLabel", "DragOver");
 			var textAfterDragOver = App.FindElement("DragOverEventsLabel").GetText();
 			if (string.IsNullOrEmpty(textAfterDragOver))
 			{
@@ -117,7 +91,7 @@ public void DragAndDropBetweenLayouts()
 				Assert.That(textAfterDragOver, Is.EqualTo("DragOver"));
 			}
 
-			App.WaitForElement("DragCompletedEventsLabel");
+			App.WaitForTextEqualToElement("DragCompletedEventsLabel", "DropCompleted");
 			var textAfterDragComplete = App.FindElement("DragCompletedEventsLabel").GetText();
 			if (string.IsNullOrEmpty(textAfterDragComplete))
 			{
@@ -139,7 +113,7 @@ public void DragAndDropBetweenLayouts()
 				Assert.That(rainbowColorText, Is.EqualTo("RainbowColorsAdd:Red"));
 			}
 
-			App.WaitForElement("DropEventsLabel");
+			App.WaitForTextEqualToElement("DropEventsLabel", "Drop");
 			var textAfterDrop = App.FindElement("DropEventsLabel").GetText();
 			if (string.IsNullOrEmpty(textAfterDrop))
 			{

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs

@@ -196,6 +196,8 @@ public void VerifyTextWhenClearButtonVisibleSetNever()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		if (App is AppiumIOSApp)
+			Assert.That(App.WaitForKeyboardToShow(), Is.True, "The iOS keyboard did not appear before the snapshot.");
 		VerifyScreenshotWithKeyboardHandling();
 	}