Update tests to explicitly set NetworkManagerOwner

EmandM · EmandM · commit 113f46c7ad07 · 2025-10-14T18:47:39.000-04:00
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs
@@ -69,6 +69,7 @@ public IEnumerator ValidatedDisableddNetworkBehaviourWarning()
 
             LogAssert.Expect(LogType.Warning, $"{childObject.name} is disabled! Netcode for GameObjects does not support spawning disabled NetworkBehaviours! The {childBehaviour.GetType().Name} component was skipped during spawn!");
 
+            parentNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
             parentNetworkObject.Spawn();
             yield return s_DefaultWaitForTick;
         }
@@ -134,6 +135,7 @@ public IEnumerator ValidateDeleteChildNetworkBehaviour()
             var parentNetworkObject = parentObject.AddComponent<NetworkObject>();
             childObject.AddComponent<SimpleNetworkBehaviour>();
 
+            parentNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
             parentNetworkObject.Spawn();
             yield return s_DefaultWaitForTick;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerWithDataTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerWithDataTests.cs
@@ -105,8 +105,10 @@ private void RegisterPrefabHandler(NetworkManager manager, out PrefabInstanceHan
 
         private NetworkObject SpawnPrefabWithData(NetworkSerializableTest data)
         {
+            var authority = GetAuthorityNetworkManager();
             var instance = UnityEngine.Object.Instantiate(m_Prefab).GetComponent<NetworkObject>();
-            GetAuthorityNetworkManager().PrefabHandler.SetInstantiationData(instance, data);
+            instance.NetworkManagerOwner = authority;
+            authority.PrefabHandler.SetInstantiationData(instance, data);
             instance.Spawn();
             return instance;
         }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs
@@ -418,6 +418,7 @@ public static UnityObjectContext<NetworkObject> CreateNetworkObject(string name
         {
             var gameObject = new GameObject(name);
             var networkObject = gameObject.AddComponent<NetworkObject>();
+            networkObject.NetworkManagerOwner = NetworkManager.Singleton;
             return new UnityObjectContext<NetworkObject>(networkObject, gameObject);
         }
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetworkManagerHelper.cs
@@ -170,10 +170,11 @@ public static T AddComponentToObject<T>(Guid gameObjectIdentifier) where T : Net
         /// <param name="gameObjectIdentifier">ID returned to reference the game object</param>
         public static void SpawnNetworkObject(Guid gameObjectIdentifier)
         {
-            Assert.IsTrue(InstantiatedNetworkObjects.ContainsKey(gameObjectIdentifier));
-            if (!InstantiatedNetworkObjects[gameObjectIdentifier].IsSpawned)
+            Assert.IsTrue(InstantiatedNetworkObjects.TryGetValue(gameObjectIdentifier, out var objToSpawn));
+            if (!objToSpawn.IsSpawned)
             {
-                InstantiatedNetworkObjects[gameObjectIdentifier].Spawn();
+                objToSpawn.NetworkManagerOwner = NetworkManager.Singleton;
+                objToSpawn.Spawn();
             }
         }
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs
@@ -601,6 +601,7 @@ protected override void OnOneTimeTearDown()
 
         protected override void OnTimeTravelServerAndClientsConnected()
         {
+            m_ServerObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
             m_ServerObject.GetComponent<NetworkObject>().Spawn();
             WaitForMessageReceivedWithTimeTravel<CreateObjectMessage>(m_ClientNetworkManagers.ToList());
         }
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectDestroyTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectDestroyTests.cs
@@ -140,6 +140,7 @@ public IEnumerator InSceneNetworkObjectDespawnSyncAndSpawn()
             yield return LoadSceneAndDespawnObject(DestroyMode.DespawnGameObject);
 
             var serverObject = NetworkObjectTestComponent.ServerNetworkObjectInstance;
+            serverObject.NetworkManagerOwner = m_ServerNetworkManager;
 
             Assert.IsNotNull(serverObject, "Could not find server-side in-scene placed NetworkObject!");
 
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectTests.cs
@@ -67,6 +67,7 @@ public IEnumerator EnableDisableInSceneObjectTests()
 
             // Test #3: Now spawn the same in-scene placed NetworkObject
             serverInSceneObjectInstance.gameObject.SetActive(true);
+            serverInSceneObjectInstance.NetworkManagerOwner = m_ServerNetworkManager;
             serverInSceneObjectInstance.Spawn();
             yield return WaitForConditionOrTimeOut(HaveAllClientsSpawnedInSceneObject);
 
@@ -104,6 +105,7 @@ public IEnumerator EnableDisableInSceneObjectTests()
 
             // Test #5: Now spawn the in-scene placed NetworkObject
             serverInSceneObjectInstance.gameObject.SetActive(true);
+            serverInSceneObjectInstance.NetworkManagerOwner = m_ServerNetworkManager;
             serverInSceneObjectInstance.Spawn();
 
             // Verify all clients spawned their in-scene NetworkObject relative instance
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs
@@ -159,6 +159,7 @@ public IEnumerator MigrateIntoNewSceneTest()
             {
                 var serverInstance = Object.Instantiate(m_TestPrefab);
                 var serverNetworkObject = serverInstance.GetComponent<NetworkObject>();
+                serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverNetworkObject.Spawn();
                 m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);
             }
@@ -276,6 +277,7 @@ public IEnumerator ActiveSceneSynchronizationTest()
                 // the active scene and marked to destroy with scene =are destroyed= if
                 // the scene being unloaded is currently the active scene and the scene that
                 // the NetworkObjects reside within.
+                serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverNetworkObject.Spawn(true);
                 m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);
             }
