From 22580652fa6f0893c90f1db544dd69eafb980f13 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 15 Sep 2020 10:11:30 +0200
Subject: [PATCH] More failing SelectionModel tests.

---
 .../Selection/SelectionModelTests_Multiple.cs | 56 +++++++++++++++++++
 .../Selection/SelectionModelTests_Single.cs   | 56 ++++++++++++++++++-
 2 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
index 3eddd35465..5d0c6d31e1 100644
--- a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
@@ -121,6 +121,34 @@ namespace Avalonia.Controls.UnitTests.Selection
                 Assert.Equal(0, raised);
             }
 
+            [Fact]
+            public void Initializing_Source_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget(false);
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
             [Fact]
             public void Initializing_Source_Respects_Range_SourceItem_Order()
             {
@@ -152,6 +180,34 @@ namespace Avalonia.Controls.UnitTests.Selection
                 Assert.Equal("bar", target.SelectedItem);
                 Assert.Equal(new[] { "bar" }, target.SelectedItems);
             }
+
+            [Fact]
+            public void Changing_Source_To_Null_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = null;
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
         }
 
         public class SelectedIndex
diff --git a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
index 1b37730797..66a2cef921 100644
--- a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
@@ -174,6 +174,33 @@ namespace Avalonia.Controls.UnitTests.Selection
                 Assert.Equal(new[] { "bar" }, target.SelectedItems);
             }
 
+            [Fact]
+            public void Initializing_Source_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget(false);
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
             [Fact]
             public void Changing_Source_To_Null_Doesnt_Clear_Selection()
             {
@@ -194,7 +221,7 @@ namespace Avalonia.Controls.UnitTests.Selection
             }
 
             [Fact]
-            public void Changing_Source_To_NonNUll_First_Clears_Old_Selection()
+            public void Changing_Source_To_NonNull_First_Clears_Old_Selection()
             {
                 var target = CreateTarget();
                 var raised = 0;
@@ -219,6 +246,33 @@ namespace Avalonia.Controls.UnitTests.Selection
                 Assert.Equal(1, raised);
             }
 
+            [Fact]
+            public void Changing_Source_To_Null_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = null;
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
             [Fact]
             public void Raises_PropertyChanged()
             {