From 07ce39b72296b136625214569249fd71a2428776 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 17 Oct 2024 12:50:01 +0300 Subject: [PATCH 1/4] Update UITests.cs --- Assets/Tests/InputSystem/Plugins/UITests.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index ef2f16f3ce..56f8fba62f 100644 --- 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,9 @@ 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 #endif public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas() { @@ -3980,8 +3980,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 +4032,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 +4085,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() { From 3f4394af5f166e0b1c8230f1344f3ba7f1c517bc Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 17 Oct 2024 13:01:09 +0300 Subject: [PATCH 2/4] Update UITests.cs --- Assets/Tests/InputSystem/Plugins/UITests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 56f8fba62f..2802f88b90 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -4162,8 +4162,6 @@ public IEnumerator UI_DisplayIndexMatchesDisplayMultiplePointers() // Verify Clicks On Display 1 Are Ignored On Display 0 Assert.AreEqual(0, scene.parentReceiver.events.Count); } - -#endif #endregion public class MyButton : UnityEngine.UI.Button From 2f0c3a3fe29485b93e6e2eb73483f98719bf6e70 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 17 Oct 2024 13:03:08 +0300 Subject: [PATCH 3/4] Revert "Update UITests.cs" This reverts commit 3f4394af5f166e0b1c8230f1344f3ba7f1c517bc. --- Assets/Tests/InputSystem/Plugins/UITests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 2802f88b90..56f8fba62f 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -4162,6 +4162,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayMultiplePointers() // Verify Clicks On Display 1 Are Ignored On Display 0 Assert.AreEqual(0, scene.parentReceiver.events.Count); } + +#endif #endregion public class MyButton : UnityEngine.UI.Button From c96de4eb5a2b6d7ff339eb11244f59fb45d99ae8 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 17 Oct 2024 13:04:20 +0300 Subject: [PATCH 4/4] Update UITests.cs --- Assets/Tests/InputSystem/Plugins/UITests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 56f8fba62f..6ca04144bd 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -3929,7 +3929,6 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanv [UnityTest] #if UNITY_TVOS || UNITY_ANDROID [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")] -#endif #endif public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas() {