Browse Source

Move test to existing test case.

pull/4947/head
Steven Kirk 6 years ago
parent
commit
50b2b3320c
  1. 33
      tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
  2. 7
      tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
  3. 7
      tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs

33
tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs

@ -232,39 +232,6 @@ namespace Avalonia.Controls.UnitTests.Selection
Assert.Contains(nameof(target.SelectedItem), changed);
}
[Fact]
public void Raises_Selection_Changed_On_Item_Move()
{
var items = new AvaloniaList<string>(new[] { "foo", "bar", "baz" });
var target = CreateTarget(source: items);
target.SelectedIndex = 1;
var changed = new List<string>();
target.PropertyChanged += (s, e) => changed.Add(e.PropertyName);
var oldSelectedIndex = target.SelectedIndex;
var oldSelectedItem = target.SelectedItem;
var sel = items[1];
var other = items[2];
items[2] = sel;
items[1] = other;
Assert.NotEqual(oldSelectedIndex, target.SelectedIndex);
Assert.NotEqual(oldSelectedItem, target.SelectedItem);
Assert.Equal(-1, target.SelectedIndex);
Assert.Equal(null, target.SelectedItem);
Assert.Contains(nameof(target.SelectedIndex), changed);
Assert.Contains(nameof(target.SelectedItem), changed);
}
[Fact]
public void Preserves_SelectedItem_On_Items_Reset()
{

7
tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs

@ -1216,6 +1216,7 @@ namespace Avalonia.Controls.UnitTests.Selection
var data = (AvaloniaList<string>)target.Source!;
var selectionChangedRaised = 0;
var selectedIndexRaised = 0;
var selectedItemRaised = 0;
var indexesChangedRaised = 0;
target.Source = data;
@ -1227,6 +1228,11 @@ namespace Avalonia.Controls.UnitTests.Selection
{
++selectedIndexRaised;
}
if (e.PropertyName == nameof(target.SelectedItem))
{
++selectedItemRaised;
}
};
target.IndexesChanged += (s, e) => ++indexesChangedRaised;
@ -1249,6 +1255,7 @@ namespace Avalonia.Controls.UnitTests.Selection
Assert.Equal(2, target.AnchorIndex);
Assert.Equal(1, selectionChangedRaised);
Assert.Equal(1, selectedIndexRaised);
Assert.Equal(1, selectedItemRaised);
Assert.Equal(0, indexesChangedRaised);
}

7
tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs

@ -1040,6 +1040,7 @@ namespace Avalonia.Controls.UnitTests.Selection
var data = (AvaloniaList<string>)target.Source!;
var selectionChangedRaised = 0;
var selectedIndexRaised = 0;
var selectedItemRaised = 0;
target.Source = data;
target.Select(1);
@ -1050,6 +1051,11 @@ namespace Avalonia.Controls.UnitTests.Selection
{
++selectedIndexRaised;
}
if (e.PropertyName == nameof(target.SelectedItem))
{
++selectedItemRaised;
}
};
target.SelectionChanged += (s, e) =>
@ -1070,6 +1076,7 @@ namespace Avalonia.Controls.UnitTests.Selection
Assert.Equal(-1, target.AnchorIndex);
Assert.Equal(1, selectionChangedRaised);
Assert.Equal(1, selectedIndexRaised);
Assert.Equal(1, selectedItemRaised);
}
[Fact]

Loading…
Cancel
Save