Skip to content

Convert tests to UIThreadTestMethod pattern #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-hawker merged 4 commits into from
Dec 22, 2025
Merged

Convert tests to UIThreadTestMethod pattern #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72b085c
Convert ShouldConfigureGridSplitterAutomationPeer test to UIThreadTes…
Copilot Dec 19, 2025
55b3ecf
Remove using
michael-hawker Dec 19, 2025
b6da782
Convert ComplexAsyncLoadUIExampleTest to UIThreadTestMethod
Copilot Dec 20, 2025
612610a
Remove unnecessary using statement from ColorPicker test
Copilot Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions components/ColorPicker/tests/ExampleColorPickerTestClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,22 @@ await EnqueueAsync(() =>

// If you want to load other content not within a XAML page using the UIThreadTestMethod above.
// Then you can do that using the Load/UnloadTestContentAsync methods.
[TestMethod]
[UIThreadTestMethod]
public async Task ComplexAsyncLoadUIExampleTest()
{
await EnqueueAsync(async () =>
{
var component = new ColorPicker();
Assert.IsNotNull(component);
Assert.IsFalse(component.IsLoaded);
var component = new ColorPicker();
Assert.IsNotNull(component);
Assert.IsFalse(component.IsLoaded);

await LoadTestContentAsync(component);
await LoadTestContentAsync(component);
await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });

Assert.IsTrue(component.IsLoaded);
Assert.IsTrue(component.IsLoaded);

await UnloadTestContentAsync(component);
await UnloadTestContentAsync(component);
await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });

Assert.IsFalse(component.IsLoaded);
});
Assert.IsFalse(component.IsLoaded);
}

// You can still use the UIThreadTestMethod to remove the extra layer for the dispatcher as well:
Expand Down
25 changes: 12 additions & 13 deletions components/Sizers/tests/ExampleSizerBaseTestClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,24 @@ namespace SizersTests;
[TestClass]
public partial class ExampleSizerBaseTestClass : VisualUITestBase
{
[TestMethod]
[UIThreadTestMethod]
public async Task ShouldConfigureGridSplitterAutomationPeer()
{
await EnqueueAsync(() =>
{
const string automationName = "MyCustomAutomationName";
const string name = "Sizer";
const string automationName = "MyCustomAutomationName";
const string name = "Sizer";

var gridSplitter = new GridSplitter();
var gridSplitterAutomationPeer = FrameworkElementAutomationPeer.CreatePeerForElement(gridSplitter) as SizerAutomationPeer;
var gridSplitter = new GridSplitter();
var gridSplitterAutomationPeer = FrameworkElementAutomationPeer.CreatePeerForElement(gridSplitter) as SizerAutomationPeer;

Assert.IsNotNull(gridSplitterAutomationPeer, "Verify that the AutomationPeer is SizerAutomationPeer.");
Assert.IsNotNull(gridSplitterAutomationPeer, "Verify that the AutomationPeer is SizerAutomationPeer.");

gridSplitter.Name = name;
Assert.IsTrue(gridSplitterAutomationPeer.GetName().Contains(name), "Verify that the UIA name contains the given Name of the GridSplitter (Sizer).");
gridSplitter.Name = name;
await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
Assert.IsTrue(gridSplitterAutomationPeer.GetName().Contains(name), "Verify that the UIA name contains the given Name of the GridSplitter (Sizer).");

gridSplitter.SetValue(AutomationProperties.NameProperty, automationName);
Assert.IsTrue(gridSplitterAutomationPeer.GetName().Contains(automationName), "Verify that the UIA name contains the customized AutomationProperties.Name of the GridSplitter.");
});
gridSplitter.SetValue(AutomationProperties.NameProperty, automationName);
await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
Assert.IsTrue(gridSplitterAutomationPeer.GetName().Contains(automationName), "Verify that the UIA name contains the customized AutomationProperties.Name of the GridSplitter.");
}

[UIThreadTestMethod]
Expand Down
Loading