FIX: ISX-1183 fixed and reenabled UITests for InputSystemUIInputModule. (#1974)

* ISX-1183: fixed and reenabled UITests for InputSystemUIInputModule.

* Attempted to stabilize UI_CanOperateUIToolkitInterface test.

* Don't run the UIToolkit tests on 2021

* Reverted unneeded changes to UITests.

---------

Co-authored-by: bmalrat <47957918+bmalrat@users.noreply.github.com>

Author: benoitalain

Assets/Tests/InputSystem/Assets/UITKTestSceneDocument.uxml

@@ -1,7 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <ui:VisualElement style="width: 640px; height: 480px;">
         <ui:ScrollView name="ScrollView" style="flex-grow: 1; width: 50%; height: 100px; left: 50%; top: 0; flex-direction: column; flex-basis: auto; position: absolute;">
-            <ui:TextField picking-mode="Ignore" value="filler text" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&#10;" multiline="false" readonly="true" style="font-size: 50px; white-space: normal;" />
+            <ui:TextField picking-mode="Ignore" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&#10;" multiline="true" readonly="true" style="font-size: 50px; white-space: normal;" />
         </ui:ScrollView>
         <ui:Button text="Button" display-tooltip-when-elided="true" name="Button" focusable="true" style="justify-content: flex-start; height: 100%; width: 50%; align-items: stretch; left: auto; flex-grow: 1;" />
     </ui:VisualElement>

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -117,6 +117,7 @@ public Quaternion RotateFromTo(Vector3 position, GameObject from, GameObject to)
     public override void Setup()
     {
         base.Setup();
+        Screen.SetResolution(640, 480, FullScreenMode.Windowed);
     }
 
     private static TestObjects CreateUIScene()
@@ -3567,22 +3568,13 @@ public void UI_CanDriveVirtualMouseCursorFromGamepad()
     // to our manifest without breaking test runs with previous versions of Unity. However, in 2021.2, all the UITK functionality
     // has moved into the com.unity.modules.uielements module which is also available in previous versions of Unity. This way we
     // can have a reference to UITK that doesn't break things in previous versions of Unity.
-#if UNITY_2021_2_OR_NEWER
+#if UNITY_2022_3_OR_NEWER
     [UnityTest]
     [Category("UI")]
-    [TestCase(UIPointerBehavior.AllPointersAsIs, ExpectedResult = 1
-#if TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN)
-        , Ignore = "Currently fails on MacOS, MacOS standalone, MacOS standalone IL2CPP player on Unity version 2022.2 CI"
-#endif
-     )]
-    [TestCase(UIPointerBehavior.SingleMouseOrPenButMultiTouchAndTrack, ExpectedResult = 1
-#if TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX)
-            // temporarily disable this test case on OSX player for 2021.2. It only intermittently works and I don't know why!
-        , Ignore = "Currently fails on OSX IL2CPP player on Unity version 2021.2"
-#endif
-     )]
+    [TestCase(UIPointerBehavior.AllPointersAsIs, ExpectedResult = 1)]
+    [TestCase(UIPointerBehavior.SingleMouseOrPenButMultiTouchAndTrack, ExpectedResult = 1)]
     [TestCase(UIPointerBehavior.SingleUnifiedPointer, ExpectedResult = 1)]
-#if (UNITY_ANDROID || UNITY_IOS || UNITY_TVOS) || (TEMP_DISABLE_UITOOLKIT_TEST && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN))
+#if UNITY_ANDROID || UNITY_IOS || UNITY_TVOS
     [Ignore("Currently fails on the farm but succeeds locally on Note 10+; needs looking into.")]
 #endif
 #if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
@@ -3684,7 +3676,7 @@ static bool IsActive(VisualElement ve)
             // Case 1369081: Make sure button doesn't get "stuck" in an active state when multiple fingers are used.
             BeginTouch(1, buttonCenter, screen: touchscreen);
             yield return null;
-            Assert.That(uiButtonDownCount, Is.EqualTo(1), "Expected uiButtonDownCount to be 0");
+            Assert.That(uiButtonDownCount, Is.EqualTo(1), "Expected uiButtonDownCount to be 1");
             Assert.That(uiButtonUpCount, Is.EqualTo(0), "Expected uiButtonUpCount to be 0");
             Assert.That(IsActive(uiButton), Is.True, "Expected uiButton to be active");
 

Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef

@@ -31,11 +31,6 @@
             "expression": "1.0",
             "define": "HAVE_DOCTOOLS_INSTALLED"
         },
-        {
-            "name": "Unity",
-            "expression": "2021.1",
-            "define": "TEMP_DISABLE_UITOOLKIT_TEST"
-        },
         {
             "name": "Unity",
             "expression": "2022.1",