fix: Fixes for Deferred Messaging Tests [MTT-5102] (Unity-Technologies#2319) (Cherry-picked from release/1.2.0) (Unity-Technologies#2338)

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>

Author: ShadauxCat

com.unity.netcode.gameobjects/TestHelpers/Runtime/MessageHooks.cs

@@ -44,7 +44,7 @@ public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int message
 
         public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes)
         {
-            if (!CurrentMessageHasTriggerdAHook && IsWaiting && (HandleCheck == null || HandleCheck.Invoke(messageType)))
+            if (!CurrentMessageHasTriggerdAHook && IsWaiting && ReceiptCheck != null && ReceiptCheck.Invoke(messageType))
             {
                 IsWaiting = false;
                 CurrentMessageHasTriggerdAHook = true;
@@ -92,7 +92,7 @@ public void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context)
 
         public void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage
         {
-            if (!CurrentMessageHasTriggerdAHook && IsWaiting && (HandleCheck == null || HandleCheck.Invoke(message)))
+            if (!CurrentMessageHasTriggerdAHook && IsWaiting && HandleCheck != null && HandleCheck.Invoke(message))
             {
                 IsWaiting = false;
                 CurrentMessageHasTriggerdAHook = true;

com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs

@@ -340,6 +340,11 @@ protected IEnumerator CreateAndStartNewClient()
 
             NetcodeIntegrationTestHelpers.StartOneClient(networkManager);
 
+            if (LogAllMessages)
+            {
+                networkManager.MessagingSystem.Hook(new DebugNetworkHooks());
+            }
+
             AddRemoveNetworkManager(networkManager, true);
 
             OnNewClientStarted(networkManager);

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

@@ -644,6 +644,8 @@ bool HaveAllClientsSpawned()
             }
         }
 
+        protected override bool LogAllMessages => true;
+
         [UnityTest]
         public IEnumerator WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnSpawn()
         {
@@ -663,17 +665,17 @@ public IEnumerator WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProce
 
             serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
 
-            yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
+            yield return WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
 
             foreach (var client in m_ClientNetworkManagers)
             {
                 var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
                 Assert.IsTrue(manager.DeferMessageCalled);
                 Assert.IsFalse(manager.ProcessTriggersCalled);
 
-                Assert.AreEqual(3, manager.DeferredMessageCountTotal());
-                Assert.AreEqual(3, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
-                Assert.AreEqual(3, manager.DeferredMessageCountForKey(IDeferredMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
+                Assert.AreEqual(4, manager.DeferredMessageCountTotal());
+                Assert.AreEqual(4, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
+                Assert.AreEqual(4, manager.DeferredMessageCountForKey(IDeferredMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
                 Assert.AreEqual(0, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnAddPrefab));
                 AddPrefabsToClient(client);
             }
@@ -807,10 +809,6 @@ public IEnumerator WhenSpawnTriggeredMessagesAreDeferredBeforeThePrefabIsAdded_A
 
             yield return WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
 
-            // wait three ticks
-            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 3);
-            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ClientNetworkManagers[0], 3);
-
             // Validate messages are deferred and pending
             foreach (var client in m_ClientNetworkManagers)
             {