test: fixing tests for PR(#1171)

MirageNet · Feb 16, 2024 · 8a72ac3 · 8a72ac3
1 parent 7a8ff46
commit 8a72ac3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Assets/Mirage/Runtime/ClientObjectManager.cs b/Assets/Mirage/Runtime/ClientObjectManager.cs
@@ -301,9 +301,11 @@ public void UnregisterPrefab(NetworkIdentity identity)
         /// <param name="unspawnHandler">A method to use as a custom un-spawnhandler on clients.</param>
         public void RegisterSpawnHandler(NetworkIdentity identity, SpawnHandlerDelegate spawnHandler, UnSpawnDelegate unspawnHandler)
         {
+            // check identity has a hash before Validate so that there is good error meessage
+            ThrowIfZeroHash(identity);
             var prefabHash = identity.PrefabHash;
             ValidateRegisterSpawnHandler(prefabHash, spawnHandler, unspawnHandler);
-            
+
             _handlers[prefabHash] = new SpawnHandler(identity, spawnHandler, unspawnHandler);
         }
 
@@ -323,9 +325,11 @@ public void RegisterSpawnHandler(int prefabHash, SpawnHandlerDelegate spawnHandl
 
         public void RegisterSpawnHandler(NetworkIdentity identity, SpawnHandlerAsyncDelegate spawnHandler, UnSpawnDelegate unspawnHandler)
         {
+            // check identity has a hash before Validate so that there is good error meessage
+            ThrowIfZeroHash(identity);
             var prefabHash = identity.PrefabHash;
             ValidateRegisterSpawnHandler(prefabHash, spawnHandler, unspawnHandler);
-            
+
             _handlers[prefabHash] = new SpawnHandler(identity, spawnHandler, unspawnHandler);
         }
 

diff --git a/Assets/Tests/Runtime/ClientServer/ClientObjectManagerTest.cs b/Assets/Tests/Runtime/ClientServer/ClientObjectManagerTest.cs
@@ -66,7 +66,7 @@ public void RegisterPrefabDelegate()
 
             Assert.IsTrue(clientObjectManager._handlers.ContainsKey(identity.PrefabHash));
             var handlers = clientObjectManager._handlers[identity.PrefabHash];
-            Assert.That(handlers.Prefab == null, "should not have added prefab with handlers");
+            Assert.That(handlers.Prefab == identity, "prefab should also be added to handler if it is passed to regiester so that user can use it if they want to");
             Assert.That(handlers.Handler == TestSpawnDelegate);
             Assert.That(handlers.UnspawnHandler == TestUnspawnDelegate);
         }
@@ -81,7 +81,7 @@ public void IsAllowedToGiveNullUnspawn()
 
             Assert.IsTrue(clientObjectManager._handlers.ContainsKey(identity.PrefabHash));
             var handlers = clientObjectManager._handlers[identity.PrefabHash];
-            Assert.That(handlers.Prefab == null, "should not have added prefab with handlers");
+            Assert.That(handlers.Prefab == identity, "prefab should also be added to handler if it is passed to regiester so that user can use it if they want to");
             Assert.That(handlers.Handler == TestSpawnDelegate);
             Assert.That(handlers.UnspawnHandler == null);
         }

diff --git a/Assets/Tests/Runtime/Host/ClientObjectManagerHostTest.cs b/Assets/Tests/Runtime/Host/ClientObjectManagerHostTest.cs
@@ -50,7 +50,7 @@ public void RegisterPrefabDelegateTest()
 
             Assert.IsTrue(clientObjectManager._handlers.ContainsKey(identity.PrefabHash));
             var handler = clientObjectManager._handlers[identity.PrefabHash];
-            Assert.That(handler.Prefab == null);
+            Assert.That(handler.Prefab == identity);
             Assert.That(handler.Handler == TestSpawnDelegate);
             Assert.That(handler.UnspawnHandler == TestUnspawnDelegate);
         }