From d1fcb2f5a643b34bfad230f16f5b1bcde5e0311b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 14 Apr 2016 00:16:38 +0200 Subject: [PATCH] Fixed failing tests. --- src/Perspex.Controls/Primitives/SelectingItemsControl.cs | 2 +- .../Primitives/SelectingItemsControlTests_Multiple.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Perspex.Controls/Primitives/SelectingItemsControl.cs b/src/Perspex.Controls/Primitives/SelectingItemsControl.cs index 485bcceefe..a141444754 100644 --- a/src/Perspex.Controls/Primitives/SelectingItemsControl.cs +++ b/src/Perspex.Controls/Primitives/SelectingItemsControl.cs @@ -235,7 +235,7 @@ namespace Perspex.Controls.Primitives set { - if (value.IsFixedSize || value.IsReadOnly) + if (value?.IsFixedSize == true || value?.IsReadOnly == true) { throw new NotSupportedException( "Cannot use a fixed size or read-only collection as SelectedItems."); diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs index 21cce03055..89d1c4fb72 100644 --- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs +++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs @@ -57,7 +57,7 @@ namespace Perspex.Controls.UnitTests.Primitives }; target.ApplyTemplate(); - target.SelectedItems = new[] { "bar" }; + target.SelectedItems = new PerspexList("bar"); Assert.Equal(1, target.SelectedIndex); } @@ -536,7 +536,7 @@ namespace Perspex.Controls.UnitTests.Primitives target.ApplyTemplate(); target.Presenter.ApplyTemplate(); - target.SelectedItems = new[] { "foo", "baz" }; + target.SelectedItems = new PerspexList("foo", "baz"); Assert.True(called); }