Skip to content

Commit c11bb95

Browse files
author
Josie Messa
authored
Fix tests to use properly registered network prefabs (#962)
1 parent 8b56bd6 commit c11bb95

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkObjects/NetworkObjectMetricsTests.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using MLAPI.Configuration;
45
using MLAPI.Metrics;
56
using NUnit.Framework;
67
using Unity.Multiplayer.NetworkProfiler;
@@ -20,7 +21,7 @@ public class NetworkObjectMetricsTests
2021
private NetworkObject m_NewNetworkObject;
2122
private const string m_NewNetworkObjectName = "TestNetworkObjectToSpawn";
2223

23-
[UnitySetUp]
24+
[UnitySetUp]
2425
public IEnumerator SetUp()
2526
{
2627
if (!MultiInstanceHelpers.Create(1, out m_Server, out var clients))
@@ -36,9 +37,17 @@ public IEnumerator SetUp()
3637

3738
m_Server.NetworkConfig.PlayerPrefab = playerPrefab;
3839

40+
var gameObject = new GameObject(m_NewNetworkObjectName);
41+
m_NewNetworkObject = gameObject.AddComponent<NetworkObject>();
42+
m_NewNetworkObject.NetworkManagerOwner = m_Server;
43+
MultiInstanceHelpers.MakeNetworkedObjectTestPrefab(m_NewNetworkObject);
44+
var networkPrefab = new NetworkPrefab {Prefab = gameObject};
45+
m_Server.NetworkConfig.NetworkPrefabs.Add(networkPrefab);
46+
3947
foreach (var client in clients)
4048
{
4149
client.NetworkConfig.PlayerPrefab = playerPrefab;
50+
client.NetworkConfig.NetworkPrefabs.Add(networkPrefab);
4251
}
4352

4453
if (!MultiInstanceHelpers.Start(true, m_Server, clients))
@@ -47,16 +56,14 @@ public IEnumerator SetUp()
4756
Assert.Fail("Failed to start instances");
4857
}
4958

59+
m_Client = clients.First();
60+
5061
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnected(clients));
5162
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientConnectedToServer(m_Server));
5263

53-
m_Client = clients.First();
5464
m_ClientMetrics = m_Client.NetworkMetrics as NetworkMetrics;
5565
m_ServerMetrics = m_Server.NetworkMetrics as NetworkMetrics;
5666

57-
var gameObject = new GameObject(m_NewNetworkObjectName);
58-
m_NewNetworkObject = gameObject.AddComponent<NetworkObject>();
59-
m_NewNetworkObject.NetworkManagerOwner = m_Server;
6067
}
6168

6269
[UnityTearDown]
@@ -99,8 +106,7 @@ public IEnumerator TrackNetworkObjectSpawnReceivedMetric()
99106
var objectSpawned = objectSpawnedReceivedMetricValues.First();
100107
Assert.AreEqual(m_Server.LocalClientId, objectSpawned.Connection.Id);
101108
Assert.AreEqual(m_NewNetworkObject.NetworkObjectId, objectSpawned.NetworkId.NetworkId);
102-
// Bug: this should not be the name of the network object
103-
// Assert.AreEqual("Player(Clone)", objectSpawned.NetworkId.Name); // What?
109+
Assert.AreEqual($"{m_NewNetworkObjectName}(Clone)", objectSpawned.NetworkId.Name);
104110
}
105111

106112
[UnityTest]
@@ -142,8 +148,7 @@ public IEnumerator TrackNetworkObjectDestroyReceivedMetric()
142148
var objectDestroyed = objectDestroyedReceivedMetricValues.First();
143149
Assert.AreEqual(m_Server.LocalClientId, objectDestroyed.Connection.Id);
144150
Assert.AreEqual(m_NewNetworkObject.NetworkObjectId, objectDestroyed.NetworkId.NetworkId);
145-
// Bug: Currently the object name is always "Player Clone"
146-
// Assert.AreEqual(m_NewNetworkObjectName, objectDestroyed.NetworkId.Name);
151+
Assert.AreEqual($"{m_NewNetworkObjectName}(Clone)", objectDestroyed.NetworkId.Name);
147152
}
148153

149154
[UnityTest]

0 commit comments

Comments
 (0)