feat: NetcodeIntegrationTestHelpers.WaitForTicks(netMgr, count) (#1766)

Author: 0xFA11

com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs

@@ -467,6 +467,15 @@ public static void MarkAsSceneObjectRoot(GameObject networkObjectRoot, NetworkMa
             }
         }
 
+        /// <summary>
+        /// Waits (yields) until specified amount of network ticks has been passed.
+        /// </summary>
+        public static IEnumerator WaitForTicks(NetworkManager networkManager, int count)
+        {
+            var targetTick = networkManager.NetworkTickSystem.LocalTime.Tick + count;
+            yield return new WaitUntil(() => networkManager.NetworkTickSystem.LocalTime.Tick >= targetTick);
+        }
+
         /// <summary>
         /// Waits on the client side to be connected.
         /// </summary>

com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs

@@ -52,7 +52,7 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
             Assert.IsNotNull(serverPlayer);
             Assert.IsNotNull(clientPlayer);
 
-            yield return WaitForTicks(m_ServerNetworkManager, 5);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 5);
 
             // server rigidbody has authority and should have a kinematic mode of false
             Assert.True(serverPlayer.GetComponent<Rigidbody2D>().isKinematic == Kinematic);
@@ -65,20 +65,14 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
             // despawn the server player, (but keep it around on the server)
             serverPlayer.GetComponent<NetworkObject>().Despawn(false);
 
-            yield return WaitForTicks(m_ServerNetworkManager, 5);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 5);
 
             // This should equal Kinematic
             Assert.IsTrue(serverPlayer.GetComponent<Rigidbody2D>().isKinematic == Kinematic);
 
-            yield return WaitForTicks(m_ServerNetworkManager, 5);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 5);
 
             Assert.IsTrue(clientPlayer == null); // safety check that object is actually despawned.
         }
-
-        public IEnumerator WaitForTicks(NetworkManager networkManager, int count)
-        {
-            int nextTick = networkManager.NetworkTickSystem.LocalTime.Tick + count;
-            yield return new WaitUntil(() => networkManager.NetworkTickSystem.LocalTime.Tick >= nextTick);
-        }
     }
 }

com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs

@@ -52,7 +52,7 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
             Assert.IsNotNull(serverPlayer, "serverPlayer is not null");
             Assert.IsNotNull(clientPlayer, "clientPlayer is not null");
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 3);
 
             // server rigidbody has authority and should have a kinematic mode of false
             Assert.True(serverPlayer.GetComponent<Rigidbody>().isKinematic == Kinematic, "serverPlayer kinematic");
@@ -65,19 +65,13 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
             // despawn the server player (but keep it around on the server)
             serverPlayer.GetComponent<NetworkObject>().Despawn(false);
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 3);
 
             Assert.IsTrue(serverPlayer.GetComponent<Rigidbody>().isKinematic == Kinematic, "serverPlayer second kinematic");
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+            yield return NetcodeIntegrationTestHelpers.WaitForTicks(m_ServerNetworkManager, 3);
 
             Assert.IsTrue(clientPlayer == null, "clientPlayer being null"); // safety check that object is actually despawned.
         }
-
-        public IEnumerator WaitForTicks(NetworkManager networkManager, int count)
-        {
-            int nextTick = networkManager.NetworkTickSystem.LocalTime.Tick + count;
-            yield return new WaitUntil(() => networkManager.NetworkTickSystem.LocalTime.Tick >= nextTick);
-        }
     }
 }