put back changed test code

EmandM · EmandM · commit 9219b392cb6c · 2025-10-14T23:05:47.000-04:00
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs
@@ -69,7 +69,6 @@ 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;
         }
@@ -135,7 +134,6 @@ 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/NetworkTransform/NetworkTransformParentingTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs
@@ -103,7 +103,6 @@ public override void OnNetworkSpawn()
             private void RequestPlayerObjectSpawnServerRpc(ServerRpcParams rpcParams = default)
             {
                 SpawnedPlayer = Instantiate(PlayerPrefab);
-                SpawnedPlayer.NetworkManagerOwner = NetworkManager;
                 SpawnedPlayer.SpawnAsPlayerObject(rpcParams.Receive.SenderClientId);
                 SpawnedPlayer.TrySetParent(NetworkObject, false);
                 State = MoveState.PlayerSpawned;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerWithDataTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerWithDataTests.cs
@@ -105,10 +105,8 @@ private void RegisterPrefabHandler(NetworkManager manager, out PrefabInstanceHan
 
         private NetworkObject SpawnPrefabWithData(NetworkSerializableTest data)
         {
-            var authority = GetAuthorityNetworkManager();
             var instance = UnityEngine.Object.Instantiate(m_Prefab).GetComponent<NetworkObject>();
-            instance.NetworkManagerOwner = authority;
-            authority.PrefabHandler.SetInstantiationData(instance, data);
+            GetAuthorityNetworkManager().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,7 +418,6 @@ 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/UniversalRpcTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs
@@ -601,7 +601,6 @@ 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,7 +140,6 @@ 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,7 +67,6 @@ 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);
 
@@ -105,7 +104,6 @@ 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,7 +159,6 @@ public IEnumerator MigrateIntoNewSceneTest()
             {
                 var serverInstance = Object.Instantiate(m_TestPrefab);
                 var serverNetworkObject = serverInstance.GetComponent<NetworkObject>();
-                serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverNetworkObject.Spawn();
                 m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);
             }
@@ -277,7 +276,6 @@ 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);
             }
@@ -293,7 +291,6 @@ 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);
             }
@@ -307,7 +304,6 @@ 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,7 +112,6 @@ 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,9 +129,8 @@ 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).GetComponent<NetworkObject>();
-            dynamicallySpawnedServerSide.NetworkManagerOwner = m_ServerNetworkManager;
-            dynamicallySpawnedServerSide.Spawn(true);
+            var dynamicallySpawnedServerSide = Object.Instantiate(m_DynamicallySpawned);
+            dynamicallySpawnedServerSide.GetComponent<NetworkObject>().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,7 +291,6 @@ public IEnumerator WorldPositionStaysTest([Values] ParentingTestModes mode, [Val
             }
 
             var serverSideParentNetworkObject = m_ServerSideParent.GetComponent<NetworkObject>();
-            serverSideParentNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
             serverSideParentNetworkObject.Spawn();
 
             // Instantiate the children
@@ -322,7 +321,6 @@ 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,7 +258,6 @@ 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,7 +179,6 @@ 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
`@@ -103,7 +103,6 @@ public override void OnNetworkSpawn()`
`103`	`103`	`private void RequestPlayerObjectSpawnServerRpc(ServerRpcParams rpcParams = default)`
`104`	`104`	`{`
`105`	`105`	`SpawnedPlayer = Instantiate(PlayerPrefab);`
`106`		`- SpawnedPlayer.NetworkManagerOwner = NetworkManager;`
`107`	`106`	`SpawnedPlayer.SpawnAsPlayerObject(rpcParams.Receive.SenderClientId);`
`108`	`107`	`SpawnedPlayer.TrySetParent(NetworkObject, false);`
`109`	`108`	`State = MoveState.PlayerSpawned;`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,8 @@ private void RegisterPrefabHandler(NetworkManager manager, out PrefabInstanceHan`
`105`	`105`
`106`	`106`	`private NetworkObject SpawnPrefabWithData(NetworkSerializableTest data)`
`107`	`107`	`{`
`108`		`- var authority = GetAuthorityNetworkManager();`
`109`	`108`	`var instance = UnityEngine.Object.Instantiate(m_Prefab).GetComponent<NetworkObject>();`
`110`		`- instance.NetworkManagerOwner = authority;`
`111`		`- authority.PrefabHandler.SetInstantiationData(instance, data);`
	`109`	`+ GetAuthorityNetworkManager().PrefabHandler.SetInstantiationData(instance, data);`
`112`	`110`	`instance.Spawn();`
`113`	`111`	`return instance;`
`114`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,6 @@ 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;`
`422`	`421`	`return new UnityObjectContext<NetworkObject>(networkObject, gameObject);`
`423`	`422`	`}`
`424`	`423`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,6 @@ protected override void OnOneTimeTearDown()`
`601`	`601`
`602`	`602`	`protected override void OnTimeTravelServerAndClientsConnected()`
`603`	`603`	`{`
`604`		`- m_ServerObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;`
`605`	`604`	`m_ServerObject.GetComponent<NetworkObject>().Spawn();`
`606`	`605`	`WaitForMessageReceivedWithTimeTravel<CreateObjectMessage>(m_ClientNetworkManagers.ToList());`
`607`	`606`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ 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;`
`163`	`162`	`serverNetworkObject.Spawn();`
`164`	`163`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`165`	`164`	`}`
`@@ -277,7 +276,6 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`277`	`276`	`// the active scene and marked to destroy with scene =are destroyed= if`
`278`	`277`	`// the scene being unloaded is currently the active scene and the scene that`
`279`	`278`	`// the NetworkObjects reside within.`
`280`		`- serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`281`	`279`	`serverNetworkObject.Spawn(true);`
`282`	`280`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`283`	`281`	`}`
`@@ -293,7 +291,6 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`293`	`291`	`// spawned with DestroyWithScene set to false will migrate into the current`
`294`	`292`	`// active scene if the scene they currently reside within is destroyed and`
`295`	`293`	`// is not the currently active scene.`
`296`		`- serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`297`	`294`	`serverNetworkObject.Spawn();`
`298`	`295`	`m_ServerSpawnedPrefabInstances.Add(serverNetworkObject);`
`299`	`296`	`}`
`@@ -307,7 +304,6 @@ public IEnumerator ActiveSceneSynchronizationTest()`
`307`	`304`	`// This set of NetworkObjects will be used to verify that NetworkObjets`
`308`	`305`	`// spawned with DestroyWithScene == true will get destroyed when the scene`
`309`	`306`	`// is unloaded`
`310`		`- serverNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;`
`311`	`307`	`serverNetworkObject.Spawn(true);`
`312`	`308`	`m_ServerSpawnedDestroyWithSceneInstances.Add(serverNetworkObject);`
`313`	`309`	`}`