trunk shadow changes: com.unity.netcode.gameobjects [skip ci]

Author: pets-svc[bot]

com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs

@@ -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;

com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs

@@ -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;

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

@@ -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}");
+        }
+    }
+}

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/ObjectNameIdentifierTests.cs.meta

@@ -9,7 +9,7 @@ namespace Unity.Netcode.TestHelpers.Runtime
     /// </summary>
     public class ObjectNameIdentifier : NetworkBehaviour
     {
-        private ulong m_CurrentOwner;
+        private ulong m_RegisteredClientId;
         private ulong m_CurrentNetworkObjectId;
         private bool m_IsRegistered;
 
@@ -45,7 +45,7 @@ protected void RegisterAndLabelNetworkObject()
                 // This is required otherwise it will try to continue to update the NetworkBehaviour even if
                 // it has been destroyed.
                 m_NetworkObject = NetworkObject;
-                m_CurrentOwner = OwnerClientId;
+                m_RegisteredClientId = NetworkManager.LocalClientId;
                 m_CurrentNetworkObjectId = NetworkObjectId;
 
                 var serverOrClient = IsServer ? "Server" : "Client";
@@ -75,7 +75,7 @@ protected void DeRegisterNetworkObject()
         {
             if (m_IsRegistered)
             {
-                NetcodeIntegrationTest.DeregisterNetworkObject(m_CurrentOwner, m_CurrentNetworkObjectId);
+                NetcodeIntegrationTest.DeregisterNetworkObject(m_RegisteredClientId, m_CurrentNetworkObjectId);
                 m_IsRegistered = false;
             }
         }

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/Components/ObjectNameIdentifier.cs

@@ -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)
             {