From 8a61dabe393106f29a49beedf6da7f2e0ca28d3c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 4 Dec 2023 23:52:17 -0800
Subject: [PATCH] Fix failing test on release branch (doesn't reproduce on
 master)

---
 .../VirtualizingStackPanelTests.cs                  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
index 6091348f7c..a9506f5a59 100644
--- a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
@@ -6,6 +6,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -1141,6 +1142,18 @@ namespace Avalonia.Controls.UnitTests
                 Template = new FuncControlTemplate<T>((_, ns) => scroll.RegisterInNameScope(ns)),
                 ItemsPanel = new FuncTemplate<Panel?>(() => target),
                 ItemTemplate = itemTemplate.GetValueOrDefault(DefaultItemTemplate()),
+                // master branch doesn't have this code, because ContentControl delivered controls always have a template there. 
+                ItemContainerTheme = new ControlTheme(typeof(ListBoxItem))
+                {
+                    Setters =
+                    {
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate((_, ns) => new ContentPresenter
+                        {
+                            Name = "PART_ContentPresenter",
+                            [~ListBoxItem.ContentProperty] = new TemplateBinding(ListBoxItem.ContentProperty),
+                        }.RegisterInNameScope(ns)))
+                    }
+                }
             };
 
             return (target, scroll, itemsControl);