Skip to content

Commit 7836085

Browse files
Fix two broken tests due to key ordering of presses.
1 parent 86d55b1 commit 7836085

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

Assets/Tests/InputSystem/CoreTests_ActionsPriority.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ private static IEnumerable<TwoInputActionDataWrapper<InputAction, InputAction>>
5858
};
5959
yield return new TwoInputActionDataWrapper<InputAction, InputAction>
6060
{
61-
Action1 = map.SetupTestAction("shift", "h"),
62-
Action2 = map.SetupTestAction("shift", "ctrl", "h")
61+
Action1 = map.SetupTestAction("ctrl", "shift", "h"),
62+
Action2 = map.SetupTestAction("shift", "h")
6363
};
6464
yield return new TwoInputActionDataWrapper<InputAction, InputAction>
6565
{
@@ -152,11 +152,10 @@ public void Actions_Priority_OnlyOneActionIsPerformed_WhenOnePriorityIsHigherTha
152152
InputSystem.settings.shortcutKeysConsumeInput = true;
153153
var keyboard = InputSystem.AddDevice<Keyboard>();
154154

155-
//var map = new InputActionMap("map");
156155
var action1 = twoInputActions.Action1;
157156
var action2 = twoInputActions.Action2;
158157

159-
// action 1's priority higher so it takes precedence
158+
// action 2's priority higher so it takes precedence
160159
action1.Priority = 1;
161160
action2.Priority = 2;
162161

@@ -173,9 +172,6 @@ public void Actions_Priority_OnlyOneActionIsPerformed_WhenOnePriorityIsHigherTha
173172

174173
ReleaseBindingsForActions(keyboard, action1, action2);
175174

176-
// Update again to be sure released is true.
177-
InputSystem.Update();
178-
179175
Assert.That(action1.WasPerformedThisFrame(), Is.False);
180176
Assert.That(action2.WasPerformedThisFrame(), Is.False);
181177
}

0 commit comments

Comments
 (0)