Skip to content

Fix: FIx network object spawn/destroy metric tests #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Fix: FIx network object spawn/destroy metric tests #962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions ...unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkObjects/NetworkObjectMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using MLAPI.Configuration;
using MLAPI.Metrics;
using NUnit.Framework;
using Unity.Multiplayer.NetworkProfiler;
Expand All @@ -20,7 +21,7 @@ public class NetworkObjectMetricsTests
private NetworkObject m_NewNetworkObject;
private const string m_NewNetworkObjectName = "TestNetworkObjectToSpawn";

[UnitySetUp]
[UnitySetUp]
public IEnumerator SetUp()
{
if (!MultiInstanceHelpers.Create(1, out m_Server, out var clients))
Expand All @@ -36,9 +37,17 @@ public IEnumerator SetUp()

m_Server.NetworkConfig.PlayerPrefab = playerPrefab;

var gameObject = new GameObject(m_NewNetworkObjectName);
m_NewNetworkObject = gameObject.AddComponent<NetworkObject>();
m_NewNetworkObject.NetworkManagerOwner = m_Server;
MultiInstanceHelpers.MakeNetworkedObjectTestPrefab(m_NewNetworkObject);
var networkPrefab = new NetworkPrefab {Prefab = gameObject};
m_Server.NetworkConfig.NetworkPrefabs.Add(networkPrefab);

foreach (var client in clients)
{
client.NetworkConfig.PlayerPrefab = playerPrefab;
client.NetworkConfig.NetworkPrefabs.Add(networkPrefab);
}

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

m_Client = clients.First();

yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnected(clients));
yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientConnectedToServer(m_Server));

m_Client = clients.First();
m_ClientMetrics = m_Client.NetworkMetrics as NetworkMetrics;
m_ServerMetrics = m_Server.NetworkMetrics as NetworkMetrics;

var gameObject = new GameObject(m_NewNetworkObjectName);
m_NewNetworkObject = gameObject.AddComponent<NetworkObject>();
m_NewNetworkObject.NetworkManagerOwner = m_Server;
}

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

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

[UnityTest]
Expand Down