Skip to content

CHANGE: Disable some display index tests on android #2029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 17, 2024
Merged

CHANGE: Disable some display index tests on android #2029

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07ce39b
Update UITests.cs
Pauliusd01 Oct 17, 2024
3f4394a
Update UITests.cs
Pauliusd01 Oct 17, 2024
2f0c3a3
Revert "Update UITests.cs"
Pauliusd01 Oct 17, 2024
c96de4e
Update UITests.cs
Pauliusd01 Oct 17, 2024
c0cc475
Merge branch 'develop' into disable-displayindex-tests-on-android
Pauliusd01 Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Assets/Tests/InputSystem/Plugins/UITests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra #endif is here

public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
{
Expand Down
Loading