test cleanup

Author: bmalrat

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

@@ -677,12 +677,10 @@ public void PlayerInput_AutoSwitchControlSchemesInSinglePlayerWithOnScreenContro
         onScreenButton.enabled = false;
         onScreenButton.controlPath = "<Gamepad>/buttonSouth";
 
-        var listener = go.AddComponent<MessageListener>();
         var playerInput = go.AddComponent<PlayerInput>();
         playerInput.defaultControlScheme = "Keyboard&Mouse";
         playerInput.defaultActionMap = "gameplay";
         playerInput.actions = InputActionAsset.FromJson(kActions);
-        listener.messages.Clear();
 
         Assert.That(playerInput.devices, Is.EquivalentTo(new InputDevice[] { keyboard, mouse }));
 
@@ -705,12 +703,6 @@ public void PlayerInput_AutoSwitchControlSchemesInSinglePlayerWithOnScreenContro
         Assert.That(playerInput.user.controlScheme, Is.Not.Null);
         Assert.That(playerInput.user.controlScheme.Value.name, Is.EqualTo("Gamepad"));
 
-
-        // Perform mouse move and click. to try to switch to Keyboard&Mouse scheme
-        Move(mouse.position, new Vector2(0.123f, 0.234f));
-        Click(mouse.leftButton);
-        Move(mouse.position, new Vector2(100f, 100f));
-
         // disabling the OnScreenButton to ensure that it will now switch to Keyboard&Mouse as expected
         onScreenButton.enabled = false;
 

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -2590,9 +2590,9 @@ public IEnumerator TODO_UI_CanGetLastUsedDevice()
         Assert.Fail();
     }
 
-    [Test]
+    [UnityTest]
     [Category("UI")]
-    public void UI_ClickDraggingMouseDoesNotAllocateGCMemory()
+    public IEnumerator UI_ClickDraggingMouseDoesNotAllocateGCMemory()
     {
         var mouse = InputSystem.AddDevice<Mouse>();
 
@@ -2630,6 +2630,8 @@ public void UI_ClickDraggingMouseDoesNotAllocateGCMemory()
         Release(mouse.leftButton);
         scene.eventSystem.InvokeUpdate();
 
+        yield return null;
+
         var kProfilerRegion = "UI_ClickDraggingDoesNotAllocateGCMemory";
 
         // Now for real.