Skip to content

Commit 7fc428b

Browse files
committed
Add Netcode prefix to expected logs tests
1 parent 445069f commit 7fc428b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
284284

285285
if (instantiateAndSpawnType != InstantiateAndSpawnMethods.Manual)
286286
{
287-
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotAuthority]);
287+
LogAssert.Expect(LogType.Error, $"[Netcode] {NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotAuthority]}");
288288
InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType, true);
289289
}
290290
}
@@ -314,28 +314,29 @@ public IEnumerator TestsInstantiateAndSpawnErrors([Values] InstantiateAndSpawnMe
314314
yield return WaitForConditionOrTimeOut(ValidateAllClientsSpawnedObjects);
315315
AssertOnTimeout($"[First Stage] Validating spawned objects faild with the following error: {m_ErrorLog}");
316316

317-
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotRegisteredNetworkPrefab]);
317+
LogAssert.Expect(LogType.Error, $"[Netcode] {NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotRegisteredNetworkPrefab]}");
318318
InstantiateAndSpawn(m_ServerSpawnedObjects[0], instantiateAndSpawnType);
319319

320320
// The Network Prefab is null error can only happen when invoking from NetworkSpawnManager
321321
if (instantiateAndSpawnType == InstantiateAndSpawnMethods.SpawnManager)
322322
{
323-
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NetworkPrefabNull]);
323+
LogAssert.Expect(LogType.Error, $"[Netcode] {NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NetworkPrefabNull]}");
324324
InstantiateAndSpawn(null, instantiateAndSpawnType);
325325
}
326326
else
327327
{
328328
// The NetworkManager is null error can only happen when invoking from Network Prefab
329-
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NetworkManagerNull]);
329+
LogAssert.Expect(LogType.Error, $"[Netcode] {NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NetworkManagerNull]}");
330330
InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType, false, true);
331331
}
332332

333333
m_ServerNetworkManager.Shutdown();
334-
LogAssert.Expect(LogType.Warning, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.InvokedWhenShuttingDown]);
334+
LogAssert.Expect(LogType.Warning, $"[Netcode] {NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.InvokedWhenShuttingDown]}");
335335
InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType);
336336
// The not listening error can only happen when trying to instantiate and spawn on a Network Prefab
337337
if (instantiateAndSpawnType == InstantiateAndSpawnMethods.NetworkObject)
338338
{
339+
//CHECK this is not being hit by tests
339340
LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NoActiveSession]);
340341
yield return WaitForConditionOrTimeOut(() => !m_ServerNetworkManager.IsListening);
341342
InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType);

0 commit comments

Comments
 (0)