Skip to content

Commit a317819

Browse files
authored
FIX: Change type aliasing to use the type implementing static interface instead of using derived type in tests. (#2265)
1 parent 7658a8e commit a317819

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

Assets/Tests/InputSystem/CoreTests_Actions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
using UnityEngine.TestTools;
2222
using UnityEngine.TestTools.Utils;
2323
using UnityEngine.TestTools.Constraints;
24-
using Is = UnityEngine.TestTools.Constraints.Is;
2524

26-
#pragma warning disable CS0649
27-
[SuppressMessage("ReSharper", "AccessToStaticMemberViaDerivedType")]
25+
using Is = NUnit.Framework.Is;
2826

27+
#pragma warning disable CS0649
2928
// As should be obvious from the number of tests in here, the action system rivals the entire combined rest of the system
3029
// in terms of complexity.
3130
partial class CoreTests

Assets/Tests/InputSystem/CoreTests_Controls.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using UnityEngine.InputSystem.Utilities;
1717
using UnityEngine.Profiling;
1818
using UnityEngine.TestTools.Constraints;
19-
using Is = UnityEngine.TestTools.Constraints.Is;
19+
using Is = NUnit.Framework.Is;
2020

2121
partial class CoreTests
2222
{

Assets/Tests/InputSystem/CoreTests_Devices.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using UnityEngine.TestTools.Utils;
2222
using Gyroscope = UnityEngine.InputSystem.Gyroscope;
2323
using UnityEngine.TestTools.Constraints;
24-
using Is = UnityEngine.TestTools.Constraints.Is;
24+
using Is = NUnit.Framework.Is;
2525
using Quaternion = UnityEngine.Quaternion;
2626
using TouchPhase = UnityEngine.InputSystem.TouchPhase;
2727
using Vector2 = UnityEngine.Vector2;

Assets/Tests/InputSystem/CoreTests_Events.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
using UnityEngine.TestTools;
2020
using UnityEngine.TestTools.Constraints;
2121
using UnityEngine.TestTools.Utils;
22-
using Is = UnityEngine.TestTools.Constraints.Is;
22+
23+
using Is = NUnit.Framework.Is;
2324
using Random = UnityEngine.Random;
2425
using TouchPhase = UnityEngine.InputSystem.TouchPhase;
2526

Assets/Tests/InputSystem/CoreTests_MouseEvents.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using UnityEngine;
77
using UnityEngine.InputSystem;
88
using UnityEngine.TestTools;
9-
using Is = UnityEngine.TestTools.Constraints.Is;
109

1110
partial class CoreTests
1211
{

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using UnityEngine.TestTools.Constraints;
1717
using Object = UnityEngine.Object;
1818
using Gyroscope = UnityEngine.InputSystem.Gyroscope;
19-
using Is = UnityEngine.TestTools.Constraints.Is;
19+
using Is = NUnit.Framework.Is;
2020
using UnityEngine.InputSystem.OnScreen;
2121

2222
/// <summary>

Assets/Tests/InputSystem/Plugins/UITests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using UnityEngine.TestTools.Utils;
2222
using UnityEngine.UI;
2323
using Image = UnityEngine.UI.Image;
24-
using Is = UnityEngine.TestTools.Constraints.Is;
24+
using Is = NUnit.Framework.Is;
2525
using MouseButton = UnityEngine.InputSystem.LowLevel.MouseButton;
2626
using UnityEngine.Scripting;
2727
using Cursor = UnityEngine.Cursor;

0 commit comments

Comments
 (0)