Merge pull request #29 from KacperKenjiLesniak/issue-28

#28 Added try-catch clause

Author: Edvinas01

Assets/Runtime/GameEvents/Game/GameEvent.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using GameEvents.Generic;
 using UnityEngine;
@@ -39,7 +40,15 @@ public void RaiseGameEvent()
                     Debug.Log($"Raise event: {name}, listener: {listener}");
                 }
 
-                listener.RaiseGameEvent();
+                try
+                {
+                    listener.RaiseGameEvent();
+                }
+                catch (Exception e)
+                {
+                    Debug.Log($"Listener: {listener} of event: {name} has thrown an exception.");
+                    Debug.LogException(e, this);
+                }
             }
         }
 

Assets/Runtime/GameEvents/Generic/ArgumentGameEvent.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using UnityEngine;
 
@@ -38,7 +39,15 @@ public void RaiseGameEvent(TArgument argument)
                     Debug.Log($"Raise event: {name}, listener: {listener}, argument: {argument}");
                 }
 
-                listener.RaiseGameEvent(argument);
+                try
+                {
+                    listener.RaiseGameEvent(argument);
+                }
+                catch (Exception e)
+                {
+                    Debug.Log($"Listener: {listener} of event: {name} has thrown an exception.");
+                    Debug.LogException(e, this);
+                }
             }
         }
 

Assets/Tests/Runtime/GameEvents/GameEventTest.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using GameEvents.Bool;
 using GameEvents.Float;
 using GameEvents.Game;
@@ -117,6 +118,40 @@ public void ShouldRaiseGameEventEvent()
             Assert.AreEqual(0, count[0]);
         }
 
+
+        [Test]
+        public void ShouldNotBreakChainWhenExceptionIsThrown()
+        {
+            // Given.
+            var gameObject = new UnityEngine.GameObject();
+            gameObject.SetActive(false);
+
+            var listenerWithError = gameObject.AddComponent<GameEventListener>();
+            var listener = gameObject.AddComponent<GameEventListener>();
+
+            listenerWithError.OnGameEvent = new UnityEvent();
+            listenerWithError.GameEvent = ScriptableObject.CreateInstance<GameEvent>();
+
+            listener.OnGameEvent = new UnityEvent();
+            listener.GameEvent = listenerWithError.GameEvent;
+
+            var count = new int[1];
+            listenerWithError.OnGameEvent.AddListener(() => throw new NullReferenceException());
+            listener.OnGameEvent.AddListener(() => count[0]++);
+
+            // Then.
+            gameObject.SetActive(true);
+            listener.GameEvent.RaiseGameEvent();
+
+            Assert.AreEqual(1, count[0]);
+            count[0] = 0;
+
+            gameObject.SetActive(false);
+            listener.GameEvent.RaiseGameEvent();
+
+            Assert.AreEqual(0, count[0]);
+        }
+
         [Test]
         public void ShouldRegisterAndUnregisterGameObjectGameEventListener()
         {