1
1
using System . Collections ;
2
2
using System . Collections . Generic ;
3
3
using System . Linq ;
4
+ using MLAPI . Configuration ;
4
5
using MLAPI . Metrics ;
5
6
using NUnit . Framework ;
6
7
using Unity . Multiplayer . NetworkProfiler ;
@@ -20,7 +21,7 @@ public class NetworkObjectMetricsTests
20
21
private NetworkObject m_NewNetworkObject ;
21
22
private const string m_NewNetworkObjectName = "TestNetworkObjectToSpawn" ;
22
23
23
- [ UnitySetUp ]
24
+ [ UnitySetUp ]
24
25
public IEnumerator SetUp ( )
25
26
{
26
27
if ( ! MultiInstanceHelpers . Create ( 1 , out m_Server , out var clients ) )
@@ -36,9 +37,17 @@ public IEnumerator SetUp()
36
37
37
38
m_Server . NetworkConfig . PlayerPrefab = playerPrefab ;
38
39
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
+
39
47
foreach ( var client in clients )
40
48
{
41
49
client . NetworkConfig . PlayerPrefab = playerPrefab ;
50
+ client . NetworkConfig . NetworkPrefabs . Add ( networkPrefab ) ;
42
51
}
43
52
44
53
if ( ! MultiInstanceHelpers . Start ( true , m_Server , clients ) )
@@ -47,16 +56,14 @@ public IEnumerator SetUp()
47
56
Assert . Fail ( "Failed to start instances" ) ;
48
57
}
49
58
59
+ m_Client = clients . First ( ) ;
60
+
50
61
yield return MultiInstanceHelpers . Run ( MultiInstanceHelpers . WaitForClientsConnected ( clients ) ) ;
51
62
yield return MultiInstanceHelpers . Run ( MultiInstanceHelpers . WaitForClientConnectedToServer ( m_Server ) ) ;
52
63
53
- m_Client = clients . First ( ) ;
54
64
m_ClientMetrics = m_Client . NetworkMetrics as NetworkMetrics ;
55
65
m_ServerMetrics = m_Server . NetworkMetrics as NetworkMetrics ;
56
66
57
- var gameObject = new GameObject ( m_NewNetworkObjectName ) ;
58
- m_NewNetworkObject = gameObject . AddComponent < NetworkObject > ( ) ;
59
- m_NewNetworkObject . NetworkManagerOwner = m_Server ;
60
67
}
61
68
62
69
[ UnityTearDown ]
@@ -99,8 +106,7 @@ public IEnumerator TrackNetworkObjectSpawnReceivedMetric()
99
106
var objectSpawned = objectSpawnedReceivedMetricValues . First ( ) ;
100
107
Assert . AreEqual ( m_Server . LocalClientId , objectSpawned . Connection . Id ) ;
101
108
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 ) ;
104
110
}
105
111
106
112
[ UnityTest ]
@@ -142,8 +148,7 @@ public IEnumerator TrackNetworkObjectDestroyReceivedMetric()
142
148
var objectDestroyed = objectDestroyedReceivedMetricValues . First ( ) ;
143
149
Assert . AreEqual ( m_Server . LocalClientId , objectDestroyed . Connection . Id ) ;
144
150
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 ) ;
147
152
}
148
153
149
154
[ UnityTest ]
0 commit comments