From 9adf6f2dedb9a5a316a223f0a32f535c17d5092d Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 9 Apr 2024 17:47:46 +0200
Subject: [PATCH] test: Automatic Routed Event Handler Genration

---
 .../Avalonia.Markup.Xaml.UnitTests.csproj     | 10 +++++
 .../Xaml/EventTests.cs                        | 44 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 6c488ec94f7e..4c0217bcc7bc 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -36,5 +36,15 @@
       <Link>PlatformFactAttribute.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="xunit.runner.console" Version="2.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
index c9e0a3d5f0ad..304da097c09d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
@@ -39,6 +39,23 @@ public void Attached_Event_Is_Assigned()
             Assert.True(target.WasTapped);
         }
 
+        [Fact]
+        public void Attached_Event_Is_Assigned_Generic()
+        {
+            var xaml = @"<Panel xmlns='https://github.com/avaloniaui'><Grid DoubleTapped='OnTapped'><Button Name='target'/></Grid></Panel>";
+            var host = new MyPanel();
+
+            AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: host);
+
+            var target = host.FindControl<Button>("target");
+
+            Assert.NotNull(target);
+
+            target.RaiseEvent(new TappedEventArgs(Gestures.DoubleTappedEvent, default));
+
+            Assert.True(host.WasTapped);
+        }
+
         [Fact]
         public void Exception_Is_Thrown_If_Event_Not_Found()
         {
@@ -48,6 +65,25 @@ public void Exception_Is_Thrown_If_Event_Not_Found()
             XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: target));
         }
 
+
+
+        [Fact]
+        public void Attached_Event_Routed_Event_Handler()
+        {
+            var xaml = @"<Panel xmlns='https://github.com/avaloniaui' Button.Click='OnClick'><Button Name='target'/></Panel>";
+            var host = new MyPanel();
+
+            AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: host);
+
+            var target = host.FindControl<Button>("target");
+            target.RaiseEvent(new RoutedEventArgs
+            {
+                RoutedEvent = Button.ClickEvent,
+            });
+
+            Assert.True(host.WasClicked);
+        }
+
         public class MyButton : Button
         {
             public bool WasClicked { get; private set; }
@@ -56,5 +92,13 @@ public class MyButton : Button
             public void OnClick(object sender, RoutedEventArgs e) => WasClicked = true;
             public void OnTapped(object sender, RoutedEventArgs e) => WasTapped = true;
         }
+
+        public class MyPanel : Panel
+        {
+            public bool WasClicked { get; private set; }
+            public bool WasTapped { get; private set; }
+            public void OnClick(object sender, RoutedEventArgs e) => WasClicked = true;
+            public void OnTapped(object sender, RoutedEventArgs e) => WasTapped = true;
+        }
     }
 }