Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ public void WhenSendingNamedMessageToNullClientList_ArgumentNullExceptionIsThrow
[Test]
public unsafe void ErrorMessageIsPrintedWhenAttemptingToSendNamedMessageWithTooBigBuffer()
{
#if !DEBUG
Assert.Ignore("The message size check only exists in builds that define DEBUG.");
#endif
// First try a valid send with the maximum allowed size (this is atm 1264)
var msgSize = m_ServerNetworkManager.MessageManager.NonFragmentedMessageMaxSize - FastBufferWriter.GetWriteSize<NetworkMessageHeader>() - sizeof(ulong)/*MessageName hash*/ - sizeof(NetworkBatchHeader);
var bufferSize = m_ServerNetworkManager.MessageManager.NonFragmentedMessageMaxSize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ public void WhenSendingNamedMessageToNullClientList_ArgumentNullExceptionIsThrow
[Test]
public unsafe void ErrorMessageIsPrintedWhenAttemptingToSendUnnamedMessageWithTooBigBuffer()
{
#if !DEBUG
Assert.Ignore("The message size check only exists in builds that define DEBUG.");
#endif
// First try a valid send with the maximum allowed size (this is atm 1272)
var msgSize = m_ServerNetworkManager.MessageManager.NonFragmentedMessageMaxSize - FastBufferWriter.GetWriteSize<NetworkMessageHeader>() - sizeof(NetworkBatchHeader);
var bufferSize = m_ServerNetworkManager.MessageManager.NonFragmentedMessageMaxSize;
Expand Down

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ObjectNameIdentifier is a test helper. We don't want to add tests for regressions in the test helpers. The tests being helped by the test helpers should be the regression test for those changes.

Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using System.Collections;
using System.Text;
using NUnit.Framework;
using Unity.Netcode.TestHelpers.Runtime;
using UnityEngine;
using UnityEngine.TestTools;

namespace Unity.Netcode.RuntimeTests
{
internal class ObjectNameIdentifierTests : NetcodeIntegrationTest
{
protected override int NumberOfClients => 1;

private GameObject m_Prefab;

protected override void OnServerAndClientsCreated()
{
m_Prefab = CreateNetworkObjectPrefab("TrackedObject");
base.OnServerAndClientsCreated();
}

private bool AllInstancesAreRegistered(StringBuilder errorLog, ulong networkObjectId)
{
foreach (var networkManager in m_NetworkManagers)
{
if (!s_GlobalNetworkObjects.TryGetValue(networkManager.LocalClientId, out var networkObjects) || !networkObjects.ContainsKey(networkObjectId))
{
errorLog.Append($"[Client-{networkManager.LocalClientId}] Object-{networkObjectId} is not registered.");
return false;
}
}
return true;
}

[UnityTest]
public IEnumerator OwnershipChangesKeepAllInstancesRegistered()
{
var authority = GetAuthorityNetworkManager();
var client = m_ClientNetworkManagers[0];
var authorityInstance = SpawnObject(m_Prefab, authority).GetComponent<NetworkObject>();
var networkObjectId = authorityInstance.NetworkObjectId;
yield return WaitForSpawnedOnAllOrTimeOut(authorityInstance);
AssertOnTimeout($"Timed out waiting for Object-{networkObjectId} to spawn on all instances!");

authorityInstance.ChangeOwnership(client.LocalClientId);
yield return WaitForConditionOrTimeOut(() => client.SpawnManager.SpawnedObjects[networkObjectId].OwnerClientId == client.LocalClientId);
AssertOnTimeout($"Timed out waiting for Client-{client.LocalClientId} to gain ownership of Object-{networkObjectId}!");
var errorLog = new StringBuilder();
Assert.IsTrue(AllInstancesAreRegistered(errorLog, networkObjectId), $"After gaining ownership: {errorLog}");

authorityInstance.RemoveOwnership();
yield return WaitForConditionOrTimeOut(() => client.SpawnManager.SpawnedObjects[networkObjectId].OwnerClientId == authority.LocalClientId);
AssertOnTimeout($"Timed out waiting for the authority to regain ownership of Object-{networkObjectId}!");
errorLog.Clear();
Assert.IsTrue(AllInstancesAreRegistered(errorLog, networkObjectId), $"After removing ownership: {errorLog}");
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,9 @@ public IEnumerator DoesNotActAfterShutdown([Values] AfterShutdownAction afterShu
{
m_Server.DisconnectRemoteClient(m_Client1.ServerClientId);

#if DEBUG
LogAssert.Expect(LogType.Warning, $"{nameof(UnityTransport.DisconnectRemoteClient)} should only be called on a listening server!");
#endif
}
else if (afterShutdownAction == AfterShutdownAction.DisconnectLocalClient)
{
Expand Down
Loading