From 1312626aed977f131c1007ba7fa5b73a373e543a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 13 May 2019 17:32:38 +0200
Subject: [PATCH] Added failing test for #2512.

---
 .../Xaml/DataTemplateTests.cs                 | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
index ce51e7ad72..61155c3c46 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
@@ -38,6 +38,37 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void DataTemplate_Can_Contain_Named_UserControl()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:sys='clr-namespace:System;assembly=mscorlib'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <ItemsControl Name='itemsControl' Items='{Binding}'>
+        <ItemsControl.ItemTemplate>
+            <DataTemplate>
+                <UserControl Name='foo'/>
+            </DataTemplate>
+        </ItemsControl.ItemTemplate>
+    </ItemsControl>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var itemsControl = window.FindControl<ItemsControl>("itemsControl");
+
+                window.DataContext = new[] { "item1", "item2" };
+
+                window.ApplyTemplate();
+                itemsControl.ApplyTemplate();
+                itemsControl.Presenter.ApplyTemplate();
+
+                Assert.Equal(2, itemsControl.Presenter.Panel.Children.Count);
+            }
+        }
+
         [Fact]
         public void Can_Set_DataContext_In_DataTemplate()
         {