Test of KeyDown and KeyUp with special keys

Author: duracellko

src/bunit.web/EventDispatchExtensions/KeysEventFactory.cs

@@ -89,7 +89,7 @@ internal static class KeysEventFactory
 				}
 			}
 
-			if (KeyEvents.TryGetValue(key, out var keyArguments))
+			if (KeyEvents.TryGetValue(keyWithoutControlKeys, out var keyArguments))
 			{
 				return new KeyboardEventArgs
 				{

tests/bunit.web.tests/EventDispatchExtensions/KeyboardEventDispatchExtensionsTest.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Components.Web;
+using Shouldly;
 using Xunit;
 
 namespace Bunit
@@ -10,6 +11,115 @@ public class KeyboardEventDispatchExtensionsTest : EventDispatchExtensionsTest<K
 	{
 		public static IEnumerable<MethodInfo[]> Helpers { get; } = GetEventHelperMethods(typeof(KeyboardEventDispatchExtensions), x => x.GetParameters().All(p => p.ParameterType != typeof(Key)));
 
+		public static IEnumerable<object?[]> KeyTestData { get; } = new[]
+		{
+			new object?[]
+			{
+				Key.Null,
+				null
+			},
+			new object[]
+			{
+				Key.Enter,
+				new KeyboardEventArgs
+				{
+					Key = "Enter",
+					Code = "Enter"
+				}
+			},
+			new object[]
+			{
+				Key.Right,
+				new KeyboardEventArgs
+				{
+					Key = "ArrowRight",
+					Code = "ArrowRight"
+				}
+			},
+			new object[]
+			{
+				Key.Add,
+				new KeyboardEventArgs
+				{
+					Key = "+",
+					Code = "NumpadAdd"
+				}
+			},
+			new object[]
+			{
+				Key.Shift,
+				new KeyboardEventArgs
+				{
+					Key = "Shift",
+					Code = "ShiftLeft",
+					ShiftKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Control,
+				new KeyboardEventArgs
+				{
+					Key = "Control",
+					Code = "ControlLeft",
+					CtrlKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Alt,
+				new KeyboardEventArgs
+				{
+					Key = "Alt",
+					Code = "AltLeft",
+					AltKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Enter | Key.Alt,
+				new KeyboardEventArgs
+				{
+					Key = "Enter",
+					Code = "Enter",
+					AltKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Right | Key.Control,
+				new KeyboardEventArgs
+				{
+					Key = "ArrowRight",
+					Code = "ArrowRight",
+					CtrlKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Add | Key.Shift | Key.Control,
+				new KeyboardEventArgs
+				{
+					Key = "+",
+					Code = "NumpadAdd",
+					ShiftKey = true,
+					CtrlKey = true
+				}
+			},
+			new object[]
+			{
+				Key.Control | Key.Alt | Key.Shift,
+				new KeyboardEventArgs
+				{
+					Key = "Shift",
+					Code = "ShiftLeft",
+					ShiftKey = true,
+					CtrlKey = true,
+					AltKey = true
+				}
+			}
+		};
+
 		protected override string ElementName => "input";
 
 		[Theory(DisplayName = "Keyboard events are raised correctly through helpers")]
@@ -31,5 +141,29 @@ public void CanRaiseEvents(MethodInfo helper)
 
 			VerifyEventRaisesCorrectly(helper, expected);
 		}
+
+		[Theory(DisplayName = "KeyDown event is raised correctly through helper using special keys")]
+		[MemberData(nameof(KeyTestData))]
+		public void CanRaiseKeyDownWithSpecialKey(Key key, KeyboardEventArgs expected)
+		{
+			var spy = CreateTriggerSpy(ElementName, "onkeydown");
+			spy.Trigger(element =>
+			{
+				element.KeyDown(key);
+			});
+			spy.RaisedEvent.ShouldBeEquivalentTo(expected);
+		}
+
+		[Theory(DisplayName = "KeyDown event is raised correctly through helper using special keys")]
+		[MemberData(nameof(KeyTestData))]
+		public void CanRaiseKeyUpWithSpecialKey(Key key, KeyboardEventArgs expected)
+		{
+			var spy = CreateTriggerSpy(ElementName, "onkeyup");
+			spy.Trigger(element =>
+			{
+				element.KeyUp(key);
+			});
+			spy.RaisedEvent.ShouldBeEquivalentTo(expected);
+		}
 	}
 }