Fix tests

EmandM · EmandM · commit fa10a911b8d0 · 2025-10-07T16:59:42.000-04:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs
@@ -213,7 +213,8 @@ internal class TransitionStateinfo
         // [Layer][DestinationState][TransitionStateInfo]
         private Dictionary<int, Dictionary<int, TransitionStateinfo>> m_DestinationStateToTransitioninfo = new Dictionary<int, Dictionary<int, TransitionStateinfo>>();
 
-        private NetworkManager m_NetworkManager;
+        // Named differently to avoid serialization conflicts with NetworkBehaviour
+        private NetworkManager m_LocalNetworkManager;
 
         internal bool DistributedAuthorityMode;
 
@@ -513,7 +514,7 @@ internal bool IsServerAuthoritative()
         /// </remarks>
         protected virtual bool OnIsServerAuthoritative()
         {
-            if (!m_NetworkManager)
+            if (!m_LocalNetworkManager)
             {
                 return true;
             }
@@ -723,8 +724,8 @@ internal AnimationMessage GetAnimationMessage()
         public override void OnNetworkSpawn()
         {
             // Save internal state references
-            m_NetworkManager = NetworkManager;
-            DistributedAuthorityMode = m_NetworkManager.DistributedAuthorityMode;
+            m_LocalNetworkManager = NetworkManager;
+            DistributedAuthorityMode = m_LocalNetworkManager.DistributedAuthorityMode;
 
             // If there is no assigned Animator then generate a server network warning (logged locally and if applicable on the server-host side as well).
             if (m_Animator == null)
@@ -976,7 +977,7 @@ internal void CheckForAnimatorChanges()
 
             if (m_Animator.runtimeAnimatorController == null)
             {
-                if (m_NetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     Debug.LogError($"[{GetType().Name}] Could not find an assigned {nameof(RuntimeAnimatorController)}! Cannot check {nameof(Animator)} for changes in state!");
                 }
@@ -1011,9 +1012,9 @@ internal void CheckForAnimatorChanges()
                 {
                     // Just notify all remote clients and not the local server
                     m_ClientSendList.Clear();
-                    foreach (var clientId in m_NetworkManager.ConnectionManager.ConnectedClientIds)
+                    foreach (var clientId in m_LocalNetworkManager.ConnectionManager.ConnectedClientIds)
                     {
-                        if (clientId == m_NetworkManager.LocalClientId || !NetworkObject.Observers.Contains(clientId))
+                        if (clientId == m_LocalNetworkManager.LocalClientId || !NetworkObject.Observers.Contains(clientId))
                         {
                             continue;
                         }
@@ -1041,7 +1042,7 @@ private void SendParametersUpdate(ClientRpcParams clientRpcParams = default, boo
                 }
                 else
                 {
-                    Debug.LogError($"[{name}][Client-{m_NetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");
+                    Debug.LogError($"[{name}][Client-{m_LocalNetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");
                 }
             }
             else
@@ -1279,12 +1280,12 @@ internal void UpdateAnimationState(AnimationState animationState)
                             // Cross fade from the current to the destination state for the transitions duration while starting at the server's current normalized time of the transition
                             m_Animator.CrossFade(transitionStateInfo.DestinationState, transitionStateInfo.TransitionDuration, transitionStateInfo.Layer, 0.0f, animationState.NormalizedTime);
                         }
-                        else if (m_NetworkManager.LogLevel == LogLevel.Developer)
+                        else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                         {
                             NetworkLog.LogWarning($"Current State Hash ({currentState.fullPathHash}) != AnimationState.StateHash ({animationState.StateHash})");
                         }
                     }
-                    else if (m_NetworkManager.LogLevel == LogLevel.Developer)
+                    else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                     {
                         NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) sub-table does not contain destination state ({animationState.DestinationStateHash})!");
                     }
@@ -1327,7 +1328,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame
                     return;
                 }
                 UpdateParameters(ref parametersUpdate);
-                var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;
+                var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
                 if (connectedClientIds.Count <= (IsHost ? 2 : 1))
                 {
                     return;
@@ -1393,7 +1394,7 @@ private void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpc
                     UpdateAnimationState(animationState);
                 }
 