@@ -291,6 +293,7 @@ public IEnumerator ActiveSceneSynchronizationTest()
                 // spawned with DestroyWithScene set to false will migrate into the current
                 // active scene if the scene they currently reside within is destroyed and
                 // is not the currently active scene.
+                serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverNetworkObject.Spawn();
                 m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);
             }
@@ -304,6 +307,7 @@ public IEnumerator ActiveSceneSynchronizationTest()
                 // This set of NetworkObjects will be used to verify that NetworkObjets
                 // spawned with DestroyWithScene == true will get destroyed when the scene
                 // is unloaded
+                serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverNetworkObject.Spawn(true);
                 m_ServerSpawnedDestroyWithSceneInstances.Add(serverNetworkObject);
             }
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerDDOLTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerDDOLTests.cs
@@ -112,6 +112,7 @@ public IEnumerator InSceneNetworkObjectState([Values(DefaultState.IsEnabled, Def
             // Sets whether we are in-scene or dynamically spawned NetworkObject
             ddolBehaviour.SetInScene(isInScene);
 
+            networkObject.NetworkManagerOwner = m_ServerNetworkManager;
             networkObject.Spawn();
             yield return waitForFullNetworkTick;
 
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs
@@ -129,8 +129,9 @@ public IEnumerator ParentUnderInSceneplaced()
 
             // Now dynamically spawn a NetworkObject to also test dynamically spawned NetworkObjects being parented
             // under in-scene placed NetworkObjects
-            var dynamicallySpawnedServerSide = Object.Instantiate(m_DynamicallySpawned);
-            dynamicallySpawnedServerSide.GetComponent<NetworkObject>().Spawn(true);
+            var dynamicallySpawnedServerSide = Object.Instantiate(m_DynamicallySpawned).GetComponent<NetworkObject>();
+            dynamicallySpawnedServerSide.NetworkManagerOwner = m_ServerNetworkManager;
+            dynamicallySpawnedServerSide.Spawn(true);
 
             for (int i = 0; i < 5; i++)
             {
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs
@@ -291,6 +291,7 @@ public IEnumerator WorldPositionStaysTest([Values] ParentingTestModes mode, [Val
             }
 
             var serverSideParentNetworkObject = m_ServerSideParent.GetComponent<NetworkObject>();
+            serverSideParentNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
             serverSideParentNetworkObject.Spawn();
 
             // Instantiate the children
@@ -321,6 +322,7 @@ public IEnumerator WorldPositionStaysTest([Values] ParentingTestModes mode, [Val
 
                 serverSideChild.transform.localScale = childScaleList[i];
                 VerboseDebug($"[Server][PreSpawn] Set scale of NetworkObject to ({childScaleList[i]})");
+                serverSideChildNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverSideChildNetworkObject.Spawn();
                 VerboseDebug($"[Server] Set scale of NetworkObjectID ({serverSideChildNetworkObject.NetworkObjectId}) to ({childScaleList[i]}) and is currently {serverSideChild.transform.localScale}");
 
diff --git a/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs b/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs
@@ -258,6 +258,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
                     }
                     var gameObjectInstance = Object.Instantiate(prefabOverride.gameObject);
                     spawnedNetworkObject = gameObjectInstance.GetComponent<NetworkObject>();
+                    spawnedNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                     spawnedNetworkObject.Spawn();
                     manualSpawnCount++;
                 }
diff --git a/testproject/Assets/Tests/Runtime/RpcObserverTests.cs b/testproject/Assets/Tests/Runtime/RpcObserverTests.cs
@@ -179,6 +179,7 @@ public IEnumerator DespawnRespawnObserverTest()
 
             yield return s_DefaultWaitForTick;
             m_ServerRpcObserverObject.ResetTest();
+            m_ServerRpcObserverObject.NetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
             m_ServerRpcObserverObject.NetworkObject.Spawn();
             m_ServerRpcObserverObject.ObserverMessageClientRpc();
             yield return WaitForConditionOrTimeOut(m_ServerRpcObserverObject.AllObserversReceivedRPC);

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,10 @@ private void RegisterPrefabHandler(NetworkManager manager, out PrefabInstanceHan`
`105`	`105`
`106`	`106`	`private NetworkObject SpawnPrefabWithData(NetworkSerializableTest data)`
`107`	`107`	`{`
	`108`	`+ var authority = GetAuthorityNetworkManager();`
`108`	`109`	`var instance = UnityEngine.Object.Instantiate(m_Prefab).GetComponent<NetworkObject>();`
`109`		`- GetAuthorityNetworkManager().PrefabHandler.SetInstantiationData(instance, data);`
	`110`	`+ instance.NetworkManagerOwner = authority;`
	`111`	`+ authority.PrefabHandler.SetInstantiationData(instance, data);`
`110`	`112`	`instance.Spawn();`
`111`	`113`	`return instance;`
`112`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,7 @@ public static UnityObjectContext<NetworkObject> CreateNetworkObject(string name`
`418`	`418`	`{`
`419`	`419`	`var gameObject = new GameObject(name);`
`420`	`420`	`var networkObject = gameObject.AddComponent<NetworkObject>();`
	`421`	`+ networkObject.NetworkManagerOwner = NetworkManager.Singleton;`
`421`	`422`	`return new UnityObjectContext<NetworkObject>(networkObject, gameObject);`
`422`	`423`	`}`
`423`	`424`
Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,11 @@ public static T AddComponentToObject<T>(Guid gameObjectIdentifier) where T : Net`
`170`	`170`	`/// <param name="gameObjectIdentifier">ID returned to reference the game object</param>`
`171`	`171`	`public static void SpawnNetworkObject(Guid gameObjectIdentifier)`
`172`	`172`	`{`
`173`		`- Assert.IsTrue(InstantiatedNetworkObjects.ContainsKey(gameObjectIdentifier));`
`174`		`- if (!InstantiatedNetworkObjects[gameObjectIdentifier].IsSpawned)`
	`173`	`+ Assert.IsTrue(InstantiatedNetworkObjects.TryGetValue(gameObjectIdentifier, out var objToSpawn));`
	`174`	`+ if (!objToSpawn.IsSpawned)`
`175`	`175`	`{`
`176`		`- InstantiatedNetworkObjects[gameObjectIdentifier].Spawn();`
	`176`	`+ objToSpawn.NetworkManagerOwner = NetworkManager.Singleton;`
	`177`	`+ objToSpawn.Spawn();`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`
Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,7 @@ protected override void OnOneTimeTearDown()`
`601`	`601`
`602`	`602`	`protected override void OnTimeTravelServerAndClientsConnected()`
`603`	`603`	`{`
	`604`	`+ m_ServerObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;`
`604`	`605`	`m_ServerObject.GetComponent<NetworkObject>().Spawn();`
`605`	`606`	`WaitForMessageReceivedWithTimeTravel<CreateObjectMessage>(m_ClientNetworkManagers.ToList());`
`606`	`607`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ public IEnumerator MigrateIntoNewSceneTest()`
`159`	`159`	`{`
`160`	`160`	`var serverInstance = Object.Instantiate(m_TestPrefab);`
`161`	`161`	`var serverNetworkObject = serverInstance.GetComponent<NetworkObject>();`
	`162`	`+ serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`162`	`163`	`serverNetworkObject.Spawn();`
`163`	`164`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`164`	`165`	`}`
`@@ -276,6 +277,7 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`276`	`277`	`// the active scene and marked to destroy with scene =are destroyed= if`
`277`	`278`	`// the scene being unloaded is currently the active scene and the scene that`
`278`	`279`	`// the NetworkObjects reside within.`
	`280`	`+ serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`279`	`281`	`serverNetworkObject.Spawn(true);`
`280`	`282`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`281`	`283`	`}`
`@@ -291,6 +293,7 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`291`	`293`	`// spawned with DestroyWithScene set to false will migrate into the current`
`292`	`294`	`// active scene if the scene they currently reside within is destroyed and`
`293`	`295`	`// is not the currently active scene.`
	`296`	`+ serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`294`	`297`	`serverNetworkObject.Spawn();`
`295`	`298`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`296`	`299`	`}`
`@@ -304,6 +307,7 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`304`	`307`	`// This set of NetworkObjects will be used to verify that NetworkObjets`
`305`	`308`	`// spawned with DestroyWithScene == true will get destroyed when the scene`
`306`	`309`	`// is unloaded`
	`310`	`+ serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`307`	`311`	`serverNetworkObject.Spawn(true);`
`308`	`312`	`m_ServerSpawnedDestroyWithSceneInstances.Add(serverNetworkObject);`
`309`	`313`	`}`