Add progress with setting up tests.

Author: Darren-Kelly-Unity

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -299,6 +299,111 @@ public void Actions_WhenShortcutsEnabled_CanConsumeInput(bool legacyComposites)
         Assert.That(!action3.WasPerformedThisFrame());
     }
 
+    [Test]
+    [Category("Actions Priority")]
+    [TestCase("ctrl", null, "x", "c", true)]
+    [TestCase("ctrl", "leftAlt", "x", "c", true)]
+    [TestCase("ctrl", null, "x", "c", false)]
+    [TestCase("ctrl", "leftAlt", "x", "c", false)]
+    public void Actions_PressingShortcutSequenceAtSameTime_TriggersbothShortcutsDueToNoPriority(string sharedModifier, string sharedModifier2, string binding1, string binding2,
+        bool legacyComposites)
+    {
+        InputSystem.settings.shortcutKeysConsumeInput = false;
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+
+        var action1 = new InputAction();
+        if (!string.IsNullOrEmpty(sharedModifier2))
+        {
+            action1.AddCompositeBinding((legacyComposites ? "ButtonWithTwoModifiers" : "TwoModifiers") + "(overrideModifiersNeedToBePressedFirst)")
+                .With("Modifier1", "<Keyboard>/" + sharedModifier)
+                .With("Modifier2", "<Keyboard>/" + sharedModifier2)
+                .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding1);
+        }
+        else
+        {
+            action1.AddCompositeBinding((legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + "(overrideModifiersNeedToBePressedFirst)")
+                .With("Modifier", "<Keyboard>/" + sharedModifier)
+                .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding1);
+        }
+
+        var action2 = new InputAction();
+        if (!string.IsNullOrEmpty(sharedModifier2))
+        {
+            action2.AddCompositeBinding((legacyComposites ? "ButtonWithTwoModifiers" : "TwoModifiers") + "(overrideModifiersNeedToBePressedFirst)")
+                .With("Modifier1", "<Keyboard>/" + sharedModifier)
+                .With("Modifier2", "<Keyboard>/" + sharedModifier2)
+                .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding2);
+        }
+        else
+        {
+            action2.AddCompositeBinding((legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + "(overrideModifiersNeedToBePressedFirst)")
+                .With("Modifier", "<Keyboard>/" + sharedModifier)
+                .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding2);
+        }
+
+        action1.Enable();
+        action2.Enable();
+
+        Press((ButtonControl)keyboard[sharedModifier], queueEventOnly: true);
+
+        Assert.That(action1.WasPerformedThisFrame(), Is.False);
+        Assert.That(action2.WasPerformedThisFrame(), Is.False);
+        if (!string.IsNullOrEmpty(sharedModifier2))
+        {
+            Assert.That(action1.WasPerformedThisFrame(), Is.False);
+            Assert.That(action2.WasPerformedThisFrame(), Is.False);
+            Press((ButtonControl)keyboard[sharedModifier2], queueEventOnly: true);
+        }
+
+        Press((ButtonControl)keyboard[binding1], queueEventOnly: true);
+        Press((ButtonControl)keyboard[binding2]);
+
+        // Action1 won't be performed due to the priority being below action2
+        Assert.That(action1.WasPerformedThisFrame(), Is.True);
+        Assert.That(action2.WasPerformedThisFrame(), Is.True);
+    }
+
+    [Test]
+    [Category("Actions Priority")]
+    [TestCase("ctrl", "shift", "x", "c", false)]
+    public void Actions_PressingTwoShortcutsSequenceAtSameTime_TriggersOneShortcutDueToPriority(string sharedModifier, string sharedModifier2, string binding1, string binding2,
+        bool legacyComposites)
+    {
+        InputSystem.settings.shortcutKeysConsumeInput = true;
+
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+        var action1 = new InputAction();
+        action1.AddCompositeBinding((legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + "(overrideModifiersNeedToBePressedFirst)")
+            .With("Modifier", "<Keyboard>/" + sharedModifier)
+            .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding1);
+
+        var action2 = new InputAction();
+        action2.AddCompositeBinding((legacyComposites ? "ButtonWithOneModifier" : "OneModifier") + "(overrideModifiersNeedToBePressedFirst)")
+            .With("Modifier", "<Keyboard>/" + sharedModifier2)
+            .With(legacyComposites ? "Button" : "Binding", "<Keyboard>/" + binding2);
+
+
+        action1.Enable();
+        action2.Enable();
+
+        // TODO: Priority not working, not sure why FIX THIS
+        action1.Priority = 0;
+        action2.Priority = 1;
+
+
+        Assert.That(action1.WasPerformedThisFrame(), Is.False);
+        Assert.That(action2.WasPerformedThisFrame(), Is.False);
+
+        Press((ButtonControl)keyboard[sharedModifier], queueEventOnly: true);
+        Press((ButtonControl)keyboard[binding1], queueEventOnly: true);
+        Press((ButtonControl)keyboard[sharedModifier2], queueEventOnly: true);
+        Press((ButtonControl)keyboard[binding2]);
+
+        // Action1 won't be performed due to the priority being below action2
+        Assert.That(action1.WasPerformedThisFrame(), Is.True);
+        Assert.That(action2.WasPerformedThisFrame(), Is.True);
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_ShortcutSupportDisabledByDefault()