Browse Source

Adjust a few expected test results.

pull/4533/head
Steven Kirk 6 years ago
parent
commit
4c20313b12
  1. 6
      tests/Avalonia.Controls.UnitTests/CarouselTests.cs
  2. 4
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
  3. 9
      tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs
  4. 5
      tests/Avalonia.Controls.UnitTests/TabControlTests.cs

6
tests/Avalonia.Controls.UnitTests/CarouselTests.cs

@ -265,7 +265,7 @@ namespace Avalonia.Controls.UnitTests
}
[Fact]
public void Selected_Item_Changes_To_NextAvailable_Item_If_SelectedItem_Is_Removed_From_Middle()
public void Selected_Item_Changes_To_First_Item_If_SelectedItem_Is_Removed_From_Middle()
{
var items = new ObservableCollection<string>
{
@ -288,8 +288,8 @@ namespace Avalonia.Controls.UnitTests
items.RemoveAt(1);
Assert.Equal(1, target.SelectedIndex);
Assert.Equal("FooBar", target.SelectedItem);
Assert.Equal(0, target.SelectedIndex);
Assert.Equal("Foo", target.SelectedItem);
}
private Control CreateTemplate(Carousel control, INameScope scope)

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

@ -367,7 +367,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.SelectedIndex = 3;
target.SelectRange(1);
Assert.Equal(new[] { "qux", "baz", "bar" }, target.SelectedItems.Cast<object>().ToList());
Assert.Equal(new[] { "bar", "baz", "qux" }, target.SelectedItems.Cast<object>().ToList());
}
[Fact]
@ -1111,7 +1111,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.SelectAll();
items[1] = "Qux";
Assert.Equal(new[] { "Foo", "Qux", "Baz" }, target.SelectedItems);
Assert.Equal(new[] { "Foo", "Baz" }, target.SelectedItems);
}
[Fact]

9
tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs

@ -67,7 +67,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
}
[Fact]
public void Removing_Selected_Should_Select_Next()
public void Removing_Selected_Should_Select_First()
{
var items = new ObservableCollection<TabItem>()
{
@ -96,10 +96,9 @@ namespace Avalonia.Controls.UnitTests.Primitives
Assert.Same(items[1], target.SelectedItem);
items.RemoveAt(1);
// Assert for former element [2] now [1] == "3rd"
Assert.Equal(1, target.SelectedIndex);
Assert.Same(items[1], target.SelectedItem);
Assert.Same("3rd", ((TabItem)target.SelectedItem).Name);
Assert.Equal(0, target.SelectedIndex);
Assert.Same(items[0], target.SelectedItem);
Assert.Same("first", ((TabItem)target.SelectedItem).Name);
}
private Control CreateTabStripTemplate(TabStrip parent, INameScope scope)

5
tests/Avalonia.Controls.UnitTests/TabControlTests.cs

@ -95,7 +95,7 @@ namespace Avalonia.Controls.UnitTests
}
[Fact]
public void Removal_Should_Set_Next_Tab()
public void Removal_Should_Set_First_Tab()
{
var collection = new ObservableCollection<TabItem>()
{
@ -126,8 +126,7 @@ namespace Avalonia.Controls.UnitTests
target.SelectedItem = collection[1];
collection.RemoveAt(1);
// compare with former [2] now [1] == "3rd"
Assert.Same(collection[1], target.SelectedItem);
Assert.Same(collection[0], target.SelectedItem);
}
[Fact]

Loading…
Cancel
Save