test

Adding test to verify this fix.

Author: NoelStephensUnity

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

@@ -8,6 +8,7 @@ namespace Unity.Netcode.RuntimeTests
     public class NetworkVariableTraitsComponent : NetworkBehaviour
     {
         public NetworkVariable<float> TheVariable = new NetworkVariable<float>();
+        public NetworkVariable<float> AnotherVariable = new NetworkVariable<float>();
     }
 
     public class NetworkVariableTraitsTests : NetcodeIntegrationTest
@@ -52,9 +53,10 @@ public void WhenNewValueIsLessThanThreshold_VariableIsNotSerialized()
 
             TimeTravel(2, 120);
 
-            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0, testComponent.TheVariable.Value);
         }
+
         [Test]
         public void WhenNewValueIsGreaterThanThreshold_VariableIsSerialized()
         {
@@ -66,8 +68,8 @@ public void WhenNewValueIsGreaterThanThreshold_VariableIsSerialized()
 
             TimeTravel(2, 120);
 
-            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0.15f, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0.15f, testComponent.TheVariable.Value);
         }
 
         [Test]
@@ -83,13 +85,13 @@ public void WhenNewValueIsLessThanThresholdButMaxTimeHasPassed_VariableIsSeriali
 
             TimeTravel(1 / 60f * 119, 119);
 
-            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0, testComponent.TheVariable.Value);
 
             TimeTravel(1 / 60f * 4, 4);
 
-            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0.05f, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.05f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0.05f, testComponent.TheVariable.Value);
         }
 
         [Test]
@@ -105,13 +107,13 @@ public void WhenNewValueIsGreaterThanThresholdButMinTimeHasNotPassed_VariableIsN
 
             TimeTravel(1 / 60f * 119, 119);
 
-            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0, testComponent.TheVariable.Value);
 
             TimeTravel(1 / 60f * 4, 4);
 
-            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0.15f, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0.15f, testComponent.TheVariable.Value);
         }
 
         [Test]
@@ -126,13 +128,43 @@ public void WhenNoThresholdIsSetButMinTimeHasNotPassed_VariableIsNotSerialized()
 
             TimeTravel(1 / 60f * 119, 119);
 
-            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0, testComponent.TheVariable.Value); ;
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0, testComponent.TheVariable.Value);
+
+            TimeTravel(1 / 60f * 4, 4);
+
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0.15f, testComponent.TheVariable.Value);
+        }
 
+        [Test]
+        public void WhenNonTraitsIsDirtyButTraitsIsNotReadyToSend()
+        {
+            var serverComponent = GetServerComponent();
+            var testComponent = GetTestComponent();
+            serverComponent.TheVariable.SetUpdateTraits(new NetworkVariableUpdateTraits { MinSecondsBetweenUpdates = 2 });
+            serverComponent.TheVariable.LastUpdateSent = m_ServerNetworkManager.NetworkTimeSystem.LocalTime;
+
+            serverComponent.TheVariable.Value = 0.15f;
+            // Set the non-traits NetworkVariable value
+            serverComponent.AnotherVariable.Value = 1.0f;
+
+            TimeTravel(1 / 60f * 119, 119);
+            // We don't expect the traits NetworkVariable to update
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0, testComponent.TheVariable.Value);
+            // We should expect the non-traits NetworkVariable to update
+            Assert.AreEqual(1.0f, serverComponent.AnotherVariable.Value);
+            Assert.AreEqual(1.0f, testComponent.AnotherVariable.Value);
+
+            serverComponent.AnotherVariable.Value = 1.5f;
             TimeTravel(1 / 60f * 4, 4);
 
-            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value); ;
-            Assert.AreEqual(0.15f, testComponent.TheVariable.Value); ;
+            // We should expect both NetworkVariables to update
+            Assert.AreEqual(0.15f, serverComponent.TheVariable.Value);
+            Assert.AreEqual(0.15f, testComponent.TheVariable.Value);
+            Assert.AreEqual(1.5f, serverComponent.AnotherVariable.Value);
+            Assert.AreEqual(1.5f, testComponent.AnotherVariable.Value);
         }
     }
 }