test

Adding two integration tests to validate this PR

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/DisconnectTests.cs

@@ -46,7 +46,7 @@ public enum ClientDisconnectType
         private ulong m_ClientId;
 
 
-        public DisconnectTests(OwnerPersistence ownerPersistence)
+        public DisconnectTests(OwnerPersistence ownerPersistence) : base(HostOrServer.Host)
         {
             m_OwnerPersistence = ownerPersistence;
         }
@@ -202,6 +202,15 @@ public IEnumerator ClientPlayerDisconnected([Values] ClientDisconnectType client
             yield return WaitForConditionOrTimeOut(TransportIdCleanedUp);
             AssertOnTimeout("Timed out waiting for transport and client id mappings to be cleaned up!");
 
+
+            if (clientNetworkManager.ConnectionManager != null)
+            {
+                Assert.False(clientNetworkManager.ConnectionManager.LocalClient.IsClient, $"{clientNetworkManager.name} still has IsClient setting!");
+                Assert.False(clientNetworkManager.ConnectionManager.LocalClient.IsConnected, $"{clientNetworkManager.name} still has IsConnected setting!");
+                Assert.False(clientNetworkManager.ConnectionManager.LocalClient.ClientId != 0, $"{clientNetworkManager.name} still has ClientId ({clientNetworkManager.ConnectionManager.LocalClient.ClientId}) setting!");
+                Assert.False(clientNetworkManager.ConnectionManager.LocalClient.IsApproved, $"{clientNetworkManager.name} still has IsApproved setting!");
+                Assert.IsNull(clientNetworkManager.ConnectionManager.LocalClient.PlayerObject, $"{clientNetworkManager.name} still has Player assigned!");
+            }
             // Validate the host-client generates a OnClientDisconnected event when it shutsdown.
             // Only test when the test run is the client disconnecting from the server (otherwise the server will be shutdown already)
             if (clientDisconnectType == ClientDisconnectType.ClientDisconnectsFromServer)
@@ -215,6 +224,15 @@ public IEnumerator ClientPlayerDisconnected([Values] ClientDisconnectType client
 
                 Assert.IsTrue(m_DisconnectedEvent.ContainsKey(m_ServerNetworkManager), $"Could not find the server {nameof(NetworkManager)} disconnect event entry!");
                 Assert.IsTrue(m_DisconnectedEvent[m_ServerNetworkManager].ClientId == NetworkManager.ServerClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the server {nameof(NetworkManager)} disconnect event entry!");
+                yield return s_DefaultWaitForTick;
+                if (m_ServerNetworkManager.ConnectionManager != null)
+                {
+                    Assert.False(m_ServerNetworkManager.ConnectionManager.LocalClient.IsClient, $"{m_ServerNetworkManager.name} still has IsClient setting!");
+                    Assert.False(m_ServerNetworkManager.ConnectionManager.LocalClient.IsConnected, $"{m_ServerNetworkManager.name} still has IsConnected setting!");
+                    Assert.False(m_ServerNetworkManager.ConnectionManager.LocalClient.ClientId != 0, $"{m_ServerNetworkManager.name} still has ClientId ({clientNetworkManager.ConnectionManager.LocalClient.ClientId}) setting!");
+                    Assert.False(m_ServerNetworkManager.ConnectionManager.LocalClient.IsApproved, $"{m_ServerNetworkManager.name} still has IsApproved setting!");
+                    Assert.IsNull(m_ServerNetworkManager.ConnectionManager.LocalClient.PlayerObject, $"{m_ServerNetworkManager.name} still has Player assigned!");
+                }
             }
         }
     }

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs

@@ -260,22 +260,23 @@ protected override IEnumerator OnTearDown()
         public IEnumerator TestOnNetworkSpawnCallbacks()
         {
             // [Host-Side] Get the Host owned instance
-            var serverInstance = m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ServerNetworkManager.LocalClientId].GetComponent<TrackOnSpawnFunctions>();
+            var authorityNetworkManager = GetAuthorityNetworkManager();
+            var authorityInstance = m_PlayerNetworkObjects[authorityNetworkManager.LocalClientId][authorityNetworkManager.LocalClientId].GetComponent<TrackOnSpawnFunctions>();
 
             foreach (var client in m_ClientNetworkManagers)
             {
-                var clientRpcTests = m_PlayerNetworkObjects[client.LocalClientId][m_ServerNetworkManager.LocalClientId].gameObject.GetComponent<TrackOnSpawnFunctions>();
+                var clientRpcTests = m_PlayerNetworkObjects[client.LocalClientId][authorityNetworkManager.LocalClientId].gameObject.GetComponent<TrackOnSpawnFunctions>();
                 Assert.IsNotNull(clientRpcTests);
                 m_ClientTrackOnSpawnInstances.Add(clientRpcTests);
             }
 
             // -------------- step 1 check player spawn despawn
 
             // check spawned on server
