update

NoelStephensUnity · NoelStephensUnity · commit ab7724075105 · 2025-02-12T16:02:45.000-06:00
Updating some integration tests and some additional areas that were problematic to IL2CPP integration tests.
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
@@ -91,7 +91,7 @@ internal class SceneEventProgress
         /// </summary>
         internal bool HasTimedOut()
         {
-            return WhenSceneEventHasTimedOut <= m_NetworkManager.RealTimeProvider.RealTimeSinceStartup;
+            return m_NetworkManager == null || WhenSceneEventHasTimedOut <= m_NetworkManager.RealTimeProvider.RealTimeSinceStartup;
         }
 
         /// <summary>
@@ -298,7 +298,7 @@ internal void TryFinishingSceneEventProgress()
                     m_NetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;
                 }
 
-                if (m_TimeOutCoroutine != null)
+                if (m_TimeOutCoroutine != null && m_NetworkManager != null)
                 {
                     m_NetworkManager.StopCoroutine(m_TimeOutCoroutine);
                 }
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs
@@ -329,7 +329,7 @@ public static void Destroy()
             // Shutdown the server which forces clients to disconnect
             foreach (var networkManager in NetworkManagerInstances)
             {
-                networkManager.Shutdown();
+                networkManager.Shutdown(true);
                 s_Hooks.Remove(networkManager);
             }
 
diff --git a/testproject/Assets/Tests/Runtime/MessageOrdering.cs b/testproject/Assets/Tests/Runtime/MessageOrdering.cs
@@ -36,12 +36,13 @@ public IEnumerator Teardown()
             {
                 Object.Destroy(m_Prefab);
                 m_Prefab = null;
-                NetcodeIntegrationTestHelpers.Destroy();
                 Support.SpawnRpcDespawn.ClientUpdateCount = 0;
                 Support.SpawnRpcDespawn.ServerUpdateCount = 0;
                 Support.SpawnRpcDespawn.ClientNetworkSpawnRpcCalled = false;
                 Support.SpawnRpcDespawn.ExecuteClientRpc = false;
             }
+
+            NetcodeIntegrationTestHelpers.Destroy();
             yield break;
         }
 
@@ -106,16 +107,6 @@ public IEnumerator SpawnRpcDespawn()
 
             // Make it a prefab
             NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
-            var clientHandlers = new List<SpawnRpcDespawnInstanceHandler>();
-            //var handler = new SpawnRpcDespawnInstanceHandler(networkObject.GlobalObjectIdHash);
-            //server.PrefabHandler.AddHandler(networkObject.GlobalObjectIdHash, handler);
-            foreach (var client in m_ClientNetworkManagers)
-            {
-                var clientHandler = new SpawnRpcDespawnInstanceHandler(networkObject.GlobalObjectIdHash);
-                client.PrefabHandler.AddHandler(networkObject, clientHandler);
-                clientHandlers.Add(clientHandler);
-            }
-
             var validNetworkPrefab = new NetworkPrefab
             {
                 Prefab = m_Prefab
@@ -126,6 +117,16 @@ public IEnumerator SpawnRpcDespawn()
                 client.NetworkConfig.Prefabs.Add(validNetworkPrefab);
             }
 
+            var clientHandlers = new List<SpawnRpcDespawnInstanceHandler>();
+            //var handler = new SpawnRpcDespawnInstanceHandler(networkObject.GlobalObjectIdHash);
+            //server.PrefabHandler.AddHandler(networkObject.GlobalObjectIdHash, handler);
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                var clientHandler = new SpawnRpcDespawnInstanceHandler(networkObject.GlobalObjectIdHash);
+                client.PrefabHandler.AddHandler(networkObject, clientHandler);
+                clientHandlers.Add(clientHandler);
+            }
+
             // Start the instances
             if (!NetcodeIntegrationTestHelpers.Start(true, m_ServerNetworkManager, m_ClientNetworkManagers))
             {
diff --git a/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs b/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Unity.Netcode;
@@ -19,6 +20,36 @@ public class SceneObjectsNotDestroyedOnShutdownTest : NetcodeIntegrationTest
         private Scene m_TestScene;
         private WaitForSeconds m_DefaultWaitForTick = new WaitForSeconds(1.0f / 30);
 
+        private NetworkObject m_LoadedSceneObject;
+        private List<NetworkObject> m_LoadedSceneOBjects = new List<NetworkObject>();
+
+        private bool FoundLoadedSceneObject()
+        {
+            m_LoadedSceneObject = null;
+#if UNITY_2023_1_OR_NEWER
+            m_LoadedSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
+#else
+            m_LoadedSceneObject = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
+#endif
+            return m_LoadedSceneObject != null;
+        }
+
+        private bool FoundLoadedSceneObjects()
+        {
+            m_LoadedSceneOBjects.Clear();
+#if UNITY_2023_1_OR_NEWER
+            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName));
+#else
+            var loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
+#endif
+            if (loadedInSceneObjects.Count() == 0)
+            {
+                return false;
+            }
+            m_LoadedSceneOBjects.AddRange(loadedInSceneObjects);
+            return true;
+        }
+
         [UnityTest]
         public IEnumerator SceneObjectsNotDestroyedOnShutdown()
         {
@@ -28,30 +59,22 @@ public IEnumerator SceneObjectsNotDestroyedOnShutdown()
             yield return WaitForConditionOrTimeOut(() => m_TestScene.IsValid() && m_TestScene.isLoaded);
             AssertOnTimeout($"Timed out waiting for scene {k_TestScene} to load!");
 
-#if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName).FirstOrDefault();
-#else
-            var loadedInSceneObject = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
-#endif
-            Assert.IsNotNull(loadedInSceneObject, $"Failed to find {k_SceneObjectName} before starting client!");
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObject);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} before starting client!");
             yield return CreateAndStartNewClient();
 
