Browse Source

fix(test): call Threading.Dispatcher.UIThread.RunJobs();

pull/11418/head
Giuseppe Lippolis 3 years ago
parent
commit
176a6a83c5
  1. 12
      tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
  2. 10
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

12
tests/Avalonia.Controls.UnitTests/ListBoxTests.cs

@ -431,6 +431,8 @@ namespace Avalonia.Controls.UnitTests
items.Remove("1");
lm.ExecuteLayoutPass();
Threading.Dispatcher.UIThread.RunJobs();
Assert.Equal("30", target.ContainerFromIndex(items.Count - 1).DataContext);
Assert.Equal("29", target.ContainerFromIndex(items.Count - 2).DataContext);
Assert.Equal("28", target.ContainerFromIndex(items.Count - 3).DataContext);
@ -456,8 +458,13 @@ namespace Avalonia.Controls.UnitTests
Prepare(target);
Threading.Dispatcher.UIThread.RunJobs();
// First an item that is not index 0 must be selected.
_mouse.Click(target.Presenter.Panel.Children[1]);
Threading.Dispatcher.UIThread.RunJobs();
Assert.Equal(1, target.Selection.AnchorIndex);
// We're going to be clicking on item 9.
@ -470,6 +477,7 @@ namespace Avalonia.Controls.UnitTests
// into view due to SelectionMode.AlwaysSelected.
target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) =>
{
Assert.Same(item, e.TargetObject);
++raised;
});
@ -477,6 +485,8 @@ namespace Avalonia.Controls.UnitTests
// Click item 9.
_mouse.Click(item);
Threading.Dispatcher.UIThread.RunJobs();
Assert.Equal(1, raised);
}
}
@ -743,6 +753,8 @@ namespace Avalonia.Controls.UnitTests
items.Reverse();
Layout(target);
Threading.Dispatcher.UIThread.RunJobs();
realized = target.GetRealizedContainers()
.Cast<ListBoxItem>()
.Select(x => (string)x.DataContext)

10
tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

@ -1536,7 +1536,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
Prepare(target);
target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
target.SelectedIndex = 2;
Threading.Dispatcher.UIThread.RunJobs();
Assert.True(raised);
}
@ -1561,7 +1561,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
target.SelectedIndex = 2;
Prepare(target);
Threading.Dispatcher.UIThread.RunJobs();
Assert.True(raised);
}
@ -1632,7 +1632,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
root.Child = null;
target.SelectedIndex = 1;
root.Child = target;
Threading.Dispatcher.UIThread.RunJobs();
Assert.True(raised);
}
@ -1689,11 +1689,11 @@ namespace Avalonia.Controls.UnitTests.Primitives
var raised = false;
target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
target.SelectedIndex = 2;
Threading.Dispatcher.UIThread.RunJobs();
Assert.False(raised);
target.AutoScrollToSelectedItem = true;
Threading.Dispatcher.UIThread.RunJobs();
Assert.True(raised);
}

Loading…
Cancel
Save