Browse Source

Send clicks rather than mouse down messages.

pull/2673/head
Steven Kirk 7 years ago
parent
commit
ccf60266e8
  1. 38
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

38
tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

@ -633,7 +633,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Shift); _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Shift);
var panel = target.Presenter.Panel; var panel = target.Presenter.Panel;
@ -653,15 +653,15 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[1]); _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
_helper.Down((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
_helper.Down((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control);
Assert.Equal(1, target.SelectedIndex); Assert.Equal(1, target.SelectedIndex);
Assert.Equal("Bar", target.SelectedItem); Assert.Equal("Bar", target.SelectedItem);
Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems); Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems);
_helper.Down((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Control);
Assert.Equal(2, target.SelectedIndex); Assert.Equal(2, target.SelectedIndex);
Assert.Equal("Baz", target.SelectedItem); Assert.Equal("Baz", target.SelectedItem);
@ -680,13 +680,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[1]); _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
_helper.Down((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
Assert.Equal(1, target.SelectedIndex); Assert.Equal(1, target.SelectedIndex);
Assert.Equal("Bar", target.SelectedItem); Assert.Equal("Bar", target.SelectedItem);
_helper.Down((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
Assert.Equal(1, target.SelectedIndex); Assert.Equal(1, target.SelectedIndex);
Assert.Equal("Bar", target.SelectedItem); Assert.Equal("Bar", target.SelectedItem);
@ -704,8 +704,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[3]); _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
_helper.Down((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control);
var panel = target.Presenter.Panel; var panel = target.Presenter.Panel;
@ -725,8 +725,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[3]); _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
_helper.Down((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift); _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift);
var panel = target.Presenter.Panel; var panel = target.Presenter.Panel;
@ -746,8 +746,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[0]); _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
_helper.Down((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift); _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift);
var panel = target.Presenter.Panel; var panel = target.Presenter.Panel;
@ -767,19 +767,19 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.ApplyTemplate(); target.ApplyTemplate();
target.Presenter.ApplyTemplate(); target.Presenter.ApplyTemplate();
_helper.Down((Interactive)target.Presenter.Panel.Children[0]); _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
Assert.Equal(new[] { "Foo" }, target.SelectedItems); Assert.Equal(new[] { "Foo" }, target.SelectedItems);
_helper.Down((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control);
Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems); Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
_helper.Down((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control);
Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems); Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
_helper.Down((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Control); _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Control);
Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems); Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
} }
@ -974,7 +974,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
Assert.Equal(3, target.SelectedItems.Count); Assert.Equal(3, target.SelectedItems.Count);
_helper.Down((Interactive)target.Presenter.Panel.Children[0]); _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
Assert.Equal(1, target.SelectedItems.Count); Assert.Equal(1, target.SelectedItems.Count);
Assert.Equal(new[] { "Foo", }, target.SelectedItems); Assert.Equal(new[] { "Foo", }, target.SelectedItems);

Loading…
Cancel
Save