Merge pull request #2 from FlaxCommunityProjects/dev

Improved Exception Logging

Author: stefnotch

Source/Editor/Assert.cs

@@ -21,15 +21,34 @@ public SuccessException(string message, Exception innerException) : base(message
         }
     }
 
+    /// <summary>
+    /// Exception thrown when an assertion fails
+    /// </summary>
+    /// <seealso cref="System.Exception" />
+    public class AssertException : Exception
+    {
+        public AssertException()
+        {
+        }
+
+        public AssertException(string message) : base(message)
+        {
+        }
+
+        public AssertException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
     public static class Assert
     {
         public static void Pass() => throw new SuccessException();
-        public static void Fail() => throw new Exception();
+        public static void Fail() => throw new AssertException("Fail");
 
-        public static void AreEqual(object a, object b) { if (!Equals(a, b)) throw new Exception(); }
-        public static void AreNotEqual(object a, object b) { if (Equals(a, b)) throw new Exception(); }
+        public static void AreEqual(object a, object b) { if (!Equals(a, b)) throw new AssertException($"{a} does not equal {b}"); }
+        public static void AreNotEqual(object a, object b) { if (Equals(a, b)) throw new Exception($"{a} is equal to {b}"); }
 
-        public static void True(bool a) { if (!a) throw new Exception(); }
-        public static void False(bool a) { if (a) throw new Exception(); }
+        public static void True(bool a) { if (!a) throw new Exception($"{a} is not true"); }
+        public static void False(bool a) { if (a) throw new Exception($"{a} is not false"); }
     }
 }

Source/Editor/TestRunner.cs

@@ -27,7 +27,7 @@ public class TestRunner : EditorPlugin
             Version = new Version(1, 1),
             RepositoryUrl = "https://github.com/FlaxCommunityProjects/FlaxUnitTesting"
         };
-        
+
         public override void InitializeEditor()
         {
             base.InitializeEditor();
@@ -94,16 +94,23 @@ public static void RunTests()
                         catch (TargetInvocationException e)
                         {
                             if (!(e.InnerException is SuccessException))
+                            {
                                 failed = true;
-                        }
-                        catch (Exception e)
-                        {
-                            failed = true;
+                                Debug.LogException(e.InnerException);
+                            }
                         }
                         finally
                         {
                             afterEach?.Invoke(instance, null);
-                            Debug.Log($"Test '{suite.Name} {testMethod.Name}' finished with " + (failed ? "Error" : "Success"));
+                            string message = $"Test '{suite.Name} {testMethod.Name}' finished with " + (failed ? "Error" : "Success");
+                            if (failed)
+                            {
+                                Debug.LogError(message);
+                            }
+                            else
+                            {
+                                Debug.Log(message);
+                            }
                         }
                     }
                     else
@@ -123,11 +130,9 @@ public static void RunTests()
                             catch (TargetInvocationException e)
                             {
                                 if (!(e.InnerException is SuccessException))
+                                {
                                     failed = true;
-                            }
-                            catch (Exception e)
-                            {
-                                failed = true;
+                                }
                             }
                             finally
                             {
@@ -138,7 +143,16 @@ public static void RunTests()
                             }
                         }
 
-                        Debug.Log($"Test '{suite.Name} {testMethod.Name}' finished with {successCount}/{testCases.Count()} successfull test cases.");
+                        int testCount = testCases.Count();
+                        string message = $"Test '{suite.Name} {testMethod.Name}' finished with {successCount}/{testCount} successfull test cases.";
+                        if (successCount < testCount)
+                        {
+                            Debug.LogError(message);
+                        }
+                        else
+                        {
+                            Debug.Log(message);
+                        }
                     }
                 }