Skip to content

Commit aa5cbdb

Browse files
committed
Update all tests that override OnNewClientCreated
1 parent a53be2d commit aa5cbdb

File tree

8 files changed

+4
-38
lines changed

8 files changed

+4
-38
lines changed

com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,6 @@ private bool ValidateTransformsMatch()
235235
return true;
236236
}
237237

238-
protected override void OnNewClientCreated(NetworkManager networkManager)
239-
{
240-
networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
241-
base.OnNewClientCreated(networkManager);
242-
}
243-
244238
private bool SpawnCountsMatch()
245239
{
246240
var passed = true;

com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
9797
{
9898
m_LateJoinClient = networkManager;
9999
networkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
100-
networkManager.NetworkConfig.Prefabs = m_SpawnOwner.NetworkConfig.Prefabs;
101100
base.OnNewClientCreated(networkManager);
102101
}
103102

com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ protected override void OnServerAndClientsCreated()
4545

4646
protected override void OnNewClientCreated(NetworkManager networkManager)
4747
{
48-
networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
4948
if (m_DistributedAuthority)
5049
{
5150
networkManager.OnFetchLocalPlayerPrefabToSpawn = FetchPlayerPrefabToSpawn;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ protected override IEnumerator OnSetup()
9393
return base.OnSetup();
9494
}
9595

96-
protected override void OnNewClientCreated(NetworkManager networkManager)
97-
{
98-
networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
99-
base.OnNewClientCreated(networkManager);
100-
}
101-
10296
/// <summary>
10397
/// This validates that pre spawn can be used to instantiate and assign a NetworkVariable (or other prespawn tasks)
10498
/// which can be useful for assigning a NetworkVariable value on the server side when the NetworkVariable has owner write permissions.

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ protected override IEnumerator OnServerAndClientsConnected()
338338
/// </summary>
339339
protected override void OnNewClientCreated(NetworkManager networkManager)
340340
{
341-
networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
342341
networkManager.NetworkConfig.TickRate = GetTickRate();
343342
if (m_EnableVerboseDebug)
344343
{

testproject/Assets/Tests/Runtime/Animation/NetworkAnimatorTests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -624,18 +624,6 @@ public IEnumerator TriggerUpdateTests()
624624
VerboseDebug($" ------------------ Trigger Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Stopping ------------------ ");
625625
}
626626

627-
protected override void OnNewClientCreated(NetworkManager networkManager)
628-
{
629-
var networkPrefab = new NetworkPrefab() { Prefab = m_AnimationTestPrefab };
630-
networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
631-
networkPrefab = new NetworkPrefab() { Prefab = m_AnimationOwnerTestPrefab };
632-
networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
633-
networkPrefab = new NetworkPrefab() { Prefab = m_AnimationCheerTestPrefab };
634-
networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
635-
networkPrefab = new NetworkPrefab() { Prefab = m_AnimationCheerOwnerTestPrefab };
636-
networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
637-
}
638-
639627
/// <summary>
640628
/// Verifies that triggers are synchronized with currently connected clients
641629
/// </summary>

testproject/Assets/Tests/Runtime/DontDestroyOnLoadTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ protected override void OnServerAndClientsCreated()
2222
base.OnServerAndClientsCreated();
2323
}
2424

25-
protected override void OnNewClientCreated(NetworkManager networkManager)
26-
{
27-
networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
28-
base.OnNewClientCreated(networkManager);
29-
}
30-
3125
private ulong m_SpawnedNetworkObjectId;
3226
private StringBuilder m_ErrorLog = new StringBuilder();
3327

testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,10 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
129129
{
130130
networkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
131131
networkManager.NetworkConfig.Prefabs.NetworkPrefabsLists.Add(PrefabTestConfig.Instance.TestPrefabs);
132-
base.OnNewClientCreated(networkManager);
133132
}
134133

135134
/// <summary>
136-
/// Validates that all spawned NetworkObjects are present and their corresponding
135+
/// Validates that all spawned NetworkObjects are present and their corresponding
137136
/// GlobalObjectIdHash values match
138137
/// </summary>
139138
private bool ValidateAllClientsSpawnedObjects()
@@ -220,7 +219,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
220219
yield return CreateAndStartNewClient();
221220

222221
var spawnManager = m_ServerNetworkManager.SpawnManager;
223-
// If scene management is enabled, then we want to verify against the editor
222+
// If scene management is enabled, then we want to verify against the editor
224223
// assigned in-scene placed NetworkObjects
225224
if (m_SceneManagementEnabled)
226225
{
@@ -287,7 +286,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
287286
[UnityTest]
288287
public IEnumerator TestsInstantiateAndSpawnErrors([Values] InstantiateAndSpawnMethods instantiateAndSpawnType)
289288
{
290-
// If scene management is enabled, then we want to verify against the editor
289+
// If scene management is enabled, then we want to verify against the editor
291290
// assigned in-scene placed NetworkObjects
292291
if (m_SceneManagementEnabled)
293292
{
@@ -328,7 +327,7 @@ public IEnumerator TestsInstantiateAndSpawnErrors([Values] InstantiateAndSpawnMe
328327
m_ServerNetworkManager.Shutdown();
329328
LogAssert.Expect(LogType.Warning, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.InvokedWhenShuttingDown]);
330329
InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType);
331-
// The not listening error can only happen when trying to instantiate and spawn on a Network Prefab
330+
// The not listening error can only happen when trying to instantiate and spawn on a Network Prefab
332331
if (instantiateAndSpawnType == InstantiateAndSpawnMethods.NetworkObject)
333332
{
334333
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NoActiveSession]);

0 commit comments

Comments
 (0)