Move InputSystemTestHooks out of InputSystem partial class

jfreire-unity · jfreire-unity · commit b11fcc6d037e · 2026-04-28T17:21:13.000+03:00
diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs
@@ -220,7 +220,7 @@ public void Editor_DomainReload_PreservesUsagesOnDevices()
         var device = InputSystem.AddDevice<Gamepad>();
         InputSystem.SetDeviceUsage(device, CommonUsages.LeftHand);
 
-        InputSystem.TestHook_SimulateDomainReload(runtime);
+        InputSystemTestHooks.TestHook_SimulateDomainReload(runtime);
 
         var newDevice = InputSystem.devices[0];
 
@@ -240,7 +240,7 @@ public void Editor_DomainReload_PreservesEnabledState()
 
         Assert.That(device.enabled, Is.False);
 
-        InputSystem.TestHook_SimulateDomainReload(runtime);
+        InputSystemTestHooks.TestHook_SimulateDomainReload(runtime);
 
         var newDevice = InputSystem.devices[0];
 
@@ -253,7 +253,7 @@ public void Editor_DomainReload_InputSystemInitializationCausesDevicesToBeRecrea
     {
         InputSystem.AddDevice<Gamepad>();
 
-        InputSystem.TestHook_SimulateDomainReload(runtime);
+        InputSystemTestHooks.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.devices, Has.Count.EqualTo(1));
         Assert.That(InputSystem.devices[0], Is.TypeOf<Gamepad>());
@@ -290,7 +290,7 @@ public void Editor_DomainReload_CustomDevicesAreRestoredAsLayoutsBecomeAvailable
         InputSystem.RegisterLayout(kLayout);
         InputSystem.AddDevice("CustomDevice");
 
-        InputSystem.TestHook_SimulateDomainReload(runtime);
+        InputSystemTestHooks.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.devices, Is.Empty);
 
@@ -311,7 +311,7 @@ public void Editor_DomainReload_RetainsUnsupportedDevices()
         });
         InputSystem.Update();
 
-        InputSystem.TestHook_SimulateDomainReload(runtime);
+        InputSystemTestHooks.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.GetUnsupportedDevices(), Has.Count.EqualTo(1));
         Assert.That(InputSystem.GetUnsupportedDevices()[0].interfaceName, Is.EqualTo("SomethingUnknown"));
diff --git a/Assets/Tests/InputSystem/CoreTests_Remoting.cs b/Assets/Tests/InputSystem/CoreTests_Remoting.cs
@@ -498,12 +498,12 @@ public FakeRemote()
 
         public void SwitchToRemoteState()
         {
-            InputSystem.TestHook_SwitchToDifferentInputManager(remoteManager);
+            InputSystemTestHooks.TestHook_SwitchToDifferentInputManager(remoteManager);
         }
 
         public void SwitchToLocalState()
         {
-            InputSystem.TestHook_SwitchToDifferentInputManager(localManager);
+            InputSystemTestHooks.TestHook_SwitchToDifferentInputManager(localManager);
         }
 
         public void Dispose()
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputSystemEditorInitializer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/InputSystemEditorInitializer.cs
@@ -341,11 +341,11 @@ private static void RegisterAssemblyReloadHooks()
 
         private static void RegisterTestHooks()
         {
-            InputSystem.s_TestHookInitializeForPlayModeTests = TestHook_InitializeForPlayModeTests;
+            InputSystemTestHooks.s_TestHookInitializeForPlayModeTests = TestHook_InitializeForPlayModeTests;
 #if !ENABLE_CORECLR
-            InputSystem.s_TestHookSimulateDomainReload = TestHook_SimulateDomainReload;
+            InputSystemTestHooks.s_TestHookSimulateDomainReload = TestHook_SimulateDomainReload;
 #endif
-            InputSystem.s_TestHookEditorCleanup = TestHook_EditorCleanup;
+            InputSystemTestHooks.s_TestHookEditorCleanup = TestHook_EditorCleanup;
         }
 
         private static void SetUpEditorRemoting()
diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemTestHooks.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemTestHooks.cs
@@ -1,16 +1,15 @@
 using System;
