com.unity.netcode.gameobjects@1.4.0
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). ## [1.4.0] - 2023-04-10 ### Added - Added a way to access the GlobalObjectIdHash via PrefabIdHash for use in the Connection Approval Callback. (#2437) - Added `OnServerStarted` and `OnServerStopped` events that will trigger only on the server (or host player) to notify that the server just started or is no longer active (#2420) - Added `OnClientStarted` and `OnClientStopped` events that will trigger only on the client (or host player) to notify that the client just started or is no longer active (#2420) - Added `NetworkTransform.UseHalfFloatPrecision` property that, when enabled, will use half float values for position, rotation, and scale. This yields a 50% bandwidth savings a the cost of precision. (#2388) - Added `NetworkTransform.UseQuaternionSynchronization` property that, when enabled, will synchronize the entire quaternion. (#2388) - Added `NetworkTransform.UseQuaternionCompression` property that, when enabled, will use a smallest three implementation reducing a full quaternion synchronization update to the size of an unsigned integer. (#2388) - Added `NetworkTransform.SlerpPosition` property that, when enabled along with interpolation being enabled, will interpolate using `Vector3.Slerp`. (#2388) - Added `BufferedLinearInterpolatorVector3` that replaces the float version, is now used by `NetworkTransform`, and provides the ability to enable or disable `Slerp`. (#2388) - Added `HalfVector3` used for scale when half float precision is enabled. (#2388) - Added `HalfVector4` used for rotation when half float precision and quaternion synchronization is enabled. (#2388) - Added `HalfVector3DeltaPosition` used for position when half float precision is enabled. This handles loss in position precision by updating only the delta position as opposed to the full position. (#2388) - Added `NetworkTransform.GetSpaceRelativePosition` and `NetworkTransform.GetSpaceRelativeRotation` helper methods to return the proper values depending upon whether local or world space. (#2388) - Added `NetworkTransform.OnAuthorityPushTransformState` virtual method that is invoked just prior to sending the `NetworkTransformState` to non-authoritative instances. This provides users with the ability to obtain more precise delta values for prediction related calculations. (#2388) - Added `NetworkTransform.OnNetworkTransformStateUpdated` virtual method that is invoked just after the authoritative `NetworkTransformState` is applied. This provides users with the ability to obtain more precise delta values for prediction related calculations. (#2388) - Added `NetworkTransform.OnInitialize`virtual method that is invoked after the `NetworkTransform` has been initialized or re-initialized when ownership changes. This provides for a way to make adjustments when `NetworkTransform` is initialized (i.e. resetting client prediction etc) (#2388) - Added `NetworkObject.SynchronizeTransform` property (default is true) that provides users with another way to help with bandwidth optimizations where, when set to false, the `NetworkObject`'s associated transform will not be included when spawning and/or synchronizing late joining players. (#2388) - Added `NetworkSceneManager.ActiveSceneSynchronizationEnabled` property, disabled by default, that enables client synchronization of server-side active scene changes. (#2383) - Added `NetworkObject.ActiveSceneSynchronization`, disabled by default, that will automatically migrate a `NetworkObject` to a newly assigned active scene. (#2383) - Added `NetworkObject.SceneMigrationSynchronization`, enabled by default, that will synchronize client(s) when a `NetworkObject` is migrated into a new scene on the server side via `SceneManager.MoveGameObjectToScene`. (#2383) ### Changed - Made sure the `CheckObjectVisibility` delegate is checked and applied, upon `NetworkShow` attempt. Found while supporting (#2454), although this is not a fix for this (already fixed) issue. (#2463) - Changed `NetworkTransform` authority handles delta checks on each new network tick and no longer consumes processing cycles checking for deltas for all frames in-between ticks. (#2388) - Changed the `NetworkTransformState` structure is now public and now has public methods that provide access to key properties of the `NetworkTransformState` structure. (#2388) - Changed `NetworkTransform` interpolation adjusts its interpolation "ticks ago" to be 2 ticks latent if it is owner authoritative and the instance is not the server or 1 tick latent if the instance is the server and/or is server authoritative. (#2388) - Updated `NetworkSceneManager` to migrate dynamically spawned `NetworkObject`s with `DestroyWithScene` set to false into the active scene if their current scene is unloaded. (#2383) - Updated the server to synchronize its local `NetworkSceneManager.ClientSynchronizationMode` during the initial client synchronization. (#2383) ### Fixed - Fixed issue where during client synchronization the synchronizing client could receive a ObjectSceneChanged message before the client-side NetworkObject instance had been instantiated and spawned. (#2502) - Fixed issue where `NetworkAnimator` was building client RPC parameters to exclude the host from sending itself messages but was not including it in the ClientRpc parameters. (#2492) - Fixed issue where `NetworkAnimator` was not properly detecting and synchronizing cross fade initiated transitions. (#2481) - Fixed issue where `NetworkAnimator` was not properly synchronizing animation state updates. (#2481) - Fixed float NetworkVariables not being rendered properly in the inspector of NetworkObjects. (#2441) - Fixed an issue where Named Message Handlers could remove themselves causing an exception when the metrics tried to access the name of the message.(#2426) - Fixed registry of public `NetworkVariable`s in derived `NetworkBehaviour`s (#2423) - Fixed issue where runtime association of `Animator` properties to `AnimationCurve`s would cause `NetworkAnimator` to attempt to update those changes. (#2416) - Fixed issue where `NetworkAnimator` would not check if its associated `Animator` was valid during serialization and would spam exceptions in the editor console. (#2416) - Fixed issue with a child's rotation rolling over when interpolation is enabled on a `NetworkTransform`. Now using half precision or full quaternion synchronization will always update all axis. (#2388) - Fixed issue where `NetworkTransform` was not setting the teleport flag when the `NetworkTransform.InLocalSpace` value changed. This issue only impacted `NetworkTransform` when interpolation was enabled. (#2388) - Fixed issue when the `NetworkSceneManager.ClientSynchronizationMode` is `LoadSceneMode.Additive` and the server changes the currently active scene prior to a client connecting then upon a client connecting and being synchronized the NetworkSceneManager would clear its internal ScenePlacedObjects list that could already be populated. (#2383) - Fixed issue where a client would load duplicate scenes of already preloaded scenes during the initial client synchronization and `NetworkSceneManager.ClientSynchronizationMode` was set to `LoadSceneMode.Additive`. (#2383)
This commit is contained in:
Unity Technologies
@@ -1,11 +1,10 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NUnit.Framework;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
using UnityEngine;
|
||||
using UnityEngine.TestTools;
|
||||
using Unity.Netcode.TestHelpers.Runtime;
|
||||
using Object = UnityEngine.Object;
|
||||
|
||||
namespace Unity.Netcode.RuntimeTests
|
||||
@@ -194,7 +193,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
private int m_NumberOfClientsToLateJoin = 2;
|
||||
|
||||
protected override IEnumerator OnSetup()
|
||||
protected override bool m_EnableTimeTravel => true;
|
||||
protected override bool m_SetupIsACoroutine => false;
|
||||
protected override bool m_TearDownIsACoroutine => false;
|
||||
|
||||
protected override void OnInlineSetup()
|
||||
{
|
||||
DeferredMessageTestRpcAndNetworkVariableComponent.ClientInstances.Clear();
|
||||
DeferredMessageTestRpcComponent.ClientInstances.Clear();
|
||||
@@ -205,15 +208,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
// Replace the IDeferredMessageManager component with our test one in the component factory
|
||||
ComponentFactory.Register<IDeferredMessageManager>(networkManager => new TestDeferredMessageManager(networkManager));
|
||||
yield return null;
|
||||
}
|
||||
|
||||
protected override IEnumerator OnTearDown()
|
||||
protected override void OnInlineTearDown()
|
||||
{
|
||||
// Revert the IDeferredMessageManager component to its default (DeferredMessageManager)
|
||||
ComponentFactory.Deregister<IDeferredMessageManager>();
|
||||
m_ClientSpawnCatchers.Clear();
|
||||
yield return null;
|
||||
}
|
||||
|
||||
protected override void OnServerAndClientsCreated()
|
||||
@@ -255,12 +256,12 @@ namespace Unity.Netcode.RuntimeTests
|
||||
base.OnNewClientCreated(networkManager);
|
||||
}
|
||||
|
||||
private IEnumerator SpawnClients(bool clearTestDeferredMessageManagerCallFlags = true)
|
||||
private void SpawnClients(bool clearTestDeferredMessageManagerCallFlags = true)
|
||||
{
|
||||
for (int i = 0; i < m_NumberOfClientsToLateJoin; i++)
|
||||
{
|
||||
// Create and join client
|
||||
yield return CreateAndStartNewClient();
|
||||
CreateAndStartNewClientWithTimeTravel();
|
||||
}
|
||||
|
||||
if (clearTestDeferredMessageManagerCallFlags)
|
||||
@@ -308,16 +309,15 @@ namespace Unity.Netcode.RuntimeTests
|
||||
m_ClientSpawnCatchers.Clear();
|
||||
}
|
||||
|
||||
protected override IEnumerator OnServerAndClientsConnected()
|
||||
protected override void OnTimeTravelServerAndClientsConnected()
|
||||
{
|
||||
// Clear out these values from whatever might have set them during the initial startup.
|
||||
ClearTestDeferredMessageManagerCallFlags();
|
||||
yield return null;
|
||||
}
|
||||
|
||||
private IEnumerator WaitForClientsToCatchSpawns(int count = 1)
|
||||
private void WaitForClientsToCatchSpawns(int count = 1)
|
||||
{
|
||||
yield return WaitForConditionOrTimeOut(() =>
|
||||
Assert.IsTrue(WaitForConditionOrTimeOutWithTimeTravel(() =>
|
||||
{
|
||||
foreach (var catcher in m_ClientSpawnCatchers)
|
||||
{
|
||||
@@ -328,7 +328,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
||||
private void ClearTestDeferredMessageManagerCallFlags()
|
||||
@@ -348,28 +348,28 @@ namespace Unity.Netcode.RuntimeTests
|
||||
Assert.AreEqual(0, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnAddPrefab));
|
||||
}
|
||||
|
||||
private IEnumerator WaitForAllClientsToReceive<T>() where T : INetworkMessage
|
||||
private void WaitForAllClientsToReceive<T>() where T : INetworkMessage
|
||||
{
|
||||
yield return WaitForMessageReceived<T>(m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
WaitForMessageReceivedWithTimeTravel<T>(m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
}
|
||||
|
||||
private IEnumerator WaitForAllClientsToReceive<TFirstMessage, TSecondMessage>()
|
||||
private void WaitForAllClientsToReceive<TFirstMessage, TSecondMessage>()
|
||||
where TFirstMessage : INetworkMessage
|
||||
where TSecondMessage : INetworkMessage
|
||||
{
|
||||
yield return WaitForMessagesReceived(new List<Type>
|
||||
WaitForMessagesReceivedWithTimeTravel(new List<Type>
|
||||
{
|
||||
typeof(TFirstMessage),
|
||||
typeof(TSecondMessage)
|
||||
}, m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
}
|
||||
|
||||
private IEnumerator WaitForAllClientsToReceive<TFirstMessage, TSecondMessage, TThirdMessage>()
|
||||
private void WaitForAllClientsToReceive<TFirstMessage, TSecondMessage, TThirdMessage>()
|
||||
where TFirstMessage : INetworkMessage
|
||||
where TSecondMessage : INetworkMessage
|
||||
where TThirdMessage : INetworkMessage
|
||||
{
|
||||
yield return WaitForMessagesReceived(new List<Type>
|
||||
WaitForMessagesReceivedWithTimeTravel(new List<Type>
|
||||
{
|
||||
typeof(TFirstMessage),
|
||||
typeof(TSecondMessage),
|
||||
@@ -377,13 +377,13 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}, m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
}
|
||||
|
||||
private IEnumerator WaitForAllClientsToReceive<TFirstMessage, TSecondMessage, TThirdMessage, TFourthMessage>()
|
||||
private void WaitForAllClientsToReceive<TFirstMessage, TSecondMessage, TThirdMessage, TFourthMessage>()
|
||||
where TFirstMessage : INetworkMessage
|
||||
where TSecondMessage : INetworkMessage
|
||||
where TThirdMessage : INetworkMessage
|
||||
where TFourthMessage : INetworkMessage
|
||||
{
|
||||
yield return WaitForMessagesReceived(new List<Type>
|
||||
WaitForMessagesReceivedWithTimeTravel(new List<Type>
|
||||
{
|
||||
typeof(TFirstMessage),
|
||||
typeof(TSecondMessage),
|
||||
@@ -392,19 +392,19 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}, m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenAnRpcArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
[Test]
|
||||
public void WhenAnRpcArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
{
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
serverObject.GetComponent<DeferredMessageTestRpcComponent>().SendTestClientRpc();
|
||||
|
||||
yield return WaitForAllClientsToReceive<ClientRpcMessage>();
|
||||
WaitForAllClientsToReceive<ClientRpcMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -415,19 +415,19 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenADespawnArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
[Test]
|
||||
public void WhenADespawnArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
{
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().Despawn(false);
|
||||
|
||||
yield return WaitForAllClientsToReceive<DestroyObjectMessage>();
|
||||
WaitForAllClientsToReceive<DestroyObjectMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -438,18 +438,18 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenAChangeOwnershipMessageArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
[Test]
|
||||
public void WhenAChangeOwnershipMessageArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
{
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -459,22 +459,22 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
[Test]
|
||||
public void WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDeferred()
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
|
||||
|
||||
var serverObject = Object.Instantiate(m_NetworkVariablePrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
serverObject.GetComponent<DeferredMessageTestNetworkVariableComponent>().TestNetworkVariable.Value = 1;
|
||||
|
||||
yield return WaitForAllClientsToReceive<NetworkVariableDeltaMessage>();
|
||||
WaitForAllClientsToReceive<NetworkVariableDeltaMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -487,17 +487,17 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
[Test]
|
||||
//[Ignore("Disabling this temporarily until it is migrated into new integration test.")]
|
||||
public IEnumerator WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred()
|
||||
public void WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred()
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
|
||||
yield return WaitForAllClientsToReceive<CreateObjectMessage>();
|
||||
WaitForAllClientsToReceive<CreateObjectMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -514,10 +514,10 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenAnRpcIsDeferred_ItIsProcessedOnSpawn()
|
||||
[Test]
|
||||
public void WhenAnRpcIsDeferred_ItIsProcessedOnSpawn()
|
||||
{
|
||||
yield return WhenAnRpcArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
WhenAnRpcArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
ReleaseSpawns();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -532,10 +532,10 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenADespawnIsDeferred_ItIsProcessedOnSpawn()
|
||||
[Test]
|
||||
public void WhenADespawnIsDeferred_ItIsProcessedOnSpawn()
|
||||
{
|
||||
yield return WhenADespawnArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
WhenADespawnArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
ReleaseSpawns();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -551,10 +551,10 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenAChangeOwnershipMessageIsDeferred_ItIsProcessedOnSpawn()
|
||||
[Test]
|
||||
public void WhenAChangeOwnershipMessageIsDeferred_ItIsProcessedOnSpawn()
|
||||
{
|
||||
yield return WhenAChangeOwnershipMessageArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
WhenAChangeOwnershipMessageArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
ReleaseSpawns();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -568,10 +568,10 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenANetworkVariableDeltaMessageIsDeferred_ItIsProcessedOnSpawn()
|
||||
[Test]
|
||||
public void WhenANetworkVariableDeltaMessageIsDeferred_ItIsProcessedOnSpawn()
|
||||
{
|
||||
yield return WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDeferred();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -592,7 +592,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
return true;
|
||||
}
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsSpawned);
|
||||
WaitForConditionOrTimeOutWithTimeTravel(HaveAllClientsSpawned);
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -605,12 +605,12 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenASpawnMessageIsDeferred_ItIsProcessedOnAddPrefab()
|
||||
[Test]
|
||||
public void WhenASpawnMessageIsDeferred_ItIsProcessedOnAddPrefab()
|
||||
{
|
||||
// This will prevent spawned clients from adding prefabs
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred();
|
||||
WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred();
|
||||
|
||||
// Now add the prefabs
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -630,7 +630,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
return true;
|
||||
}
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsSpawned);
|
||||
WaitForConditionOrTimeOutWithTimeTravel(HaveAllClientsSpawned);
|
||||
|
||||
// Validate this test
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -644,28 +644,26 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
protected override bool LogAllMessages => true;
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnSpawn()
|
||||
[Test]
|
||||
public void WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnSpawn()
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
|
||||
var serverObject = Object.Instantiate(m_RpcAndNetworkVariablePrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
serverObject.GetComponent<DeferredMessageTestRpcAndNetworkVariableComponent>().SendTestClientRpc();
|
||||
serverObject.GetComponent<DeferredMessageTestRpcAndNetworkVariableComponent>().TestNetworkVariable.Value = 1;
|
||||
|
||||
yield return WaitForAllClientsToReceive<ClientRpcMessage, NetworkVariableDeltaMessage>();
|
||||
WaitForAllClientsToReceive<ClientRpcMessage, NetworkVariableDeltaMessage>();
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -694,8 +692,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
return true;
|
||||
}
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsSpawned);
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
WaitForConditionOrTimeOutWithTimeTravel(HaveAllClientsSpawned);
|
||||
TimeTravel(0.1, 1);
|
||||
|
||||
// Validate the spawned objects
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -711,11 +709,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenMultipleAddPrefabTriggeredMessagesAreDeferred_TheyAreAllProcessedOnAddNetworkPrefab()
|
||||
[Test]
|
||||
public void WhenMultipleAddPrefabTriggeredMessagesAreDeferred_TheyAreAllProcessedOnAddNetworkPrefab()
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
@@ -724,7 +722,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
serverObject2.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject2.GetComponent<NetworkObject>().Spawn();
|
||||
|
||||
yield return WaitForAllClientsToReceive<CreateObjectMessage, CreateObjectMessage>();
|
||||
WaitForAllClientsToReceive<CreateObjectMessage, CreateObjectMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -751,7 +749,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
return true;
|
||||
}
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsSpawned);
|
||||
WaitForConditionOrTimeOutWithTimeTravel(HaveAllClientsSpawned);
|
||||
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -789,11 +787,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenSpawnTriggeredMessagesAreDeferredBeforeThePrefabIsAdded_AddingThePrefabCausesThemToBeProcessed()
|
||||
[Test]
|
||||
public void WhenSpawnTriggeredMessagesAreDeferredBeforeThePrefabIsAdded_AddingThePrefabCausesThemToBeProcessed()
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
|
||||
var serverObject = Object.Instantiate(m_RpcAndNetworkVariablePrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
@@ -803,11 +801,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
serverObject.GetComponent<DeferredMessageTestRpcAndNetworkVariableComponent>().TestNetworkVariable.Value = 1;
|
||||
// TODO: Remove this if we figure out how to work around the NetworkVariableDeltaMessage.Serialized issue at line 59
|
||||
// Otherwise, we have to wait for at least 1 tick for the NetworkVariableDeltaMessage to be generated before changing ownership
|
||||
yield return WaitForAllClientsToReceive<CreateObjectMessage, ClientRpcMessage, NetworkVariableDeltaMessage>();
|
||||
WaitForAllClientsToReceive<CreateObjectMessage, ClientRpcMessage, NetworkVariableDeltaMessage>();
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
|
||||
|
||||
// Validate messages are deferred and pending
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -837,9 +835,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
return true;
|
||||
}
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsSpawned);
|
||||
WaitForConditionOrTimeOutWithTimeTravel(HaveAllClientsSpawned);
|
||||
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
TimeTravel(0.1, 1);
|
||||
|
||||
// Validate the test
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -856,11 +854,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenAMessageIsDeferredForMoreThanTheConfiguredTime_ItIsRemoved([Values(1, 2, 3)] int timeout)
|
||||
[Test]
|
||||
public void WhenAMessageIsDeferredForMoreThanTheConfiguredTime_ItIsRemoved([Values(1, 2, 3)] int timeout)
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -869,7 +867,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
var start = 0f;
|
||||
|
||||
@@ -879,7 +877,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
if (start == 0)
|
||||
{
|
||||
start = Time.realtimeSinceStartup;
|
||||
start = client.RealTimeProvider.RealTimeSinceStartup;
|
||||
}
|
||||
};
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -888,7 +886,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
|
||||
foreach (var unused in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -901,8 +899,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
TestDeferredMessageManager.BeforePurgeDelegate beforePurge = (manager, key) =>
|
||||
{
|
||||
++purgeCount;
|
||||
var elapsed = Time.realtimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout - 0.05f);
|
||||
var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
|
||||
Debug.Log(client.RealTimeProvider.GetType().FullName);
|
||||
Assert.GreaterOrEqual(elapsed, timeout);
|
||||
Assert.AreEqual(1, manager.DeferredMessageCountTotal());
|
||||
Assert.AreEqual(1, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
|
||||
Assert.AreEqual(1, manager.DeferredMessageCountForKey(IDeferredMessageManager.TriggerType.OnSpawn, key));
|
||||
@@ -912,8 +911,20 @@ namespace Unity.Netcode.RuntimeTests
|
||||
manager.OnBeforePurge = beforePurge;
|
||||
}
|
||||
|
||||
yield return new WaitForSeconds(timeout + 0.1f);
|
||||
TimeTravel(timeout - 0.01, 1);
|
||||
|
||||
bool HaveAnyClientsPurged()
|
||||
{
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
if (manager.DeferredMessageCountTotal() == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool HaveAllClientsPurged()
|
||||
{
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -927,15 +938,18 @@ namespace Unity.Netcode.RuntimeTests
|
||||
return true;
|
||||
}
|
||||
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsPurged);
|
||||
AssertOnTimeout("Timed out waiting for all clients to purge their deferred messages!");
|
||||
Assert.IsFalse(HaveAnyClientsPurged());
|
||||
|
||||
TimeTravel(0.02, 1);
|
||||
|
||||
Assert.IsTrue(HaveAllClientsPurged());
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenMultipleMessagesForTheSameObjectAreDeferredForMoreThanTheConfiguredTime_TheyAreAllRemoved([Values(1, 2, 3)] int timeout)
|
||||
[Test]
|
||||
public void WhenMultipleMessagesForTheSameObjectAreDeferredForMoreThanTheConfiguredTime_TheyAreAllRemoved([Values(1, 2, 3)] int timeout)
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -945,7 +959,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
var serverObject = Object.Instantiate(m_RpcAndNetworkVariablePrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
var start = 0f;
|
||||
|
||||
@@ -955,7 +969,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
if (start == 0)
|
||||
{
|
||||
start = Time.realtimeSinceStartup;
|
||||
start = client.RealTimeProvider.RealTimeSinceStartup;
|
||||
}
|
||||
};
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -966,7 +980,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
serverObject.GetComponent<DeferredMessageTestRpcAndNetworkVariableComponent>().TestNetworkVariable.Value = 1;
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForMessagesReceived(
|
||||
WaitForMessagesReceivedWithTimeTravel(
|
||||
new List<Type> {typeof(ClientRpcMessage), typeof(NetworkVariableDeltaMessage), typeof(ChangeOwnershipMessage),
|
||||
}, m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
|
||||
@@ -981,8 +995,8 @@ namespace Unity.Netcode.RuntimeTests
|
||||
TestDeferredMessageManager.BeforePurgeDelegate beforePurge = (manager, key) =>
|
||||
{
|
||||
++purgeCount;
|
||||
var elapsed = Time.realtimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout - 0.25f);
|
||||
var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout);
|
||||
Assert.AreEqual(3, manager.DeferredMessageCountTotal());
|
||||
Assert.AreEqual(3, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
|
||||
Assert.AreEqual(3, manager.DeferredMessageCountForKey(IDeferredMessageManager.TriggerType.OnSpawn, key));
|
||||
@@ -992,6 +1006,21 @@ namespace Unity.Netcode.RuntimeTests
|
||||
manager.OnBeforePurge = beforePurge;
|
||||
}
|
||||
|
||||
var timePassedSinceFirstStart = MockTimeProvider.StaticRealTimeSinceStartup - start;
|
||||
TimeTravel(timeout - 0.01 - timePassedSinceFirstStart, 1);
|
||||
|
||||
bool HaveAnyClientsPurged()
|
||||
{
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
if (manager.DeferredMessageCountTotal() == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool HaveAllClientsPurged()
|
||||
{
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -1005,15 +1034,18 @@ namespace Unity.Netcode.RuntimeTests
|
||||
return true;
|
||||
}
|
||||
|
||||
yield return WaitForConditionOrTimeOut(HaveAllClientsPurged);
|
||||
AssertOnTimeout("Timed out waiting for all clients to purge their deferred messages!");
|
||||
Assert.IsFalse(HaveAnyClientsPurged());
|
||||
|
||||
TimeTravel(0.02 + timePassedSinceFirstStart, 1);
|
||||
|
||||
Assert.IsTrue(HaveAllClientsPurged());
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenMultipleMessagesForDifferentObjectsAreDeferredForMoreThanTheConfiguredTime_TheyAreAllRemoved([Values(1, 2, 3)] int timeout)
|
||||
[Test]
|
||||
public void WhenMultipleMessagesForDifferentObjectsAreDeferredForMoreThanTheConfiguredTime_TheyAreAllRemoved([Values(1, 2, 3)] int timeout)
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -1028,7 +1060,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
serverObject2.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject2.GetComponent<NetworkObject>().Spawn();
|
||||
|
||||
yield return WaitForClientsToCatchSpawns(2);
|
||||
WaitForClientsToCatchSpawns(2);
|
||||
|
||||
var start = 0f;
|
||||
|
||||
@@ -1038,7 +1070,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
if (start == 0)
|
||||
{
|
||||
start = Time.realtimeSinceStartup;
|
||||
start = client.RealTimeProvider.RealTimeSinceStartup;
|
||||
}
|
||||
};
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -1053,7 +1085,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
serverObject2.GetComponent<DeferredMessageTestRpcAndNetworkVariableComponent>().TestNetworkVariable.Value = 1;
|
||||
serverObject2.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForMessagesReceived(
|
||||
WaitForMessagesReceivedWithTimeTravel(
|
||||
new List<Type> {typeof(ClientRpcMessage), typeof(NetworkVariableDeltaMessage), typeof(ChangeOwnershipMessage),typeof(ClientRpcMessage), typeof(NetworkVariableDeltaMessage), typeof(ChangeOwnershipMessage),
|
||||
}, m_ClientNetworkManagers.ToList(), ReceiptType.Received);
|
||||
|
||||
@@ -1071,7 +1103,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
TestDeferredMessageManager.BeforePurgeDelegate beforePurge = (manager, key) =>
|
||||
{
|
||||
++purgeCount;
|
||||
var elapsed = Time.realtimeSinceStartup - start;
|
||||
var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout - 0.25f);
|
||||
Assert.AreEqual(remainingMessagesTotalThisClient, manager.DeferredMessageCountTotal());
|
||||
Assert.AreEqual(remainingMessagesTotalThisClient, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
|
||||
@@ -1082,7 +1114,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
manager.OnBeforePurge = beforePurge;
|
||||
}
|
||||
|
||||
yield return new WaitForSeconds(timeout + 0.1f);
|
||||
TimeTravel(timeout + 0.1f, 1);
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
AddPrefabsToClient(client);
|
||||
@@ -1095,11 +1127,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenADeferredMessageIsRemoved_OtherMessagesForSameObjectAreRemoved([Values(1, 2, 3)] int timeout)
|
||||
[Test]
|
||||
public void WhenADeferredMessageIsRemoved_OtherMessagesForSameObjectAreRemoved([Values(1, 2, 3)] int timeout)
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1108,7 +1140,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
var serverObject = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns();
|
||||
WaitForClientsToCatchSpawns();
|
||||
|
||||
var start = 0f;
|
||||
|
||||
@@ -1118,7 +1150,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
if (start == 0)
|
||||
{
|
||||
start = Time.realtimeSinceStartup;
|
||||
start = client.RealTimeProvider.RealTimeSinceStartup;
|
||||
}
|
||||
};
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -1127,9 +1159,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
|
||||
yield return new WaitForSeconds(timeout - 0.5f);
|
||||
TimeTravel(timeout - 0.5f, 1);
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1140,7 +1172,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ServerNetworkManager.LocalClientId);
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1161,7 +1193,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
TestDeferredMessageManager.BeforePurgeDelegate beforePurge = (manager, key) =>
|
||||
{
|
||||
++purgeCount;
|
||||
var elapsed = Time.realtimeSinceStartup - start;
|
||||
var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout - 0.05f);
|
||||
Assert.AreEqual(2, manager.DeferredMessageCountTotal());
|
||||
Assert.AreEqual(2, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
|
||||
@@ -1177,7 +1209,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
AddPrefabsToClient(client);
|
||||
}
|
||||
|
||||
yield return new WaitForSeconds(0.6f);
|
||||
TimeTravel(0.6f, 1);
|
||||
|
||||
Assert.AreEqual(m_NumberOfClientsToLateJoin, purgeCount);
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
@@ -1187,11 +1219,11 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator WhenADeferredMessageIsRemoved_OtherMessagesForDifferentObjectsAreNotRemoved([Values(1, 2, 3)] int timeout)
|
||||
[Test]
|
||||
public void WhenADeferredMessageIsRemoved_OtherMessagesForDifferentObjectsAreNotRemoved([Values(1, 2, 3)] int timeout)
|
||||
{
|
||||
m_SkipAddingPrefabsToClient = true;
|
||||
yield return SpawnClients();
|
||||
SpawnClients();
|
||||
CatchSpawns();
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1203,7 +1235,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
var serverObject2 = Object.Instantiate(m_RpcPrefab);
|
||||
serverObject2.GetComponent<NetworkObject>().NetworkManagerOwner = m_ServerNetworkManager;
|
||||
serverObject2.GetComponent<NetworkObject>().Spawn();
|
||||
yield return WaitForClientsToCatchSpawns(2);
|
||||
WaitForClientsToCatchSpawns(2);
|
||||
|
||||
var start = 0f;
|
||||
|
||||
@@ -1213,7 +1245,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
{
|
||||
if (start == 0)
|
||||
{
|
||||
start = Time.realtimeSinceStartup;
|
||||
start = client.RealTimeProvider.RealTimeSinceStartup;
|
||||
}
|
||||
};
|
||||
var manager = (TestDeferredMessageManager)client.DeferredMessageManager;
|
||||
@@ -1222,9 +1254,9 @@ namespace Unity.Netcode.RuntimeTests
|
||||
|
||||
serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
|
||||
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
|
||||
yield return new WaitForSeconds(timeout - 0.5f);
|
||||
TimeTravel(timeout - 0.5f, 1);
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1236,7 +1268,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
}
|
||||
|
||||
serverObject2.GetComponent<NetworkObject>().ChangeOwnership(m_ServerNetworkManager.LocalClientId);
|
||||
yield return WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
WaitForAllClientsToReceive<ChangeOwnershipMessage>();
|
||||
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
{
|
||||
@@ -1258,7 +1290,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
TestDeferredMessageManager.BeforePurgeDelegate beforePurge = (manager, key) =>
|
||||
{
|
||||
++purgeCount;
|
||||
var elapsed = Time.realtimeSinceStartup - start;
|
||||
var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
|
||||
Assert.GreaterOrEqual(elapsed, timeout - 0.05f);
|
||||
Assert.AreEqual(2, manager.DeferredMessageCountTotal());
|
||||
Assert.AreEqual(2, manager.DeferredMessageCountForType(IDeferredMessageManager.TriggerType.OnSpawn));
|
||||
@@ -1277,7 +1309,7 @@ namespace Unity.Netcode.RuntimeTests
|
||||
AddPrefabsToClient(client);
|
||||
}
|
||||
|
||||
yield return new WaitForSeconds(0.6f);
|
||||
TimeTravel(0.6f, 1);
|
||||
|
||||
Assert.AreEqual(m_NumberOfClientsToLateJoin, purgeCount);
|
||||
foreach (var client in m_ClientNetworkManagers)
|
||||
|
||||
Reference in New Issue
Block a user