Bugfixes

Author: stefnotch

Source/Assert.cs

@@ -6,7 +6,20 @@ namespace FlaxCommunity.UnitTesting
     /// Special type of exception that is used to terminate the test case early <seealso cref="Assert.Pass"/>
     /// </summary>
     /// <seealso cref="System.Exception" />
-    public class SuccessException : Exception { }
+    public class SuccessException : Exception
+    {
+        public SuccessException()
+        {
+        }
+
+        public SuccessException(string message) : base(message)
+        {
+        }
+
+        public SuccessException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
 
     public static class Assert
     {

Source/Editor/TestRunner.cs

@@ -1,4 +1,4 @@
-using FlaxEditor;
+using FlaxEditor;
 using FlaxEditor.GUI;
 using FlaxEngine;
 using System;
@@ -36,6 +36,13 @@ public override void InitializeEditor()
 
             _mmBtn = Editor.UI.MainMenu.AddButton("Unit Tests");
             _mmBtn.ContextMenu.AddButton("Run unit tests").Clicked += RunTests;
+            FlaxEditor.Scripting.ScriptsBuilder.ScriptsReloadBegin += ScriptsBuilder_ScriptsReloadBegin;
+        }
+
+        private void ScriptsBuilder_ScriptsReloadBegin()
+        {
+            // Clear type information as per warning https://docs.flaxengine.com/manual/scripting/plugins/index.html
+            _suites.Clear();
         }
 
         public override void Deinitialize()
@@ -86,11 +93,15 @@ public static void RunTests()
                         {
                             testMethod?.Invoke(instance, null);
                         }
-                        catch (Exception e)
+                        catch (TargetInvocationException e)
                         {
-                            if (e.GetType() != typeof(SuccessException))
+                            if (!(e.InnerException is SuccessException))
                                 failed = true;
                         }
+                        catch (Exception e)
+                        {
+                            failed = true;
+                        }
                         finally
                         {
                             afterEach?.Invoke(instance, null);
@@ -111,11 +122,15 @@ public static void RunTests()
                                 if (testCase.ExpectedResult != null)
                                     failed = !testCase.ExpectedResult.Equals(result);
                             }
-                            catch (Exception e)
+                            catch (TargetInvocationException e)
                             {
-                                if (e.GetType() != typeof(SuccessException))
+                                if (!(e.InnerException is SuccessException))
                                     failed = true;
                             }
+                            catch (Exception e)
+                            {
+                                failed = true;
+                            }
                             finally
                             {
                                 afterEach?.Invoke(instance, null);