-using System.Collections.Generic;
 using UnityEngine.InputSystem.LowLevel;
 
 #if UNITY_EDITOR || UNITY_INCLUDE_TESTS
 
 namespace UnityEngine.InputSystem
 {
     /// <summary>
-    /// Extension of class to provide test-specific functionality.
-    /// Editor-specific operations are handled via callbacks set by the Editor assembly.
+    /// Test-only helpers that access InputSystem internals.
+    /// Editor-specific operations are registered as delegates by the Editor assembly.
     /// </summary>
-    public static partial class InputSystem
+    internal static class InputSystemTestHooks
     {
 #if UNITY_EDITOR
         internal static Action<bool, IInputRuntime> s_TestHookInitializeForPlayModeTests;
@@ -36,26 +35,26 @@ internal static void TestHook_SimulateDomainReload(IInputRuntime runtime)
         internal static void TestHook_DestroyAndReset()
         {
             InputSystem.s_Manager?.Dispose();
-            if (InputSystem.s_RemoteConnection != null)
-                Object.DestroyImmediate(InputSystem.s_RemoteConnection);
+            if (InputSystem.remoteConnection != null)
+                Object.DestroyImmediate(InputSystem.remoteConnection);
 
             s_TestHookEditorCleanup?.Invoke();
 
             InputSystem.s_Manager = null;
-            InputSystem.s_RemoteConnection = null;
+            InputSystem.remoteConnection = null;
             InputSystem.s_Remote = null;
         }
 
         internal static void TestHook_RestoreFromSavedState(InputManager manager, InputRemoting remote, RemoteInputPlayerConnection remoteConnection)
         {
-            s_Manager = manager;
-            s_Remote = remote;
-            s_RemoteConnection = remoteConnection;
+            InputSystem.s_Manager = manager;
+            InputSystem.s_Remote = remote;
+            InputSystem.remoteConnection = remoteConnection;
         }
 
         internal static void TestHook_SwitchToDifferentInputManager(InputManager otherManager)
         {
-            s_Manager = otherManager;
+            InputSystem.s_Manager = otherManager;
             InputStateBuffers.SwitchTo(otherManager.m_StateBuffers, otherManager.defaultUpdateType);
         }
     }
diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestStateManager.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestStateManager.cs
@@ -84,7 +84,7 @@ public void Reset(bool enableRemoting, IInputRuntime runtime)
 
 #if UNITY_EDITOR
             // Perform special initialization for running Editor tests
-            InputSystem.TestHook_InitializeForPlayModeTests(enableRemoting, runtime);
+            InputSystemTestHooks.TestHook_InitializeForPlayModeTests(enableRemoting, runtime);
 #else
             // For Player tests we can use the normal initialization
             InputSystem.InitializeInPlayer(runtime, false);
@@ -116,13 +116,13 @@ public void Restore()
             state.touchState.StaticDisposeCurrentState();
             state.inputActionState.StaticDisposeCurrentState();
 
-            InputSystem.TestHook_DestroyAndReset();
+            InputSystemTestHooks.TestHook_DestroyAndReset();
 
             state.inputUserState.RestoreSavedState();
             state.touchState.RestoreSavedState();
             state.inputActionState.RestoreSavedState();
 
-            InputSystem.TestHook_RestoreFromSavedState(state.manager, state.remote, state.remoteConnection);
+            InputSystemTestHooks.TestHook_RestoreFromSavedState(state.manager, state.remote, state.remoteConnection);
             InputUpdate.Restore(state.managerState.updateState);
 
             InputSystem.manager.InstallRuntime(InputSystem.manager.runtime);

Original file line number	Diff line number	Diff line change
`@@ -498,12 +498,12 @@ public FakeRemote()`
`498`	`498`
`499`	`499`	`public void SwitchToRemoteState()`
`500`	`500`	`{`
`501`		`- InputSystem.TestHook_SwitchToDifferentInputManager(remoteManager);`
	`501`	`+ InputSystemTestHooks.TestHook_SwitchToDifferentInputManager(remoteManager);`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`public void SwitchToLocalState()`
`505`	`505`	`{`
`506`		`- InputSystem.TestHook_SwitchToDifferentInputManager(localManager);`
	`506`	`+ InputSystemTestHooks.TestHook_SwitchToDifferentInputManager(localManager);`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -341,11 +341,11 @@ private static void RegisterAssemblyReloadHooks()`
`341`	`341`
`342`	`342`	`private static void RegisterTestHooks()`
`343`	`343`	`{`
`344`		`- InputSystem.s_TestHookInitializeForPlayModeTests = TestHook_InitializeForPlayModeTests;`
	`344`	`+ InputSystemTestHooks.s_TestHookInitializeForPlayModeTests = TestHook_InitializeForPlayModeTests;`
`345`	`345`	`#if !ENABLE_CORECLR`
`346`		`- InputSystem.s_TestHookSimulateDomainReload = TestHook_SimulateDomainReload;`
	`346`	`+ InputSystemTestHooks.s_TestHookSimulateDomainReload = TestHook_SimulateDomainReload;`
`347`	`347`	`#endif`
`348`		`- InputSystem.s_TestHookEditorCleanup = TestHook_EditorCleanup;`
	`348`	`+ InputSystemTestHooks.s_TestHookEditorCleanup = TestHook_EditorCleanup;`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`private static void SetUpEditorRemoting()`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,15 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using UnityEngine.InputSystem.LowLevel;`
`4`	`3`
`5`	`4`	`#if UNITY_EDITOR \|\| UNITY_INCLUDE_TESTS`
`6`	`5`
`7`	`6`	`namespace UnityEngine.InputSystem`
`8`	`7`	`{`
`9`	`8`	`/// <summary>`
`10`		`- /// Extension of class to provide test-specific functionality.`
`11`		`- /// Editor-specific operations are handled via callbacks set by the Editor assembly.`
	`9`	`+ /// Test-only helpers that access InputSystem internals.`
	`10`	`+ /// Editor-specific operations are registered as delegates by the Editor assembly.`
`12`	`11`	`/// </summary>`
`13`		`- public static partial class InputSystem`
	`12`	`+ internal static class InputSystemTestHooks`
`14`	`13`	`{`
`15`	`14`	`#if UNITY_EDITOR`
`16`	`15`	`internal static Action<bool, IInputRuntime> s_TestHookInitializeForPlayModeTests;`
`@@ -36,26 +35,26 @@ internal static void TestHook_SimulateDomainReload(IInputRuntime runtime)`
`36`	`35`	`internal static void TestHook_DestroyAndReset()`
`37`	`36`	`{`
`38`	`37`	`InputSystem.s_Manager?.Dispose();`
`39`		`- if (InputSystem.s_RemoteConnection != null)`
`40`		`- Object.DestroyImmediate(InputSystem.s_RemoteConnection);`
	`38`	`+ if (InputSystem.remoteConnection != null)`
	`39`	`+ Object.DestroyImmediate(InputSystem.remoteConnection);`
`41`	`40`
`42`	`41`	`s_TestHookEditorCleanup?.Invoke();`
`43`	`42`
`44`	`43`	`InputSystem.s_Manager = null;`
`45`		`- InputSystem.s_RemoteConnection = null;`
	`44`	`+ InputSystem.remoteConnection = null;`
`46`	`45`	`InputSystem.s_Remote = null;`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`internal static void TestHook_RestoreFromSavedState(InputManager manager, InputRemoting remote, RemoteInputPlayerConnection remoteConnection)`
`50`	`49`	`{`
`51`		`- s_Manager = manager;`
`52`		`- s_Remote = remote;`
`53`		`- s_RemoteConnection = remoteConnection;`
	`50`	`+ InputSystem.s_Manager = manager;`
	`51`	`+ InputSystem.s_Remote = remote;`
	`52`	`+ InputSystem.remoteConnection = remoteConnection;`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`internal static void TestHook_SwitchToDifferentInputManager(InputManager otherManager)`
`57`	`56`	`{`
`58`		`- s_Manager = otherManager;`
	`57`	`+ InputSystem.s_Manager = otherManager;`
`59`	`58`	`InputStateBuffers.SwitchTo(otherManager.m_StateBuffers, otherManager.defaultUpdateType);`
`60`	`59`	`}`
`61`	`60`	`}`