-                var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;
+                var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
                 if (connectedClientIds.Count <= (IsHost ? 2 : 1))
                 {
                     return;
@@ -1435,7 +1436,7 @@ private void ProcessAnimStates(AnimationMessage animationMessage)
         {
             if (HasAuthority)
             {
-                if (m_NetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     var hostOrOwner = DistributedAuthorityMode ? "Owner" : "Host";
                     var clientServerOrDAMode = DistributedAuthorityMode ? "distributed authority" : "client-server";
@@ -1462,7 +1463,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM
             // Ignore if a non-owner sent this.
             if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
             {
-                if (m_NetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     NetworkLog.LogWarning($"[Owner Authoritative] Detected the a non-authoritative client is sending the server animation trigger updates. If you recently changed ownership of the {name} object, then this could be the reason.");
                 }
@@ -1472,7 +1473,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM
             // set the trigger locally on the server
             InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
 
-            var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;
+            var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
 
             m_ClientSendList.Clear();
             foreach (var clientId in connectedClientIds)
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/Components/ObjectNameIdentifier.cs b/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/Components/ObjectNameIdentifier.cs
@@ -108,10 +108,7 @@ public override void OnDestroy()
                 DeRegisterNetworkObject();
                 // This is required otherwise it will try to continue to update the NetworkBehaviour even if
                 // it has been destroyed (most likely integration test specific)
-                if (m_NetworkObject.ChildNetworkBehaviours != null && m_NetworkObject.ChildNetworkBehaviours.Contains(this))
-                {
-                    NetworkObject.ChildNetworkBehaviours.Remove(this);
-                }
+                m_NetworkObject.ChildNetworkBehaviours?.Remove(this);
                 m_NetworkObject = null;
             }
             base.OnDestroy();
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs
@@ -576,6 +576,7 @@ private void InternalOnOneTimeSetup()
             IsRunning = true;
             m_EnableVerboseDebug = OnSetVerboseDebug();
             IntegrationTestSceneHandler.VerboseDebugMode = m_EnableVerboseDebug;
+            NetworkManagerHelper.VerboseDebugMode = m_EnableVerboseDebug;
             VerboseDebug($"Entering {nameof(OneTimeSetup)}");
 
             m_NetworkManagerInstatiationMode = OnSetIntegrationTestMode();
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetworkManagerHelper.cs
@@ -44,6 +44,11 @@ public static class NetworkManagerHelper
         /// </summary>
         public static NetworkManagerOperatingMode CurrentNetworkManagerMode;
 
+        /// <summary>
+        /// When true, logs will be generated for <see cref="NetworkManager"/> lifecycle events.
+        /// </summary>
+        public static bool VerboseDebugMode;
+
         /// <summary>
         /// This provides the ability to start NetworkManager in various modes
         /// </summary>
@@ -97,7 +102,7 @@ public static bool StartNetworkManager(out NetworkManager networkManager, Networ
                     return false;
                 }
 
-                Debug.Log($"{nameof(NetworkManager)} Instantiated.");
+                VerboseLog($"{nameof(NetworkManager)} Instantiated.");
 
                 var unityTransport = NetworkManagerGameObject.AddComponent<UnityTransport>();
                 if (networkConfig == null)
@@ -212,7 +217,7 @@ private static void StartNetworkManagerMode(NetworkManagerOperatingMode managerM
                 }
 
                 // Only log this if we started an netcode session
-                Debug.Log($"{CurrentNetworkManagerMode} started.");
+                VerboseLog($"{CurrentNetworkManagerMode} started.");
             }
         }
 
@@ -223,7 +228,7 @@ private static void StopNetworkManagerMode()
         {
             NetworkManagerObject.Shutdown();
 
-            Debug.Log($"{CurrentNetworkManagerMode} stopped.");
+            VerboseLog($"{CurrentNetworkManagerMode} stopped.");
             CurrentNetworkManagerMode = NetworkManagerOperatingMode.None;
         }
 
@@ -243,11 +248,11 @@ public static void ShutdownNetworkManager()
 
             if (NetworkManagerGameObject != null)
             {
-                Debug.Log($"{nameof(NetworkManager)} shutdown.");
+                VerboseLog($"{nameof(NetworkManager)} shutdown.");
 
                 StopNetworkManagerMode();
                 UnityEngine.Object.DestroyImmediate(NetworkManagerGameObject);
-                Debug.Log($"{nameof(NetworkManager)} destroyed.");
+                VerboseLog($"{nameof(NetworkManager)} destroyed.");
             }
             NetworkManagerGameObject = null;
             NetworkManagerObject = null;
@@ -304,5 +309,13 @@ public static bool BuffersMatch(int indexOffset, long targetSize, byte[] sourceA
             }
             return true;
         }
+
+        private static void VerboseLog(string message)
+        {
+            if (VerboseDebugMode)
+            {
+                Debug.unityLogger.Log(message);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,8 @@ internal class TransitionStateinfo`
`213`	`213`	`// [Layer][DestinationState][TransitionStateInfo]`
`214`	`214`	`private Dictionary<int, Dictionary<int, TransitionStateinfo>> m_DestinationStateToTransitioninfo = new Dictionary<int, Dictionary<int, TransitionStateinfo>>();`
`215`	`215`
`216`		`- private NetworkManager m_NetworkManager;`
	`216`	`+ // Named differently to avoid serialization conflicts with NetworkBehaviour`
	`217`	`+ private NetworkManager m_LocalNetworkManager;`
`217`	`218`
`218`	`219`	`internal bool DistributedAuthorityMode;`
`219`	`220`
`@@ -513,7 +514,7 @@ internal bool IsServerAuthoritative()`
`513`	`514`	`/// </remarks>`
`514`	`515`	`protected virtual bool OnIsServerAuthoritative()`
`515`	`516`	`{`
`516`		`- if (!m_NetworkManager)`
	`517`	`+ if (!m_LocalNetworkManager)`
`517`	`518`	`{`
`518`	`519`	`return true;`
`519`	`520`	`}`
`@@ -723,8 +724,8 @@ internal AnimationMessage GetAnimationMessage()`
`723`	`724`	`public override void OnNetworkSpawn()`
`724`	`725`	`{`
`725`	`726`	`// Save internal state references`
`726`		`- m_NetworkManager = NetworkManager;`
`727`		`- DistributedAuthorityMode = m_NetworkManager.DistributedAuthorityMode;`
	`727`	`+ m_LocalNetworkManager = NetworkManager;`
	`728`	`+ DistributedAuthorityMode = m_LocalNetworkManager.DistributedAuthorityMode;`
`728`	`729`
`729`	`730`	`// If there is no assigned Animator then generate a server network warning (logged locally and if applicable on the server-host side as well).`
`730`	`731`	`if (m_Animator == null)`
`@@ -976,7 +977,7 @@ internal void CheckForAnimatorChanges()`
`976`	`977`
`977`	`978`	`if (m_Animator.runtimeAnimatorController == null)`
`978`	`979`	`{`
`979`		`- if (m_NetworkManager.LogLevel == LogLevel.Developer)`
	`980`	`+ if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)`
`980`	`981`	`{`
`981`	`982`	`Debug.LogError($"[{GetType().Name}] Could not find an assigned {nameof(RuntimeAnimatorController)}! Cannot check {nameof(Animator)} for changes in state!");`
`982`	`983`	`}`
`@@ -1011,9 +1012,9 @@ internal void CheckForAnimatorChanges()`
`1011`	`1012`	`{`
`1012`	`1013`	`// Just notify all remote clients and not the local server`
`1013`	`1014`	`m_ClientSendList.Clear();`
`1014`		`- foreach (var clientId in m_NetworkManager.ConnectionManager.ConnectedClientIds)`
	`1015`	`+ foreach (var clientId in m_LocalNetworkManager.ConnectionManager.ConnectedClientIds)`
`1015`	`1016`	`{`
`1016`		`- if (clientId == m_NetworkManager.LocalClientId \|\| !NetworkObject.Observers.Contains(clientId))`
	`1017`	`+ if (clientId == m_LocalNetworkManager.LocalClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1017`	`1018`	`{`
`1018`	`1019`	`continue;`
`1019`	`1020`	`}`
`@@ -1041,7 +1042,7 @@ private void SendParametersUpdate(ClientRpcParams clientRpcParams = default, boo`
`1041`	`1042`	`}`
`1042`	`1043`	`else`
`1043`	`1044`	`{`
`1044`		`- Debug.LogError($"[{name}][Client-{m_NetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");`
	`1045`	`+ Debug.LogError($"[{name}][Client-{m_LocalNetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");`
`1045`	`1046`	`}`
`1046`	`1047`	`}`
`1047`	`1048`	`else`
`@@ -1279,12 +1280,12 @@ internal void UpdateAnimationState(AnimationState animationState)`
`1279`	`1280`	`// Cross fade from the current to the destination state for the transitions duration while starting at the server's current normalized time of the transition`
`1280`	`1281`	`m_Animator.CrossFade(transitionStateInfo.DestinationState, transitionStateInfo.TransitionDuration, transitionStateInfo.Layer, 0.0f, animationState.NormalizedTime);`
`1281`	`1282`	`}`
`1282`		`- else if (m_NetworkManager.LogLevel == LogLevel.Developer)`
	`1283`	`+ else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)`
`1283`	`1284`	`{`
`1284`	`1285`	`NetworkLog.LogWarning($"Current State Hash ({currentState.fullPathHash}) != AnimationState.StateHash ({animationState.StateHash})");`
`1285`	`1286`	`}`
`1286`	`1287`	`}`
`1287`		`- else if (m_NetworkManager.LogLevel == LogLevel.Developer)`
	`1288`	`+ else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)`
`1288`	`1289`	`{`
`1289`	`1290`	`NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) sub-table does not contain destination state ({animationState.DestinationStateHash})!");`
`1290`	`1291`	`}`
`@@ -1327,7 +1328,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame`
`1327`	`1328`	`return;`
`1328`	`1329`	`}`
`1329`	`1330`	`UpdateParameters(ref parametersUpdate);`
`1330`		`- var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;`
	`1331`	`+ var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;`
`1331`	`1332`	`if (connectedClientIds.Count <= (IsHost ? 2 : 1))`
`1332`	`1333`	`{`
`1333`	`1334`	`return;`
`@@ -1393,7 +1394,7 @@ private void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpc`
`1393`	`1394`	`UpdateAnimationState(animationState);`
`1394`	`1395`	`}`
`1395`	`1396`
`1396`		`- var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;`
	`1397`	`+ var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;`
`1397`	`1398`	`if (connectedClientIds.Count <= (IsHost ? 2 : 1))`
`1398`	`1399`	`{`
`1399`	`1400`	`return;`
`@@ -1435,7 +1436,7 @@ private void ProcessAnimStates(AnimationMessage animationMessage)`
`1435`	`1436`	`{`
`1436`	`1437`	`if (HasAuthority)`
`1437`	`1438`	`{`
`1438`		`- if (m_NetworkManager.LogLevel == LogLevel.Developer)`
	`1439`	`+ if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)`
`1439`	`1440`	`{`
`1440`	`1441`	`var hostOrOwner = DistributedAuthorityMode ? "Owner" : "Host";`
`1441`	`1442`	`var clientServerOrDAMode = DistributedAuthorityMode ? "distributed authority" : "client-server";`
`@@ -1462,7 +1463,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM`
`1462`	`1463`	`// Ignore if a non-owner sent this.`
`1463`	`1464`	`if (serverRpcParams.Receive.SenderClientId != OwnerClientId)`
`1464`	`1465`	`{`
`1465`		`- if (m_NetworkManager.LogLevel == LogLevel.Developer)`
	`1466`	`+ if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)`
`1466`	`1467`	`{`
`1467`	`1468`	`NetworkLog.LogWarning($"[Owner Authoritative] Detected the a non-authoritative client is sending the server animation trigger updates. If you recently changed ownership of the {name} object, then this could be the reason.");`
`1468`	`1469`	`}`
`@@ -1472,7 +1473,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM`
`1472`	`1473`	`// set the trigger locally on the server`
`1473`	`1474`	`InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);`
`1474`	`1475`
`1475`		`- var connectedClientIds = m_NetworkManager.ConnectionManager.ConnectedClientIds;`
	`1476`	`+ var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;`
`1476`	`1477`
`1477`	`1478`	`m_ClientSendList.Clear();`
`1478`	`1479`	`foreach (var clientId in connectedClientIds)`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ public static class NetworkManagerHelper`
`44`	`44`	`/// </summary>`
`45`	`45`	`public static NetworkManagerOperatingMode CurrentNetworkManagerMode;`
`46`	`46`
	`47`	`+ /// <summary>`
	`48`	`+ /// When true, logs will be generated for <see cref="NetworkManager"/> lifecycle events.`
	`49`	`+ /// </summary>`
	`50`	`+ public static bool VerboseDebugMode;`
	`51`	`+`
`47`	`52`	`/// <summary>`
`48`	`53`	`/// This provides the ability to start NetworkManager in various modes`
`49`	`54`	`/// </summary>`
`@@ -97,7 +102,7 @@ public static bool StartNetworkManager(out NetworkManager networkManager, Networ`
`97`	`102`	`return false;`
`98`	`103`	`}`
`99`	`104`
`100`		`- Debug.Log($"{nameof(NetworkManager)} Instantiated.");`
	`105`	`+ VerboseLog($"{nameof(NetworkManager)} Instantiated.");`
`101`	`106`
`102`	`107`	`var unityTransport = NetworkManagerGameObject.AddComponent<UnityTransport>();`
`103`	`108`	`if (networkConfig == null)`
`@@ -212,7 +217,7 @@ private static void StartNetworkManagerMode(NetworkManagerOperatingMode managerM`
`212`	`217`	`}`
`213`	`218`
`214`	`219`	`// Only log this if we started an netcode session`
`215`		`- Debug.Log($"{CurrentNetworkManagerMode} started.");`
	`220`	`+ VerboseLog($"{CurrentNetworkManagerMode} started.");`
`216`	`221`	`}`
`217`	`222`	`}`
`218`	`223`
`@@ -223,7 +228,7 @@ private static void StopNetworkManagerMode()`
`223`	`228`	`{`
`224`	`229`	`NetworkManagerObject.Shutdown();`
`225`	`230`
`226`		`- Debug.Log($"{CurrentNetworkManagerMode} stopped.");`
	`231`	`+ VerboseLog($"{CurrentNetworkManagerMode} stopped.");`
`227`	`232`	`CurrentNetworkManagerMode = NetworkManagerOperatingMode.None;`
`228`	`233`	`}`
`229`	`234`
`@@ -243,11 +248,11 @@ public static void ShutdownNetworkManager()`
`243`	`248`
`244`	`249`	`if (NetworkManagerGameObject != null)`
`245`	`250`	`{`
`246`		`- Debug.Log($"{nameof(NetworkManager)} shutdown.");`
	`251`	`+ VerboseLog($"{nameof(NetworkManager)} shutdown.");`
`247`	`252`
`248`	`253`	`StopNetworkManagerMode();`
`249`	`254`	`UnityEngine.Object.DestroyImmediate(NetworkManagerGameObject);`
`250`		`- Debug.Log($"{nameof(NetworkManager)} destroyed.");`
	`255`	`+ VerboseLog($"{nameof(NetworkManager)} destroyed.");`
`251`	`256`	`}`
`252`	`257`	`NetworkManagerGameObject = null;`
`253`	`258`	`NetworkManagerObject = null;`
`@@ -304,5 +309,13 @@ public static bool BuffersMatch(int indexOffset, long targetSize, byte[] sourceA`
`304`	`309`	`}`
`305`	`310`	`return true;`
`306`	`311`	`}`
	`312`	`+`
	`313`	`+ private static void VerboseLog(string message)`
	`314`	`+ {`
	`315`	`+ if (VerboseDebugMode)`
	`316`	`+ {`
	`317`	`+ Debug.unityLogger.Log(message);`
	`318`	`+ }`
	`319`	`+ }`
`307`	`320`	`}`
`308`	`321`	`}`