From 2bcaef3c7ecb02ceb6bdca2aa82c8372515e1e37 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 30 Nov 2015 21:32:50 +0100 Subject: [PATCH] Fixed failing TreeView tests. --- src/Perspex.Controls/ItemsControl.cs | 6 +++++- tests/Perspex.Controls.UnitTests/TreeViewTests.cs | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Perspex.Controls/ItemsControl.cs b/src/Perspex.Controls/ItemsControl.cs index 02357c6f3f..1fc232870e 100644 --- a/src/Perspex.Controls/ItemsControl.cs +++ b/src/Perspex.Controls/ItemsControl.cs @@ -156,7 +156,11 @@ namespace Perspex.Controls protected override void OnTemplateChanged(PerspexPropertyChangedEventArgs e) { base.OnTemplateChanged(e); - ItemContainerGenerator.Clear(); + + if (e.NewValue == null) + { + ItemContainerGenerator.Clear(); + } } /// diff --git a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs index 2db62dd619..1e8ffc7a48 100644 --- a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs +++ b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs @@ -67,6 +67,9 @@ namespace Perspex.Controls.UnitTests var container = target.ItemContainerGenerator.TreeContainerFromItem( tree[0].Children[1].Children[0]); + + Assert.NotNull(container); + var header = ((TreeViewItem)container).Header; var headerContent = ((TextBlock)header).Text; @@ -91,6 +94,8 @@ namespace Perspex.Controls.UnitTests var item = tree[0].Children[1].Children[0]; var container = (TreeViewItem)target.ItemContainerGenerator.TreeContainerFromItem(item); + Assert.NotNull(container); + container.RaiseEvent(new PointerPressEventArgs { RoutedEvent = InputElement.PointerPressedEvent,