diff --git a/Assets/Tests/InputSystem/CoreTests_Actions.cs b/Assets/Tests/InputSystem/CoreTests_Actions.cs index 2e28963bb0..3a3ee6d57a 100644 --- a/Assets/Tests/InputSystem/CoreTests_Actions.cs +++ b/Assets/Tests/InputSystem/CoreTests_Actions.cs @@ -21,11 +21,10 @@ using UnityEngine.TestTools; using UnityEngine.TestTools.Utils; using UnityEngine.TestTools.Constraints; -using Is = UnityEngine.TestTools.Constraints.Is; -#pragma warning disable CS0649 -[SuppressMessage("ReSharper", "AccessToStaticMemberViaDerivedType")] +using Is = NUnit.Framework.Is; +#pragma warning disable CS0649 // As should be obvious from the number of tests in here, the action system rivals the entire combined rest of the system // in terms of complexity. partial class CoreTests diff --git a/Assets/Tests/InputSystem/CoreTests_Controls.cs b/Assets/Tests/InputSystem/CoreTests_Controls.cs index 7834b3324d..be5f459c45 100644 --- a/Assets/Tests/InputSystem/CoreTests_Controls.cs +++ b/Assets/Tests/InputSystem/CoreTests_Controls.cs @@ -16,7 +16,7 @@ using UnityEngine.InputSystem.Utilities; using UnityEngine.Profiling; using UnityEngine.TestTools.Constraints; -using Is = UnityEngine.TestTools.Constraints.Is; +using Is = NUnit.Framework.Is; partial class CoreTests { diff --git a/Assets/Tests/InputSystem/CoreTests_Devices.cs b/Assets/Tests/InputSystem/CoreTests_Devices.cs index 7c4006f6ee..af4d28cd79 100644 --- a/Assets/Tests/InputSystem/CoreTests_Devices.cs +++ b/Assets/Tests/InputSystem/CoreTests_Devices.cs @@ -21,7 +21,7 @@ using UnityEngine.TestTools.Utils; using Gyroscope = UnityEngine.InputSystem.Gyroscope; using UnityEngine.TestTools.Constraints; -using Is = UnityEngine.TestTools.Constraints.Is; +using Is = NUnit.Framework.Is; using Quaternion = UnityEngine.Quaternion; using TouchPhase = UnityEngine.InputSystem.TouchPhase; using Vector2 = UnityEngine.Vector2; diff --git a/Assets/Tests/InputSystem/CoreTests_Events.cs b/Assets/Tests/InputSystem/CoreTests_Events.cs index c3dc4c7cfd..4034353352 100644 --- a/Assets/Tests/InputSystem/CoreTests_Events.cs +++ b/Assets/Tests/InputSystem/CoreTests_Events.cs @@ -19,7 +19,8 @@ using UnityEngine.TestTools; using UnityEngine.TestTools.Constraints; using UnityEngine.TestTools.Utils; -using Is = UnityEngine.TestTools.Constraints.Is; + +using Is = NUnit.Framework.Is; using Random = UnityEngine.Random; using TouchPhase = UnityEngine.InputSystem.TouchPhase; diff --git a/Assets/Tests/InputSystem/CoreTests_MouseEvents.cs b/Assets/Tests/InputSystem/CoreTests_MouseEvents.cs index 4d797d469c..2b14c4b41d 100644 --- a/Assets/Tests/InputSystem/CoreTests_MouseEvents.cs +++ b/Assets/Tests/InputSystem/CoreTests_MouseEvents.cs @@ -6,7 +6,6 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.TestTools; -using Is = UnityEngine.TestTools.Constraints.Is; partial class CoreTests { diff --git a/Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs b/Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs index b0977877e5..dd7323d1ab 100644 --- a/Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs +++ b/Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs @@ -16,7 +16,7 @@ using UnityEngine.TestTools.Constraints; using Object = UnityEngine.Object; using Gyroscope = UnityEngine.InputSystem.Gyroscope; -using Is = UnityEngine.TestTools.Constraints.Is; +using Is = NUnit.Framework.Is; using UnityEngine.InputSystem.OnScreen; /// diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs index 101471f671..fe077139b0 100644 --- a/Assets/Tests/InputSystem/Plugins/UITests.cs +++ b/Assets/Tests/InputSystem/Plugins/UITests.cs @@ -21,7 +21,7 @@ using UnityEngine.TestTools.Utils; using UnityEngine.UI; using Image = UnityEngine.UI.Image; -using Is = UnityEngine.TestTools.Constraints.Is; +using Is = NUnit.Framework.Is; using MouseButton = UnityEngine.InputSystem.LowLevel.MouseButton; using UnityEngine.Scripting; using Cursor = UnityEngine.Cursor;