-#if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
-#else
-            var loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
-#endif
-            Assert.IsTrue(loadedInSceneObjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after client connected!");
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObjects);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} objects after starting Client-{m_ClientNetworkManagers[0].LocalClientId}!");
+
+            Assert.IsTrue(m_LoadedSceneOBjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after Client-{m_ClientNetworkManagers[0].LocalClientId} connected!");
             m_ClientNetworkManagers[0].Shutdown();
             yield return m_DefaultWaitForTick;
-#if UNITY_2023_1_OR_NEWER
-            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
-#else
-            loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
-#endif
-            Assert.IsTrue(loadedInSceneObjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after client shutdown!");
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObjects);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} objects after shutting down client!");
+            Assert.IsTrue(m_LoadedSceneOBjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after client shutdown!");
         }
 
+
         [UnityTest]
         public IEnumerator ChildSceneObjectsDoNotDestroyOnShutdown()
         {
@@ -61,46 +84,39 @@ public IEnumerator ChildSceneObjectsDoNotDestroyOnShutdown()
             yield return WaitForConditionOrTimeOut(() => m_TestScene.IsValid() && m_TestScene.isLoaded);
             AssertOnTimeout($"Timed out waiting for scene {k_TestScene} to load!");
 
-#if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName).FirstOrDefault();
-#else
-            var loadedInSceneObject = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
-#endif
-            Assert.IsNotNull(loadedInSceneObject, $"Failed to find {k_SceneObjectName} before starting client!");
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObject);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} before starting client!");
+
             yield return CreateAndStartNewClient();
 
             var clientId = m_ClientNetworkManagers[0].LocalClientId;
-            Assert.IsTrue(loadedInSceneObject.TrySetParent(m_PlayerNetworkObjects[0][clientId]), $"Failed to parent in-scene object under client player");
+            Assert.IsTrue(m_LoadedSceneObject.TrySetParent(m_PlayerNetworkObjects[0][clientId]), $"Failed to parent in-scene object under client player");
 
             yield return WaitForConditionOrTimeOut(() => PlayerHasChildren(clientId));
             AssertOnTimeout($"Client-{clientId} player never parented {k_SceneObjectName}!");
 
-#if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
-#else
-            var loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
-#endif
-            Assert.IsTrue(loadedInSceneObjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after client connected!");
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObjects);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} objects before shutting down Client-{m_ClientNetworkManagers[0].LocalClientId}!");
+            Assert.IsTrue(m_LoadedSceneOBjects.Count() > 1, $"Only found one instance of {k_SceneObjectName} after client connected!");
             m_ClientNetworkManagers[0].Shutdown();
             yield return m_DefaultWaitForTick;
 
             // Sanity check to make sure the client's player no longer has any children
             yield return WaitForConditionOrTimeOut(() => PlayerNoLongerExistsWithChildren(clientId));
             AssertOnTimeout($"Client-{clientId} player still exits with children after client shutdown!");
-#if UNITY_2023_1_OR_NEWER
-            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
-#else
-            loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
-#endif
+
+            yield return WaitForConditionOrTimeOut(FoundLoadedSceneObjects);
+            AssertOnTimeout($"Failed to find {k_SceneObjectName} objects after shutting down client!");
+
             // Make sure any in-scene placed NetworkObject instantiated has no parent
-            foreach (var insceneObject in loadedInSceneObjects)
+            foreach (var insceneObject in m_LoadedSceneOBjects)
             {
                 Assert.IsTrue(insceneObject.transform.parent == null, $"{insceneObject.name} is still parented!");
             }
 
             // We should have exactly 2 in-scene placed NetworkObjects remaining:
             // One instance on host side and one on the disconnected client side.
-            Assert.IsTrue(loadedInSceneObjects.Count() == 2, $"Only found one instance of {k_SceneObjectName} after client shutdown!");
+            Assert.IsTrue(m_LoadedSceneOBjects.Count() == 2, $"Only found one instance of {k_SceneObjectName} after client shutdown!");
         }
 
         private bool PlayerHasChildren(ulong clientId)

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ internal class SceneEventProgress`
`91`	`91`	`/// </summary>`
`92`	`92`	`internal bool HasTimedOut()`
`93`	`93`	`{`
`94`		`- return WhenSceneEventHasTimedOut <= m_NetworkManager.RealTimeProvider.RealTimeSinceStartup;`
	`94`	`+ return m_NetworkManager == null \|\| WhenSceneEventHasTimedOut <= m_NetworkManager.RealTimeProvider.RealTimeSinceStartup;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/// <summary>`
`@@ -298,7 +298,7 @@ internal void TryFinishingSceneEventProgress()`
`298`	`298`	`m_NetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;`
`299`	`299`	`}`
`300`	`300`
`301`		`- if (m_TimeOutCoroutine != null)`
	`301`	`+ if (m_TimeOutCoroutine != null && m_NetworkManager != null)`
`302`	`302`	`{`
`303`	`303`	`m_NetworkManager.StopCoroutine(m_TimeOutCoroutine);`
`304`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ public static void Destroy()`
`329`	`329`	`// Shutdown the server which forces clients to disconnect`
`330`	`330`	`foreach (var networkManager in NetworkManagerInstances)`
`331`	`331`	`{`
`332`		`- networkManager.Shutdown();`
	`332`	`+ networkManager.Shutdown(true);`
`333`	`333`	`s_Hooks.Remove(networkManager);`
`334`	`334`	`}`
`335`	`335`