From 7e7873b3a7a7e7b88df209595ca14f846bc6d889 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 28 Sep 2015 12:25:50 +0200 Subject: [PATCH] Fixed HotKeyManager test. --- .../Utils/HotKeyManagerTests.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs index 9b6bdd6434..c078b7b47e 100644 --- a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs +++ b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs @@ -28,12 +28,13 @@ namespace Perspex.Controls.UnitTests.Utils var gesture2 = new KeyGesture {Key = Key.B, Modifiers = InputModifiers.Control}; var tl = new Window(); - var button = new Button(); + tl.Content = button; + tl.Template = CreateWindowTemplate(); + tl.ApplyTemplate(); + HotKeyManager.SetHotKey(button, gesture1); - //ContentPresenter's parent management is broken for now, so I'm setting parent property directly - button.SetValue(Control.ParentProperty, tl); Assert.Equal(gesture1, tl.KeyBindings[0].Gesture); HotKeyManager.SetHotKey(button, gesture2); @@ -52,5 +53,17 @@ namespace Perspex.Controls.UnitTests.Utils } } + + private ControlTemplate CreateWindowTemplate() + { + return new ControlTemplate(parent => + { + return new ContentPresenter + { + Name = "contentPresenter", + [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty], + }; + }); + } } }