Browse Source

Update DataGrid tests

pull/4687/head
Maksym Katsydan 6 years ago
parent
commit
92f1c06a96
  1. 4
      src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
  2. 9
      tests/Avalonia.Controls.DataGrid.UnitTests/Collections/DataGridSortDescriptionTests.cs

4
src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs

@ -261,9 +261,9 @@ namespace Avalonia.Collections
return new DataGridPathSortDescription(propertyPath, descending ? ListSortDirection.Descending : ListSortDirection.Ascending, null, culture);
}
public static DataGridSortDescription FromPath(string propertyPath, ListSortDirection direction = ListSortDirection.Ascending, IComparer internalComparer = null)
public static DataGridSortDescription FromPath(string propertyPath, ListSortDirection direction, IComparer comparer)
{
return new DataGridPathSortDescription(propertyPath, direction, internalComparer, null);
return new DataGridPathSortDescription(propertyPath, direction, comparer, null);
}
}

9
tests/Avalonia.Controls.DataGrid.UnitTests/Collections/DataGridSortDescriptionTests.cs

@ -1,4 +1,5 @@
using System;
using System.ComponentModel;
using System.Linq;
using Avalonia.Collections;
using Xunit;
@ -18,7 +19,7 @@ namespace Avalonia.Controls.DataGrid.UnitTests.Collections
new Item("c", "c"),
};
var expectedResult = items.OrderBy(i => i.Prop1).ToList();
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), @descending: false);
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), ListSortDirection.Ascending);
sortDescription.Initialize(typeof(Item));
var result = sortDescription.OrderBy(items).ToList();
@ -36,7 +37,7 @@ namespace Avalonia.Controls.DataGrid.UnitTests.Collections
new Item("c", "c"),
};
var expectedResult = items.OrderByDescending(i => i.Prop1).ToList();
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), @descending: true);
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), ListSortDirection.Descending);
sortDescription.Initialize(typeof(Item));
var result = sortDescription.OrderBy(items).ToList();
@ -61,7 +62,7 @@ namespace Avalonia.Controls.DataGrid.UnitTests.Collections
new Item("a", "b"),
new Item("a", "c"),
};
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), @descending: false);
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), ListSortDirection.Ascending);
sortDescription.Initialize(typeof(Item));
var result = sortDescription.ThenBy(items).ToList();
@ -86,7 +87,7 @@ namespace Avalonia.Controls.DataGrid.UnitTests.Collections
new Item("a", "b"),
new Item("a", "a"),
};
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), @descending: true);
var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), ListSortDirection.Descending);
sortDescription.Initialize(typeof(Item));
var result = sortDescription.ThenBy(items).ToList();

Loading…
Cancel
Save