From 666c78ff594deb615fe4683adf49645b7ac3430f Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Mon, 7 Sep 2020 18:47:37 +0200
Subject: [PATCH] Add tests on new behaviours

---
 AspectedRouting/Tests/FunctionTestSuite.cs | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/AspectedRouting/Tests/FunctionTestSuite.cs b/AspectedRouting/Tests/FunctionTestSuite.cs
index 7c21412..b32b669 100644
--- a/AspectedRouting/Tests/FunctionTestSuite.cs
+++ b/AspectedRouting/Tests/FunctionTestSuite.cs
@@ -49,18 +49,16 @@ namespace AspectedRouting.Tests
             AspectMetadata functionToApply,
             IEnumerable<(string expected, Dictionary<string, string> tags)> tests)
         {
-
             if (functionToApply == null)
             {
                 throw new NullReferenceException("functionToApply is null");
             }
+
             FunctionToApply = functionToApply;
             Tests = tests;
         }
 
 
-     
-
         public bool Run()
         {
             var failed = false;
@@ -77,14 +75,28 @@ namespace AspectedRouting.Tests
                     }
                 }
 
-                var actual = FunctionToApply.Evaluate(context, new Constant(test.tags));
-                if (!actual.ToString().Equals(test.expected) &&
-                    !(actual is double actualD && Math.Abs(double.Parse(test.expected) - actualD) < 0.0001)
-                )
+                try
+                {
+                    var actual = FunctionToApply.Evaluate(context, new Constant(test.tags));
+                    if (test.expected == "null" && actual == null)
+                    {
+                        // Test ok
+                    }
+                    else if (!actual.ToString().Equals(test.expected) &&
+                             !(actual is double actualD && Math.Abs(double.Parse(test.expected) - actualD) < 0.0001)
+                    )
+                    {
+                        failed = true;
+                        Console.WriteLine(
+                            $"[{FunctionToApply.Name}] Line {testCase + 1} failed:\n   Expected: {test.expected}\n   actual: {actual}\n   tags: {test.tags.Pretty()}\n");
+                    }
+                }
+                catch (Exception e)
                 {
-                    failed = true;
                     Console.WriteLine(
-                        $"[{FunctionToApply.Name}] Line {testCase+1} failed:\n   Expected: {test.expected}\n   actual: {actual}\n   tags: {test.tags.Pretty()}\n");
+                        $"[{FunctionToApply.Name}] Line {testCase + 1} ERROR:\n   Expected: {test.expected}\n   error message: {e.Message}\n   tags: {test.tags.Pretty()}\n");
+
+                    failed = true;
                 }
             }