test-fix

OwnerModifiedTests was not properly spawning from the non-session owner client (it was spawning with ownership on the session owner side).

NetworkVariableCollectionTests is showing an issue with changes for only the host instance and only within the TestDictionaryCollections (has to do with trying to add and then reverting vs the tracked changes).

Author: NoelStephensUnity

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

@@ -781,6 +781,12 @@ public IEnumerator TestDictionaryCollections()
             }
 
             m_CurrentKey = 1000;
+            // Temporarily enabling debug mode on host only.
+            // TODO: Need to track down why host is the only failing test.
+            // NOTES: It seems the tracked changes get adjusted for only a host which would have the player object.
+            // This could be due to when the player is spawned on the host relative to the other clients.
+            m_EnableDebug = m_ServerNetworkManager.IsHost;
+            m_EnableVerboseDebug = m_ServerNetworkManager.IsHost;
             if (m_EnableDebug)
             {
                 VerboseDebug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>> Init Values <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
@@ -831,7 +837,7 @@ public IEnumerator TestDictionaryCollections()
                 {
                     // Server-side add same key and SerializableObject prior to being added to the owner side
                     compDictionaryServer.ListCollectionOwner.Value.Add(newEntry.Item1, newEntry.Item2);
-                    // Checking if dirty on server side should revert back to origina known current dictionary state
+                    // Checking if dirty on server side should revert back to original known current dictionary state
                     compDictionaryServer.ListCollectionOwner.IsDirty();
                     yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                     AssertOnTimeout($"Server add to owner write collection property failed to restore on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
@@ -840,7 +846,6 @@ public IEnumerator TestDictionaryCollections()
                     // Server-side add a completely new key and SerializableObject to to owner write permission property
                     compDictionaryServer.ListCollectionOwner.Value.Add(GetNextKey(), SerializableObject.GetRandomObject());
                     // Both should be overridden by the owner-side update
-
                 }
                 VerboseDebug($"[{compDictionary.name}][Owner] Adding Key: {newEntry.Item1}");
                 // Add key and SerializableObject to owner side
@@ -857,7 +862,7 @@ public IEnumerator TestDictionaryCollections()
                 {
                     // Client-side add same key and SerializableObject to server write permission property
                     compDictionary.ListCollectionServer.Value.Add(newEntry.Item1, newEntry.Item2);
-                    // Checking if dirty on client side should revert back to origina known current dictionary state
+                    // Checking if dirty on client side should revert back to original known current dictionary state
                     compDictionary.ListCollectionServer.IsDirty();
                     yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                     AssertOnTimeout($"Client-{client.LocalClientId} add to server write collection property failed to restore on {className} {compDictionary.name}! {compDictionary.GetLog()}");
@@ -892,7 +897,6 @@ public IEnumerator TestDictionaryCollections()
 
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.ValidateInstances());
                 AssertOnTimeout($"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
-
                 ValidateClientsFlat(client);
                 ////////////////////////////////////
                 // Owner Change SerializableObject Entry
@@ -915,7 +919,7 @@ public IEnumerator TestDictionaryCollections()
                     {
                         // Server-side update same key value prior to being updated to the owner side
                         compDictionaryServer.ListCollectionOwner.Value[valueInt] = randomObject;
-                        // Checking if dirty on server side should revert back to origina known current dictionary state
+                        // Checking if dirty on server side should revert back to original known current dictionary state
                         compDictionaryServer.ListCollectionOwner.IsDirty();
                         yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                         AssertOnTimeout($"Server update collection entry value to local owner write collection property failed to restore on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
@@ -956,7 +960,7 @@ public IEnumerator TestDictionaryCollections()
                     {
                         // Owner-side update same key value prior to being updated to the server side
                         compDictionary.ListCollectionServer.Value[valueInt] = randomObject;
-                        // Checking if dirty on owner side should revert back to origina known current dictionary state
+                        // Checking if dirty on owner side should revert back to original known current dictionary state
                         compDictionary.ListCollectionServer.IsDirty();
                         yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                         AssertOnTimeout($"Client-{client.LocalClientId} update collection entry value to local server write collection property failed to restore on {className} {compDictionary.name}! {compDictionary.GetLog()}");
@@ -1014,6 +1018,9 @@ public IEnumerator TestDictionaryCollections()
                     m_Stage = 0;
                 }
             }
+
+            m_EnableDebug = false;
+            m_EnableVerboseDebug = false;
         }
 
         [UnityTest]
@@ -1844,7 +1851,7 @@ private bool ChangesMatch(ulong clientId, Dictionary<DeltaTypes, Dictionary<int,
                 LogMessage($"Comparing {deltaType}:");
                 if (local[deltaType].Count != other[deltaType].Count)
                 {
-                    LogMessage($"{deltaType}s count did not match!");
+                    LogMessage($"[Client-{clientId}] {deltaType}s count {other[deltaType].Count} did not match the local count {local[deltaType].Count}!");
                     return false;
                 }
                 if (!CompareDictionaries(clientId, local[deltaType], other[deltaType]))

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

@@ -154,20 +154,26 @@ public IEnumerator VerifyDoesNotRepeatOnSomeClients()
             Assert.True(OwnerModifiedObject.Updates > 20);
         }
 
-
-        private ChangeValueOnAuthority m_SessionAuthorityInstance;
         private ChangeValueOnAuthority m_InstanceAuthority;
 
         private bool NetworkVariablesMatch(StringBuilder errorLog)
         {
             foreach (var networkManager in m_NetworkManagers)
             {
+                var changeValue = networkManager.SpawnManager.SpawnedObjects[m_InstanceAuthority.NetworkObjectId].GetComponent<ChangeValueOnAuthority>();
                 if (networkManager == m_InstanceAuthority.NetworkManager)
                 {
+                    if (m_InstanceAuthority.SomeIntValue.Value != 2)
+                    {
+                        errorLog.AppendLine($"[Client-{networkManager.LocalClientId}] {changeValue.name} value is {changeValue.SomeIntValue.Value} but was expecting 2!");
+                    }
                     continue;
                 }
+                if (changeValue.SomeIntValue.Value != 2)
+                {
+                    errorLog.AppendLine($"[Client-{networkManager.LocalClientId}] {changeValue.name} value is {changeValue.SomeIntValue.Value} but was expecting 2!");
+                }
 
-                var changeValue = networkManager.SpawnManager.SpawnedObjects[m_InstanceAuthority.NetworkObjectId].GetComponent<ChangeValueOnAuthority>();
                 if (changeValue.SomeIntValue.Value != m_InstanceAuthority.SomeIntValue.Value)
                 {
                     errorLog.AppendLine($"[Client-{networkManager.LocalClientId}] {changeValue.name} value is {changeValue.SomeIntValue.Value} but was expecting {m_InstanceAuthority.SomeIntValue.Value}!");
@@ -185,19 +191,15 @@ public IEnumerator OwnershipSpawnedAndUpdatedDuringSpawn()
         {
             var authority = GetAuthorityNetworkManager();
             var nonAuthority = GetNonAuthorityNetworkManager();
-            m_SessionAuthorityInstance = Object.Instantiate(m_SpawnObject).GetComponent<ChangeValueOnAuthority>();
-
-            SpawnInstanceWithOwnership(m_SessionAuthorityInstance.GetComponent<NetworkObject>(), authority, nonAuthority.LocalClientId);
-            yield return WaitForSpawnedOnAllOrTimeOut(m_SessionAuthorityInstance.NetworkObjectId);
-            AssertOnTimeout($"Failed to spawn {m_SessionAuthorityInstance.name} on all clients!");
+            // If running in distributed authority mode, we use the nonauthority (i.e. not SessionOwner) instance to spawn.
+            var spawnAuthority = m_DistributedAuthority ? nonAuthority : authority;
+            m_InstanceAuthority = SpawnObject(m_SpawnObject, spawnAuthority).GetComponent<ChangeValueOnAuthority>();
 
-            m_InstanceAuthority = nonAuthority.SpawnManager.SpawnedObjects[m_SessionAuthorityInstance.NetworkObjectId].GetComponent<ChangeValueOnAuthority>();
+            yield return WaitForSpawnedOnAllOrTimeOut(m_InstanceAuthority.NetworkObjectId);
+            AssertOnTimeout($"Failed to spawn {m_InstanceAuthority.name} on all clients!");
 
             yield return WaitForConditionOrTimeOut(NetworkVariablesMatch);
             AssertOnTimeout($"The {nameof(ChangeValueOnAuthority.SomeIntValue)} failed to synchronize on all clients!");
-
-            Assert.IsTrue(m_SessionAuthorityInstance.SomeIntValue.Value == 2, "No values were updated on the spawn authority instance!");
-            Assert.IsTrue(m_InstanceAuthority.SomeIntValue.Value == 2, "No values were updated on the owner's instance!");
         }
     }
 }