From faaa8f28e97ed7a4f01b0e8f39a1e6539c4d2865 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 15 Sep 2020 16:31:48 +0200
Subject: [PATCH] Added failing tests for #4048.

---
 .../Primitives/SelectingItemsControlTests.cs  | 21 +++++++++++++++++++
 .../Selection/InternalSelectionModelTests.cs  | 11 ++++++++++
 2 files changed, 32 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index b6619aaa73..f3d0a8f94b 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -1619,6 +1619,27 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(new[] { "bar" }, target.SelectedItems);
         }
 
+        [Fact]
+        public void Preserves_SelectedItem_When_Items_Changed()
+        {
+            // Issue #4048
+            var target = new SelectingItemsControl
+            {
+                Items = new[] { "foo", "bar", "baz"},
+                SelectedItem = "bar",
+            };
+
+            Prepare(target);
+
+            Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal("bar", target.SelectedItem);
+
+            target.Items = new[] { "qux", "foo", "bar" };
+
+            Assert.Equal(2, target.SelectedIndex);
+            Assert.Equal("bar", target.SelectedItem);
+        }
+
         private static void Prepare(SelectingItemsControl target)
         {
             var root = new TestRoot
diff --git a/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
index 0f3ecef969..9626bd18ef 100644
--- a/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
@@ -205,6 +205,17 @@ namespace Avalonia.Controls.UnitTests.Selection
             Assert.Equal(2, target.SelectedIndex);
         }
 
+        [Fact]
+        public void Preserves_Selection_On_Source_Changed()
+        {
+            var target = CreateTarget();
+
+            target.SelectedIndex = 1;
+            target.Source = new[] { "baz", "foo", "bar" };
+
+            Assert.Equal(2, target.SelectedIndex);
+        }
+
         private static InternalSelectionModel CreateTarget(
             bool singleSelect = false,
             IList source = null,