From d7b6a8e97a6d838f20d418b25e6eff429383d3d0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 27 Feb 2023 18:08:32 +0100
Subject: [PATCH] Added failing test for #10398.

---
 .../TreeViewTests.cs                          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 1a9fb33b7e..2ca3495d30 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -100,6 +100,31 @@ namespace Avalonia.Controls.UnitTests
             Assert.All(items, x => Assert.Same(theme, x.ItemContainerTheme));
         }
 
+        [Fact]
+        public void Finds_Correct_DataTemplate_When_Application_DataTemplate_Is_Present()
+        {
+            // #10398
+            using var app = UnitTestApplication.Start();
+            
+            Avalonia.Application.Current.DataTemplates.Add(new FuncDataTemplate<object>((x, _) => new Canvas()));
+            AvaloniaLocator.CurrentMutable.Bind<IGlobalDataTemplates>().ToConstant(Avalonia.Application.Current);
+
+            var target = new TreeView
+            {
+                Template = CreateTreeViewTemplate(),
+                Items = CreateTestTreeData(),
+            };
+
+            var root = new TestRoot(target);
+
+            CreateNodeDataTemplate(target);
+            ApplyTemplates(target);
+
+            Assert.Equal(new[] { "Root" }, ExtractItemHeader(target, 0));
+            Assert.Equal(new[] { "Child1", "Child2", "Child3" }, ExtractItemHeader(target, 1));
+            Assert.Equal(new[] { "Grandchild2a" }, ExtractItemHeader(target, 2));
+        }
+
         [Fact]
         public void Root_ItemContainerGenerator_Containers_Should_Be_Root_Containers()
         {