CHANGE: Disable some display index tests on android (#2029)

Pauliusd01 · web-flow · commit 0c6e2279909f · 2024-10-17T17:16:46.000+03:00
* Update UITests.cs * Update UITests.cs * Revert "Update UITests.cs" This reverts commit 3f4394a. * Update UITests.cs
diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs
@@ -3876,8 +3876,8 @@ public IEnumerator UI_WhenCursorIsLockedToScreenCenter_PointerEnterAndExitEvents
 #if UNITY_2022_3_OR_NEWER // displayIndex is only available from 2022.3 onwards
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanvas()
     {
@@ -3927,9 +3927,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanv
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
-#else
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
     {
@@ -3980,8 +3979,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()
     {
@@ -4032,6 +4031,9 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()
     }
 
     [UnityTest]
+#if UNITY_ANDROID
+    [Ignore("Failing on Android https://jira.unity3d.com/browse/ISX-2029")]
+#endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()
     {
         // Setup the Test Scene
@@ -4082,8 +4084,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayMultiplePointers()
     {

Original file line number	Diff line number	Diff line change
`@@ -3876,8 +3876,8 @@ public IEnumerator UI_WhenCursorIsLockedToScreenCenter_PointerEnterAndExitEvents`
`3876`	`3876`	`#if UNITY_2022_3_OR_NEWER // displayIndex is only available from 2022.3 onwards`
`3877`	`3877`
`3878`	`3878`	`[UnityTest]`
`3879`		`-#if UNITY_TVOS`
`3880`		`- [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]`
	`3879`	`+#if UNITY_TVOS \|\| UNITY_ANDROID`
	`3880`	`+ [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]`
`3881`	`3881`	`#endif`
`3882`	`3882`	`public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanvas()`
`3883`	`3883`	`{`
`@@ -3927,9 +3927,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanv`
`3927`	`3927`	`}`
`3928`	`3928`
`3929`	`3929`	`[UnityTest]`
`3930`		`-#if UNITY_TVOS`
`3931`		`- [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]`
`3932`		`-#else`
	`3930`	`+#if UNITY_TVOS \|\| UNITY_ANDROID`
	`3931`	`+ [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]`
`3933`	`3932`	`#endif`
`3934`	`3933`	`public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()`
`3935`	`3934`	`{`
`@@ -3980,8 +3979,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()`
`3980`	`3979`	`}`
`3981`	`3980`
`3982`	`3981`	`[UnityTest]`
`3983`		`-#if UNITY_TVOS`
`3984`		`- [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]`
	`3982`	`+#if UNITY_TVOS \|\| UNITY_ANDROID`
	`3983`	`+ [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]`
`3985`	`3984`	`#endif`
`3986`	`3985`	`public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()`
`3987`	`3986`	`{`
`@@ -4032,6 +4031,9 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()`
`4032`	`4031`	`}`
`4033`	`4032`
`4034`	`4033`	`[UnityTest]`
	`4034`	`+#if UNITY_ANDROID`
	`4035`	`+ [Ignore("Failing on Android https://jira.unity3d.com/browse/ISX-2029")]`
	`4036`	`+#endif`
`4035`	`4037`	`public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()`
`4036`	`4038`	`{`
`4037`	`4039`	`// Setup the Test Scene`
`@@ -4082,8 +4084,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()`
`4082`	`4084`	`}`
`4083`	`4085`
`4084`	`4086`	`[UnityTest]`
`4085`		`-#if UNITY_TVOS`
`4086`		`- [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]`
	`4087`	`+#if UNITY_TVOS \|\| UNITY_ANDROID`
	`4088`	`+ [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]`
`4087`	`4089`	`#endif`
`4088`	`4090`	`public IEnumerator UI_DisplayIndexMatchesDisplayMultiplePointers()`
`4089`	`4091`	`{`