From a865f6dddfcc7bfee925af7bdfc407601ead504b Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Sat, 6 Oct 2018 01:41:08 +0300 Subject: [PATCH] introduce local functions for listbox issue #1936 --- .../ListBoxTests.cs | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs index eb3a6cf0c0..c6968f19f8 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs @@ -180,13 +180,13 @@ namespace Avalonia.Controls.UnitTests { var items = new ObservableCollection(); - Action create = () => + void create() { foreach (var i in Enumerable.Range(1, 7)) { items.Add(i.ToString()); } - }; + } create(); @@ -220,21 +220,20 @@ namespace Avalonia.Controls.UnitTests var panel = target.Presenter.Panel; - Func itemsToString = () => - string.Join(",", panel.Children.OfType().Select(l => l.Content.ToString()).ToArray()); + string itemsToString() => + string.Join(",", panel.Children.OfType().Select(l => l.Content.ToString()).ToArray()); - Action addafter = (item, newitem) => - { - items.Insert(items.IndexOf(item) + 1, newitem); - - lm.ExecuteLayoutPass(); - }; + void addafter(string item, string newitem) + { + items.Insert(items.IndexOf(item) + 1, newitem); + lm.ExecuteLayoutPass(); + } - Action remove = item => + void remove(string item) { items.Remove(item); lm.ExecuteLayoutPass(); - }; + } addafter("1", "1+");//expected 1,1+,2,3,4,5,6,7 @@ -276,7 +275,7 @@ namespace Avalonia.Controls.UnitTests private FuncControlTemplate ListBoxTemplate() { - return new FuncControlTemplate(parent => + return new FuncControlTemplate(parent => new ScrollViewer { Name = "PART_ScrollViewer", @@ -293,7 +292,7 @@ namespace Avalonia.Controls.UnitTests private FuncControlTemplate ListBoxItemTemplate() { - return new FuncControlTemplate(parent => + return new FuncControlTemplate(parent => new ContentPresenter { Name = "PART_ContentPresenter",