Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoelStephensUnity merged 2 commits into from
Dec 11, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac790b
fix: Fixes for Deferred Messaging Tests [MTT-5102] (#2319) (Cherry-pi…
ShadauxCat Dec 7, 2022
9aba5f3
Merge branch 'develop' into fix/deferred_messaging_test_fixes_to_develop
NoelStephensUnity Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.netcode.gameobjects/TestHelpers/Runtime/MessageHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,11 @@ protected IEnumerator CreateAndStartNewClient()

NetcodeIntegrationTestHelpers.StartOneClient(networkManager);

if (LogAllMessages)
{
networkManager.MessagingSystem.Hook(new DebugNetworkHooks());
}

AddRemoveNetworkManager(networkManager, true);

OnNewClientStarted(networkManager);
Expand Down
14 changes: 6 additions & 8 deletions com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,8 @@ bool HaveAllClientsSpawned()
}
}

protected override bool LogAllMessages => true;

[UnityTest]
public IEnumerator WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnSpawn()
{
Expand All @@ -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);
}
Expand Down Expand Up @@ -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)
{
Expand Down