-            Assert.AreEqual(1, serverInstance.OnNetworkSpawnCalledCount);
+            Assert.AreEqual(1, authorityInstance.OnNetworkSpawnCalledCount);
 
             // safety check server despawned
-            Assert.AreEqual(0, serverInstance.OnNetworkDespawnCalledCount);
+            Assert.AreEqual(0, authorityInstance.OnNetworkDespawnCalledCount);
 
             // Conditional check for clients spawning or despawning
             var checkSpawnCondition = false;
@@ -314,10 +315,10 @@ bool HasConditionBeenMet()
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side spawns!");
 
             // despawn on server.  However, since we'll be using this object later in the test, don't delete it
-            serverInstance.GetComponent<NetworkObject>().Despawn(false);
+            authorityInstance.GetComponent<NetworkObject>().Despawn(false);
 
             // check despawned on server
-            Assert.AreEqual(1, serverInstance.OnNetworkDespawnCalledCount);
+            Assert.AreEqual(1, authorityInstance.OnNetworkDespawnCalledCount);
             // we now expect the clients to each have despawned once
             expectedDespawnCount = 1;
 
@@ -329,24 +330,24 @@ bool HasConditionBeenMet()
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side despawns!");
 
             //----------- step 2 check spawn and destroy again
-            serverInstance.GetComponent<NetworkObject>().Spawn();
+            authorityInstance.GetComponent<NetworkObject>().Spawn();
             // wait a tick
             yield return s_DefaultWaitForTick;
             // check spawned again on server this is 2 because we are reusing the object which was already spawned once.
-            Assert.AreEqual(2, serverInstance.OnNetworkSpawnCalledCount);
+            Assert.AreEqual(2, authorityInstance.OnNetworkSpawnCalledCount);
 
             checkSpawnCondition = true;
             yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
 
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side spawns! (2nd pass)");
 
             // destroy the server object
-            Object.Destroy(serverInstance.gameObject);
+            Object.Destroy(authorityInstance.gameObject);
 
             yield return s_DefaultWaitForTick;
 
             // check whether despawned was called again on server instance
-            Assert.AreEqual(2, serverInstance.OnNetworkDespawnCalledCount);
+            Assert.AreEqual(2, authorityInstance.OnNetworkDespawnCalledCount);
 
             checkSpawnCondition = false;
             yield return WaitForConditionOrTimeOut(HasConditionBeenMet);
@@ -386,5 +387,50 @@ public override void OnNetworkDespawn()
                 OnNetworkDespawnCalledCount++;
             }
         }
+
+        private bool AllClientsSpawnedObject()
+        {
+            foreach(var networkManager in m_NetworkManagers)
+            {
+                if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(m_SpawnedInstanceId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool AllClientsDespawnedObject()
+        {
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                if (networkManager.SpawnManager.SpawnedObjects.ContainsKey(m_SpawnedInstanceId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private ulong m_SpawnedInstanceId;
+        [UnityTest]
+        public IEnumerator NetworkObjectResetOnDespawn()
+        {
+            var authorityNetworkManager = GetAuthorityNetworkManager();
+            var instance = SpawnObject(m_ObserverPrefab, authorityNetworkManager).GetComponent<NetworkObject>();
+            m_SpawnedInstanceId = instance.NetworkObjectId;
+            yield return WaitForConditionOrTimeOut(AllClientsSpawnedObject);
+            AssertOnTimeout($"Not all clients spawned an instance of {instance.name}!");
+
+            instance.Despawn(false);
+
+            yield return WaitForConditionOrTimeOut(AllClientsDespawnedObject);
+            AssertOnTimeout($"Not all clients de-spawned an instance of {instance.name}!");
+
+            Assert.IsNull(instance.GetNetworkParenting(), "Last parent was not reset!");
+
+            Object.Destroy(instance.gameObject);
+        }
+
     }
 }