Add test cleanup.

Author: Darren-Kelly-Unity

Assets/Tests/InputSystem/CoreTests_ActionsPriority.cs

@@ -110,7 +110,7 @@ private void ReleaseBindingsForActions(Keyboard keyboard, InputAction action1, I
     [Test]
     [Category("Actions Priority")]
     [TestCaseSource(nameof(TwoInputActionTestCases))]
-    public void Actions_Priority_OnlyOneActionIsPerformed_WhenOnePriorityIsHigherThanOther(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
+    public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOther(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
         InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
@@ -147,7 +147,7 @@ public void Actions_Priority_OnlyOneActionIsPerformed_WhenOnePriorityIsHigherTha
     [Test]
     [Category("Actions Priority")]
     [TestCaseSource(nameof(TwoInputActionTestCases))]
-    public void Actions_Priority_OnlyOneActionIsPerformed_WhenOnePriorityIsHigherThanOtherInversePriorityOrder(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
+    public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOtherInversePriorityOrder(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
         InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
@@ -217,7 +217,7 @@ public void Actions_Priority_BothActionsArePerformed_DueToKeyPressOrderForShortc
     [Test]
     [Category("Actions Priority")]
     [TestCaseSource(nameof(TwoInputActionTestCases))]
-    public void Actions_Priority_FirstActionFires_WhenPriorityIsEqual(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions) // TODO: This shouldn't be the case. This should fire both!!
+    public void Actions_Priority_BothActionFires_WhenPriorityIsEqual(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
         InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
@@ -233,7 +233,7 @@ public void Actions_Priority_FirstActionFires_WhenPriorityIsEqual(TwoInputAction
         PressBindingsForInputActions(keyboard, action1, action2);
 
         Assert.That(action1.WasPerformedThisFrame(), Is.True);
-        Assert.That(action2.WasPerformedThisFrame(), Is.False);
+        Assert.That(action2.WasPerformedThisFrame(), Is.True);
     }
 
     [Test]
@@ -316,13 +316,6 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
         // Different letter keys: no conflict on the same control, so both shortcuts can perform despite different priorities.
         Assert.That(action1WasPerformed, Is.True);
         Assert.That(action2.WasPerformedThisFrame(), Is.True);
-
-        // TODO: Darren, trigger just the bindings again to be sure the shortcut doesn't trigger for a second time
-        // Press((ButtonControl)keyboard[action1.GetBind], queueEventOnly: true);
-        // Press((ButtonControl)keyboard[action2.controls[i].name], queueEventOnly: true);
-        //
-        // Assert.That(action1.WasPerformedThisFrame(), Is.False);
-        // Assert.That(action2.WasPerformedThisFrame(), Is.False);
     }
 
     [Test]
@@ -353,13 +346,6 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
         // Different letter keys: no conflict on the same control, so both shortcuts can perform despite different priorities.
         Assert.That(action1WasPerformed, Is.True);
         Assert.That(action2.WasPerformedThisFrame(), Is.True);
-
-        // TODO: Darren, trigger just the bindings again to be sure the shortcut doesn't trigger for a second time
-        // Press((ButtonControl)keyboard[action1.GetBind], queueEventOnly: true);
-        // Press((ButtonControl)keyboard[action2.controls[i].name], queueEventOnly: true);
-        //
-        // Assert.That(action1.WasPerformedThisFrame(), Is.False);
-        // Assert.That(action2.WasPerformedThisFrame(), Is.False);
     }
 
     [Test]
@@ -390,12 +376,5 @@ public void Actions_Priority_BothActionsWithEqualPriorityFire_WhenThereIsNoConfl
         // Different letter keys: no conflict on the same control, so both shortcuts can perform despite different priorities.
         Assert.That(action1WasPerformed, Is.True);
         Assert.That(action2.WasPerformedThisFrame(), Is.True);
-
-        // TODO: Darren, trigger just the bindings again to be sure the shortcut doesn't trigger for a second time
-        // Press((ButtonControl)keyboard[action1.GetBind], queueEventOnly: true);
-        // Press((ButtonControl)keyboard[action2.controls[i].name], queueEventOnly: true);
-        //
-        // Assert.That(action1.WasPerformedThisFrame(), Is.False);
-        // Assert.That(action2.WasPerformedThisFrame(), Is.False);
     }
 }