From 7b23b6eab5430817fb76b6c258fdc886ebaa61d5 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 4 Aug 2016 13:55:30 +0200 Subject: [PATCH] Moved test to correct file. --- .../ItemsPresenterTests_Virtualization.cs | 36 +------------------ ...emsPresenterTests_Virtualization_Simple.cs | 35 ++++++++++++++++++ 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs index 9c5cedb9d3..02dffdead6 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Avalonia.Collections; using Avalonia.Controls.Generators; using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives; @@ -269,41 +270,6 @@ namespace Avalonia.Controls.UnitTests.Presenters Assert.Equal(new Size(100, 100), scroll.Viewport); } - [Fact] - public void Should_Add_Items_After_Clear() - { - var target = CreateTarget(itemCount: 10); - var defaultItems = (IList)target.Items; - var items = new Avalonia.Collections.AvaloniaList(defaultItems); - target.Items = items; - - target.ApplyTemplate(); - target.Measure(new Size(100, 100)); - target.Arrange(new Rect(target.DesiredSize)); - - Assert.Equal(10, target.Panel.Children.Count); - - items.Clear(); - - target.Panel.Measure(new Size(100, 100)); - target.Panel.Arrange(new Rect(target.Panel.DesiredSize)); - - target.Measure(new Size(100, 100)); - target.Arrange(new Rect(target.DesiredSize)); - - Assert.Equal(0, target.Panel.Children.Count); - - items.AddRange(defaultItems.Select(s => s + " new")); - - target.Panel.Measure(new Size(100, 100)); - target.Panel.Arrange(new Rect(target.Panel.DesiredSize)); - - target.Measure(new Size(100, 100)); - target.Arrange(new Rect(target.DesiredSize)); - - Assert.Equal(10, target.Panel.Children.Count); - } - private static ItemsPresenter CreateTarget( ItemVirtualizationMode mode = ItemVirtualizationMode.Simple, Orientation orientation = Orientation.Vertical, diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs index 3ab5a928b4..1225583e79 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs @@ -522,6 +522,41 @@ namespace Avalonia.Controls.UnitTests.Presenters } } + [Fact] + public void Should_Add_Containers_For_Items_After_Clear() + { + var target = CreateTarget(itemCount: 10); + var defaultItems = (IList)target.Items; + var items = new AvaloniaList(defaultItems); + target.Items = items; + + target.ApplyTemplate(); + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(target.DesiredSize)); + + Assert.Equal(10, target.Panel.Children.Count); + + items.Clear(); + + target.Panel.Measure(new Size(100, 100)); + target.Panel.Arrange(new Rect(target.Panel.DesiredSize)); + + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(target.DesiredSize)); + + Assert.Equal(0, target.Panel.Children.Count); + + items.AddRange(defaultItems.Select(s => s + " new")); + + target.Panel.Measure(new Size(100, 100)); + target.Panel.Arrange(new Rect(target.Panel.DesiredSize)); + + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(target.DesiredSize)); + + Assert.Equal(10, target.Panel.Children.Count); + } + public class Vertical { [Fact]