test

Adding some debug information to NetworkShowHideTests.
Replacing m_ServerNetworkManager in OwnerModifiedTests with GetAuthorityNetworkManager() to become CMB service testing compatible.

Author: NoelStephensUnity

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

@@ -31,6 +31,8 @@ public static NetworkObject GetNetworkObjectById(ulong networkObjectId)
 
         public override void OnNetworkSpawn()
         {
+            MyNetworkVariable.OnValueChanged += Changed;
+            MyOwnerReadNetworkVariable.OnValueChanged += OwnerReadChanged;
             if (NetworkManager.LocalClientId == ClientIdToTarget)
             {
                 ClientTargetedNetworkObjects.Add(this);
@@ -42,7 +44,7 @@ public override void OnNetworkSpawn()
             }
             else
             {
-                Debug.Assert(MyListSetOnSpawn.Count == 1);
+                Debug.Assert(MyListSetOnSpawn.Count == 1, $"[Session Authority][Client-{NetworkManager.LocalClientId}][{name}] Count = {MyListSetOnSpawn.Count} when expecting only 1!");
                 Debug.Assert(MyListSetOnSpawn[0] == 45);
             }
 
@@ -53,34 +55,23 @@ public override void OnNetworkSpawn()
 
         public override void OnNetworkDespawn()
         {
+            MyNetworkVariable.OnValueChanged -= Changed;
+            MyOwnerReadNetworkVariable.OnValueChanged -= OwnerReadChanged;
             if (ClientTargetedNetworkObjects.Contains(this))
             {
                 ClientTargetedNetworkObjects.Remove(this);
             }
             base.OnNetworkDespawn();
         }
 
-        public NetworkVariable<int> MyNetworkVariable;
-        public NetworkList<int> MyListSetOnSpawn;
-        public NetworkVariable<int> MyOwnerReadNetworkVariable;
-        public NetworkList<int> MyList;
+        public NetworkVariable<int> MyNetworkVariable = new NetworkVariable<int>();
+        public NetworkList<int> MyListSetOnSpawn = new NetworkList<int>();
+        public NetworkVariable<int> MyOwnerReadNetworkVariable = new NetworkVariable<int>(readPerm: NetworkVariableReadPermission.Owner);
+        public NetworkList<int> MyList = new NetworkList<int>();
         public static NetworkManager NetworkManagerOfInterest;
 
         internal static int GainOwnershipCount = 0;
 
-        private void Awake()
-        {
-            // Debug.Log($"Awake {NetworkManager.LocalClientId}");
-            MyNetworkVariable = new NetworkVariable<int>();
-            MyNetworkVariable.OnValueChanged += Changed;
-
-            MyListSetOnSpawn = new NetworkList<int>();
-            MyList = new NetworkList<int>();
-
-            MyOwnerReadNetworkVariable = new NetworkVariable<int>(readPerm: NetworkVariableReadPermission.Owner);
-            MyOwnerReadNetworkVariable.OnValueChanged += OwnerReadChanged;
-        }
-
         public override void OnGainedOwnership()
         {
             GainOwnershipCount++;
@@ -532,6 +523,7 @@ public IEnumerator NetworkHideChangeOwnership()
             AssertOnTimeout($"NetworkObject is still visible to Client-{m_ClientWithoutVisibility} or other clients think it is still visible to Client-{m_ClientWithoutVisibility}:\n {m_ErrorLog}");
 
             yield return WaitForConditionOrTimeOut(() => ShowHideObject.ClientTargetedNetworkObjects.Count == 0);
+            AssertOnTimeout($"Timed out waiting for ShowHideObject.ClientTargetedNetworkObjects to have a count of 0 but was {ShowHideObject.ClientTargetedNetworkObjects.Count}!");
 
             foreach (var client in m_ClientNetworkManagers)
             {
@@ -564,8 +556,31 @@ public IEnumerator NetworkHideChangeOwnership()
             }
 
             yield return WaitForConditionOrTimeOut(() => ShowHideObject.ClientTargetedNetworkObjects.Count == 1);
+            AssertOnTimeout($"Timed out waiting for ShowHideObject.ClientTargetedNetworkObjects to have a count of 1 but was {ShowHideObject.ClientTargetedNetworkObjects.Count}!");
+
+            m_ClientIdToCheck = firstClient.LocalClientId;
+            yield return WaitForConditionOrTimeOut(CheckIsClientOwner);
+            AssertOnTimeout($"Timed out waiting for client owner check!");
+        }
 
-            Assert.True(ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId == firstClient.LocalClientId);
+        private ulong m_ClientIdToCheck;
+        private bool CheckIsClientOwner(StringBuilder errorLog)
+        {
+            if (ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId != m_ClientIdToCheck)
+            {
+                errorLog.AppendLine($"[CheckIsClientOwner][Index: 0][{ShowHideObject.ClientTargetedNetworkObjects[0].name}] OwnerClientId is {ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId} when it was expected to be {m_ClientIdToCheck}!");
+                if (ShowHideObject.ClientTargetedNetworkObjects.Count > 1)
+                {
+                    for (int i = 1; i < ShowHideObject.ClientTargetedNetworkObjects.Count; i++)
+                    {
+                        var target = ShowHideObject.ClientTargetedNetworkObjects[i];
+                        errorLog.AppendLine($"[CheckIsClientOwner][Index: {i}][{target.name}] OwnerClientId is {target.OwnerClientId}.");
+                    }
+                }
+                return false;
+            }
+
+            return true;
         }
 
         private bool AllClientsSpawnedObject1()

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs

@@ -132,6 +132,7 @@ protected override void OnNewClientStartedAndConnected(NetworkManager networkMan
         [UnityTest]
         public IEnumerator VerifyDoesNotRepeatOnSomeClients()
         {
+            var authority = GetAuthorityNetworkManager();
             OwnerModifiedObject.EnableVerbose = m_EnableVerboseDebug;
             // We use this to assure we are the "last client" connected.
             yield return CreateAndStartNewClient();
@@ -144,10 +145,10 @@ public IEnumerator VerifyDoesNotRepeatOnSomeClients()
                 ownerModLastClient.NetworkUpdateStageToCheck = (NetworkUpdateStage)updateLoopType;
                 VerboseDebug($"Testing Update Stage: {ownerModLastClient.NetworkUpdateStageToCheck}");
                 ownerModLastClient.AddValues = true;
-                yield return WaitForTicks(m_ServerNetworkManager, 5);
+                yield return WaitForTicks(authority, 5);
             }
 
-            yield return WaitForTicks(m_ServerNetworkManager, 5);
+            yield return WaitForTicks(authority, 5);
 
             // We'll have at least one update per stage per client, if all goes well.
             Assert.True(OwnerModifiedObject.Updates > 20);