Fix tests

Author: EmandM

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -907,10 +907,7 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
             // If not, then there is an issue (user possibly didn't register the prefab properly?)
             if (networkPrefabReference == null)
             {
-                if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
-                {
-                    NetworkLog.LogErrorServer($"[{nameof(globalObjectIdHash)}={globalObjectIdHash}] Failed to create object locally. {nameof(NetworkPrefab)} could not be found. Is the prefab registered with {NetworkManager.name}?");
-                }
+                NetworkManager.Log.ErrorServer(new Context(LogLevel.Error, $"Failed to create object locally. {nameof(NetworkPrefab)} could not be found. Is the prefab registered with this {nameof(NetworkManager)}").AddInfo(nameof(NetworkObject.GlobalObjectIdHash), globalObjectIdHash).AddTag(NetworkManager.name));
                 return null;
             }
 
@@ -1196,7 +1193,7 @@ internal bool NonAuthorityLocalSpawn(in NetworkObject.SerializedObject serialize
             // Log the error that the NetworkObject failed to construct
             if (networkObject == null)
             {
-                NetworkManager.Log.ErrorServer(new Context(LogLevel.Normal, $"Failed to spawn {nameof(NetworkObject)}").AddInfo(nameof(NetworkObject.GlobalObjectIdHash), serializedObject.Hash));
+                NetworkManager.Log.ErrorServer(new Context(LogLevel.Normal, $"Failed to spawn {nameof(NetworkObject)}!").AddInfo(nameof(NetworkObject.GlobalObjectIdHash), serializedObject.Hash));
                 return false;
             }
 

com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerSynchronizationTests.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Text.RegularExpressions;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
@@ -42,7 +43,11 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
 
             // Check the invalid object spawns on the authority, expect an error from non-authority.
             LogAssert.Expect(LogType.Exception, "Exception: exception while instantiating");
-            LogAssert.Expect(LogType.Error, $"[Netcode] [GlobalObjectIdHash={exceptionObject.GlobalObjectIdHash}] Failed to spawn NetworkObject!");
+            LogAssert.Expect(LogType.Error, new Regex("Failed to spawn NetworkObject!"));
+            // Authority should receive an error from non-authority and should use the globalObjectIdHash to find the failing object
+            LogAssert.Expect(LogType.Error, new Regex($@"SenderId:{nonAuthority.LocalClientId}\]\[{Regex.Escape(exceptionObject.name)}"));
+            // LogAssert.Expect(LogType.Error, new Regex(Regex.Escape(exceptionObject.name)));
+            // LogAssert.Expect(LogType.Error, "[Netcode] [Received log from client][SenderId:1][ClientSideExceptionPrefab{3}-OnServer{0}][NetworkObjectId:3] [NonAuthorityLocalSpawn][GlobalObjectIdHash:111115] Failed to spawn NetworkObject!");
             yield return WaitForConditionOrTimeOut(() => exceptionObject.IsSpawned);
             AssertOnTimeout("Failed to spawn object on authority!");
 
@@ -58,9 +63,13 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
             newClient.PrefabHandler.AddHandler(m_ClientSideExceptionPrefab, new NetworkPrefabExceptionThrower());
             newClient.PrefabHandler.AddHandler(m_ValidPrefab, new NetworkPrefabInstanceHandler(networkObjectToSpawnOnClient));
 
-            // Expect assertions fromt the new client
+            // Expect assertions from the new client
             LogAssert.Expect(LogType.Exception, "Exception: exception while instantiating");
-            LogAssert.Expect(LogType.Error, $"[Netcode] [GlobalObjectIdHash={exceptionObject.GlobalObjectIdHash}] Failed to spawn NetworkObject!");
+            LogAssert.Expect(LogType.Error, new Regex("Failed to spawn NetworkObject!"));
+
+            // Authority will receive an error from new client and should use the globalObjectIdHash to find the failing object
+            var expectedNewClientId = nonAuthority.LocalClientId + 1;
+            LogAssert.Expect(LogType.Error, new Regex($@"SenderId:{expectedNewClientId}\]\[{Regex.Escape(exceptionObject.name)}"));
 
             // Start and synchronize the new client
             yield return StartClient(newClient);

testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using TestProject.ManualTests;
@@ -213,9 +212,6 @@ public enum InstantiateAndSpawnMethods
         [UnityTest]
         public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods instantiateAndSpawnType)
         {
-            var gloabalObjectId = m_SceneManagementEnabled ? 0 : InScenePlacedHelper.ServerInSceneDefined.First().GlobalObjectIdHash;
-            var firstError = $"[Netcode] Failed to create object locally. [globalObjectIdHash={gloabalObjectId}]. NetworkPrefab could not be found. Is the prefab registered with NetworkManager?";
-            var secondError = $"[Netcode] Failed to spawn NetworkObject for Hash {gloabalObjectId}.";
             m_InstantiateAndSpawnType = instantiateAndSpawnType;
 
             // We have to spawn the first client manually in order to account for the errors when scene management is disabled.
@@ -224,7 +220,6 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
             // spawn the original prefab and when spawning dynamically the override is used.
             yield return CreateAndStartNewClient();
 
-            var spawnManager = m_ServerNetworkManager.SpawnManager;
             // If scene management is enabled, then we want to verify against the editor
             // assigned in-scene placed NetworkObjects
             if (m_SceneManagementEnabled)