Reordered assertion parameter in tests

Due to https://github.com/cschlosser/doxdocgen/issues/218

13 files changed, 3021 insertions, 3138 deletions

diff --git a/src/test/CppTests/Attributes.test.ts b/src/test/CppTests/Attributes.test.ts
index a8316fa..abe60a6 100644
--- a/src/test/CppTests/Attributes.test.ts
+++ b/src/test/CppTests/Attributes.test.ts
@@ -18,50 +18,50 @@ suite("C++ - Attributes Tests", () => {
     // Tests
     test("Attributes on parameter", () => {
         const result = testSetup.SetLine("int foo([[maybe_unused]] int a, [[maybe_unused]]double& b);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */");
     });
 
     test("Attributes on function", () => {
         const result = testSetup.SetLine("[[nodiscard]] int foo(int a, double& b);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */");
     });
 
     test("Multiple attributes on parameter", () => {
         const result = testSetup.SetLine("int foo([[maybe_unused]] [[carries_dependency]]"
             + " int a, double& b);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */");
     });
 
     test("Multiple attributes on function", () => {
         const result = testSetup.SetLine("[[nodiscard]][[deprecated(\"old\")]] int foo(int a, double& b);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return int \n */");
     });
 
     test("Specifier and attribute on class", () => {
         const result = testSetup.SetLine("class [[nodiscard]] alignas(8) Matrix {").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Specifier and attribute on struct", () => {
         const result = testSetup.SetLine("struct [[nodiscard]] alignas(8) Matrix {").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Noexcept on function", () => {
         let result = testSetup.SetLine("constexpr int foo(int a, double& b) noexcept(true);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */");
 
         result = testSetup.SetLine("constexpr int foo(int a, double& b) noexcept;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */");
     });
 
     test("Throw on function", () => {
         const result = testSetup.SetLine("constexpr int foo(int a, double& b) throw(std::except);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return constexpr int \n */");
     });
 
     test("Newline in function", () => {
         const result = testSetup.SetLines(["static void ResetActionState( BOOL sendNAK )", "{"]).GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param sendNAK \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param sendNAK \n */");
     });
 });
diff --git a/src/test/CppTests/Con-AndDestructor.test.ts b/src/test/CppTests/Con-AndDestructor.test.ts
index 44cb5a6..62d16b4 100644
--- a/src/test/CppTests/Con-AndDestructor.test.ts
+++ b/src/test/CppTests/Con-AndDestructor.test.ts
@@ -20,46 +20,46 @@ suite("C++ - Con- and Destructor Tests", () => {
     // Tests
     test("Normal Constructor", () => {
         const result = testSetup.SetLine("Foo(int a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n */");
     });
 
     test("Constructor with initializer list", () => {
         const result = testSetup.SetLine("Foo(int a) : m_a(a) {").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n */");
     });
 
     test("Explicit Constructor", () => {
         const result = testSetup.SetLine("explicit Foo(int a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n */");
     });
 
     test("Deleted Constructor", () => {
         const result = testSetup.SetLine("Foo(int a) = delete;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n */");
     });
 
     test("Default Constructor", () => {
         const result = testSetup.SetLine("Foo() = default;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Destructor", () => {
         const result = testSetup.SetLine("~Foo();").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Virtual Destructor", () => {
         const result = testSetup.SetLine("virtual ~Foo();").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Deleted Destructor", () => {
         const result = testSetup.SetLine("virtual ~Foo() = 0;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Default Destructor", () => {
         const result = testSetup.SetLine("~Foo() = default;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 });
diff --git a/src/test/CppTests/Config.test.ts b/src/test/CppTests/Config.test.ts
index 59a92ef..1afbef3 100644
--- a/src/test/CppTests/Config.test.ts
+++ b/src/test/CppTests/Config.test.ts
@@ -21,23 +21,23 @@ suite("C++ - Configuration Tests", () => {
     test("Default config", () => {
         testSetup.cfg = new Config();
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @tparam T \n * @param a \n * "
-            + "@return true \n * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @tparam T \n * @param a \n * "
+            + "@return true \n * @return false \n */");
     });
 
     test("Comment order", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.order = ["brief", "param", "tparam", "return"];
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * @param a \n * @tparam T \n * "
-            + "@return true \n * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * @param a \n * @tparam T \n * "
+            + "@return true \n * @return false \n */");
     });
 
     test("Non existing order param", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.order = ["breif"];
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n */", result);
+        assert.strictEqual(result, "/**\n */");
     });
 
     test("Modified template", () => {
@@ -52,8 +52,8 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.returnTemplate = "\\return {type} ";
 
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/// \\brief \n/// \n/// \\tparam T \n/// \\param a \n"
-            + "/// \\return true \n/// \\return false ", result);
+        assert.strictEqual(result, "/// \\brief \n/// \n/// \\tparam T \n/// \\param a \n"
+            + "/// \\return true \n/// \\return false ");
 
     });
 
@@ -61,8 +61,8 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.boolReturnsTrueFalse = false;
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @tparam T \n * @param a \n"
-            + " * @return bool \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @tparam T \n * @param a \n"
+            + " * @return bool \n */");
     });
 
     test("Disable including return type on function", () => {
@@ -70,8 +70,8 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.includeTypeAtReturn = false;
 
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @tparam T \n * @param a \n"
-            + " * @return  \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @tparam T \n * @param a \n"
+            + " * @return  \n */");
     });
 
     test("Disable including return type on non-function", () => {
@@ -79,7 +79,7 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.includeTypeAtReturn = false;
 
         const result = testSetup.SetLine("bool b;").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n */");
     });
 
     test("Newlines after params and tparams but not after brief", () => {
@@ -88,32 +88,32 @@ suite("C++ - Configuration Tests", () => {
 
         const result = testSetup.SetLine("template<typename T> bool foo(T a);").GetResult();
         testSetup.cfg.Generic.order = ["brief", "empty", "tparam", "param", "return"]; // reset to default
-        assert.strictEqual("/**\n * @brief \n * @tparam T \n * \n * @param a \n * \n"
-            + " * @return true \n * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * @tparam T \n * \n * @param a \n * \n"
+            + " * @return true \n * @return false \n */");
     });
 
     test("Indentation test", () => {
         testSetup.cfg = new Config();
         let result = testSetup.SetLine("\ttemplate<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n\t * @brief \n\t * \n\t * @tparam T \n\t * @param a \n\t * "
-            + "@return true \n\t * @return false \n\t */", result);
+        assert.strictEqual(result, "/**\n\t * @brief \n\t * \n\t * @tparam T \n\t * @param a \n\t * "
+            + "@return true \n\t * @return false \n\t */");
 
         result = testSetup.SetLine("          template<typename T> bool foo(T a);").GetResult();
-        assert.strictEqual("/**\n           * @brief \n           * \n           * @tparam T "
+        assert.strictEqual(result, "/**\n           * @brief \n           * \n           * @tparam T "
             + "\n           * @param a \n           * "
-            + "@return true \n           * @return false \n           */", result);
+            + "@return true \n           * @return false \n           */");
     });
 
     test("Lines to get test", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.linesToGet = 2;
         const positiveResult = testSetup.SetLines(["template<typename T> bool \n", "foo(T a);"]).GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @tparam T \n * @param a \n * "
-            + "@return true \n * @return false \n */", positiveResult);
+        assert.strictEqual(positiveResult, "/**\n * @brief \n * \n * @tparam T \n * @param a \n * "
+            + "@return true \n * @return false \n */");
         testSetup.cfg.Generic.linesToGet = 0;
         testSetup.firstLine = 1;
         const negativeResult = testSetup.SetLines(["template<typename T> bool \n", "foo(T a);"]).GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n */", negativeResult);
+        assert.strictEqual(negativeResult, "/**\n * @brief \n * \n */");
     });
 
     test("File description order test", () => {
@@ -121,50 +121,50 @@ suite("C++ - Configuration Tests", () => {
         testSetup.firstLine = 0;
         testSetup.cfg.File.fileOrder = ["brief", "author", "date", "file"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @brief \n * @author your name (you@domain.com)\n" +
-            " * @date " + moment().format("YYYY-MM-DD") + "\n * @file MockDocument.h\n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * @author your name (you@domain.com)\n" +
+            " * @date " + moment().format("YYYY-MM-DD") + "\n * @file MockDocument.h\n */");
     });
 
     test("Custom smart text Ctor", () => {
         testSetup.cfg.Cpp.ctorText = "Test {name}";
         const result = testSetup.SetLine("Foo();").GetResult();
-        assert.strictEqual("/**\n * @brief Test Foo\n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test Foo\n * \n */");
     });
 
     test("Custom smart text Dtor", () => {
         testSetup.cfg.Cpp.dtorText = "Test {name}";
         const result = testSetup.SetLine("~Foo();").GetResult();
-        assert.strictEqual("/**\n * @brief Test Foo\n * \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test Foo\n * \n */");
     });
 
     test("Custom smart text getter", () => {
         testSetup.cfg.C.getterText = "Test {name}";
         const result = testSetup.SetLine("int getFoo();").GetResult();
-        assert.strictEqual("/**\n * @brief Test Foo\n * \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test Foo\n * \n * @return int \n */");
     });
 
     test("Custom smart text setter", () => {
         testSetup.cfg.C.setterText = "Test {name}";
         const result = testSetup.SetLine("void setFoo(int foo);").GetResult();
-        assert.strictEqual("/**\n * @brief Test Foo\n * \n * @param foo \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test Foo\n * \n * @param foo \n */");
     });
 
     test("Custom smart text factory method", () => {
         testSetup.cfg.C.factoryMethodText = "Test {name}";
         const result = testSetup.SetLine("int createFoo();").GetResult();
-        assert.strictEqual("/**\n * @brief Test Foo\n * \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test Foo\n * \n * @return int \n */");
     });
 
     test("Don't split casing for smart text", () => {
         testSetup.cfg.C.factoryMethodText = "Test {name}";
         testSetup.cfg.Generic.splitCasingSmartText = false;
         const result = testSetup.SetLine("int createFooObject();").GetResult();
-        assert.strictEqual("/**\n * @brief Test FooObject\n * \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief Test FooObject\n * \n * @return int \n */");
     });
 
     test("Remove inserted '*/' from line", () => {
         const result = testSetup.SetLines(["*/", "int foo();"]).GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @return int \n */");
     });
 
     test("Single alignment", () => {
@@ -175,7 +175,7 @@ suite("C++ - Configuration Tests", () => {
 
         const result = testSetup.SetLines(["template<typename T>", "int foo(std::string bar, T foobar);"]).GetResult();
         // tslint:disable-next-line:max-line-length
-        assert.strictEqual("/**\n * @brief    Brief\n * \n * @tparam   T\n * @param    bar\n * @param    foobar\n * @return   int\n */", result);
+        assert.strictEqual(result, "/**\n * @brief    Brief\n * \n * @tparam   T\n * @param    bar\n * @param    foobar\n * @return   int\n */");
     });
 
     test("Multi alignment", () => {
@@ -186,7 +186,7 @@ suite("C++ - Configuration Tests", () => {
 
         const result = testSetup.SetLines(["template<typename T>", "int foo(std::string bar, T foobar);"]).GetResult();
         // tslint:disable-next-line:max-line-length
-        assert.equal("/**\n * @brief                        Short desc\n * \n * @tparam   T                   I'm a template\n * @param    bar                 Parameters everywhere\n * @param    foobar              Parameters everywhere\n * @return   int                 Returns stuff\n */", result);
+        assert.equal(result, "/**\n * @brief                        Short desc\n * \n * @tparam   T                   I'm a template\n * @param    bar                 Parameters everywhere\n * @param    foobar              Parameters everywhere\n * @return   int                 Returns stuff\n */");
     });
 
     test("Negative alignment tests", () => {
@@ -194,7 +194,7 @@ suite("C++ - Configuration Tests", () => {
 
         const result = testSetup.SetLines(["template<typename T>", "int foo(std::string bar, T foobar);"]).GetResult();
         // tslint:disable-next-line:max-line-length
-        assert.equal("/**\n * @brief                        Short desc\n * \n * @tparam   T                   I'm a template\n * @param    bar                 Parameters everywhere\n * @param    foobar              Parameters everywhere\n */", result);
+        assert.equal(result, "/**\n * @brief                        Short desc\n * \n * @tparam   T                   I'm a template\n * @param    bar                 Parameters everywhere\n * @param    foobar              Parameters everywhere\n */");
     });
 
     test("Multiline template", () => {
@@ -206,7 +206,7 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.returnTemplate = "<returns>\n</returns>";
         const result = testSetup.SetLine("    int foo(bool a);").GetResult();
         // tslint:disable:no-trailing-whitespace
-        assert.strictEqual(
+        assert.strictEqual(result, 
             result, `/// <summary>
     /// 
     /// </summary>
@@ -224,7 +224,7 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.filteredKeywords = ["MOCKABLE"];
         // tslint:disable-next-line:max-line-length
         const result = testSetup.SetLine("MOCKABLE void processNetworkStatusReset( const common_n::NetworkCommands_s *networkstatus );").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param networkstatus \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param networkstatus \n */");
     });
 
     test("Custom tag", () => {
@@ -232,7 +232,7 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.order = ["custom"];
         testSetup.cfg.Generic.customTags = ["@note"];
         const result = testSetup.SetLine("void foo();").GetResult();
-        assert.strictEqual("/**\n * @note\n */", result);
+        assert.strictEqual(result, "/**\n * @note\n */");
     });
 
     test("Custom tag expansion in function", () => {
@@ -246,7 +246,7 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.useGitUserName = true;
         testSetup.cfg.Generic.useGitUserEmail = true;
         const result = testSetup.SetLine("void foo();").GetResult();
-        assert.notStrictEqual("/**\n * @author {author}\n * @date {date}\n * @note {email}\n */", result);
+        assert.notStrictEqual(result, "/**\n * @author {author}\n * @date {date}\n * @note {email}\n */");
     });
 
     test("Env variable", () => {
@@ -266,25 +266,25 @@ suite("C++ - Configuration Tests", () => {
 
         testSetup.cfg.Generic.customTags = ["@author ${env:MY_VARIABLE}"];
         const result = testSetup.SetLine("void foo();").GetResult();
-        assert.strictEqual("/**\n * @author MY_VARIABLE\n */", result);
+        assert.strictEqual(result, "/**\n * @author MY_VARIABLE\n */");
     });
 
     test("Use git user.name as author", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.useGitUserName = true;
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author " +
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author " +
             testSetup.gitConfig.UserName +
-            " (you@domain.com)\n * @date " + moment().format("YYYY-MM-DD") + "\n */", result);
+            " (you@domain.com)\n * @date " + moment().format("YYYY-MM-DD") + "\n */");
     });
 
     test("Use git user.email as email", () => {
         testSetup.cfg = new Config();
         testSetup.cfg.Generic.useGitUserEmail = true;
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (" +
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (" +
             testSetup.gitConfig.UserEmail +
-            ")\n * @date " + moment().format("YYYY-MM-DD") + "\n */", result);
+            ")\n * @date " + moment().format("YYYY-MM-DD") + "\n */");
     });
 
     test("Substitute author and email by git config", () => {
@@ -292,9 +292,9 @@ suite("C++ - Configuration Tests", () => {
         testSetup.cfg.Generic.useGitUserName = true;
         testSetup.cfg.Generic.useGitUserEmail = true;
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author " +
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author " +
             testSetup.gitConfig.UserName + " (" + testSetup.gitConfig.UserEmail +
-            ")\n * @date " + moment().format("YYYY-MM-DD") + "\n */", result);
+            ")\n * @date " + moment().format("YYYY-MM-DD") + "\n */");
     });
 
 });
diff --git a/src/test/CppTests/FileDescription.test.ts b/src/test/CppTests/FileDescription.test.ts
index 4772fb7..2e0bb7e 100644
--- a/src/test/CppTests/FileDescription.test.ts
+++ b/src/test/CppTests/FileDescription.test.ts
@@ -22,20 +22,20 @@ suite("File Description Tests", () => {
     // Tests
     test("#include on next line", () => {
         const result = testSetup.SetLine("#include <iostream>").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
-            " * @date " + date + "\n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
+            " * @date " + date + "\n */");
     });
 
     test("#pragma on next line", () => {
         const result = testSetup.SetLine("#pragma Foo").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
-            " * @date " + date + "\n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
+            " * @date " + date + "\n */");
     });
 
     test("On first line of document", () => {
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
-            " * @date " + date + "\n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
+            " * @date " + date + "\n */");
     });
 
     test("File description in first line", () => {
@@ -47,32 +47,32 @@ suite("File Description Tests", () => {
             "   int i;",
             "};",
             ], false).GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
-            " * @date " + date + "\n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @file MockDocument.h\n * @author your name (you@domain.com)\n" +
+            " * @date " + date + "\n */");
     });
 
     test("Don't generate non existing commands", () => {
         testSetup.cfg.File.fileOrder = ["dates"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n */", result);
+        assert.strictEqual(result, "/**\n */");
     });
 
     test("version block", () => {
         testSetup.cfg.File.fileOrder = ["version"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @version 0.1\n */", result);
+        assert.strictEqual(result, "/**\n * @version 0.1\n */");
     });
 
     test("Copyright block", () => {
         testSetup.cfg.File.fileOrder = ["copyright"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @copyright Copyright (c) " + year + "\n */", result);
+        assert.strictEqual(result, "/**\n * @copyright Copyright (c) " + year + "\n */");
     });
 
     test("version block", () => {
         testSetup.cfg.File.fileOrder = ["version"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * @version 0.1\n */", result);
+        assert.strictEqual(result, "/**\n * @version 0.1\n */");
     });
 
     test("custom block", () => {
@@ -80,7 +80,7 @@ suite("File Description Tests", () => {
         testSetup.cfg.File.customTag = ["First Line", "{year} Year Line", "{date} Date Line",
                                         "{author} Author Line", "{email} Email Line"];
         const result = testSetup.SetLine("").GetResult();
-        assert.strictEqual("/**\n * First Line\n * " + year + " Year Line\n * " + date + " Date Line\n" +
-            " * your name Author Line\n * you@domain.com Email Line\n */", result);
+        assert.strictEqual(result, "/**\n * First Line\n * " + year + " Year Line\n * " + date + " Date Line\n" +
+            " * your name Author Line\n * you@domain.com Email Line\n */");
     });
 });
diff --git a/src/test/CppTests/FunctionPointer.test.ts b/src/test/CppTests/FunctionPointer.test.ts
index 40c924b..3a99031 100644
--- a/src/test/CppTests/FunctionPointer.test.ts
+++ b/src/test/CppTests/FunctionPointer.test.ts
@@ -18,35 +18,35 @@ suite("C++ - Function pointer Tests", () => {
     // Tests
     test("Function pointer return", () => {
         const result = testSetup.SetLine("int (*idputs(int a, int b))(char *);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n * @return int(*)(char*) \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n * @return int(*)(char*) \n */");
     });
 
     test("Nested function pointer return", () => {
         const result = testSetup.SetLine("int (*(*(*foo(int a, int b))(int))(double))(float);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param a \n * @param b \n"
-            + " * @return int(*(*(*)(int))(double))(float) \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param a \n * @param b \n"
+            + " * @return int(*(*(*)(int))(double))(float) \n */");
     });
 
     test("Function pointer parameter", () => {
         const result = testSetup.SetLine("int foo(int (*puts)(const char *));").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param puts \n * @return int \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param puts \n * @return int \n */");
     });
 
     test("Struct function pointer return with struct FP parameters and keywords", () => {
         const result = testSetup.SetLine("const struct foo (*idputs(int (*puts)(const char *), const"
             + " struct test(*str)(int *, const struct test(*str2))))(const char *);").GetResult();
 
-        assert.strictEqual("/**\n * @brief \n * \n * @param puts \n * @param str "
-            + "\n * @return const struct foo(*)(const char*) \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param puts \n * @param str "
+            + "\n * @return const struct foo(*)(const char*) \n */");
     });
 
     test("Memberpointer in function pointer", () => {
         const result = testSetup.SetLine("void foo(void (SomeClass::* func)());").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param func \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param func \n */");
     });
 
     test("Arraypointer", () => {
         const result = testSetup.SetLine("void some_function(int (*table)[]);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param table \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param table \n */");
     });
 });
diff --git a/src/test/CppTests/Operators.test.ts b/src/test/CppTests/Operators.test.ts
index b57d55c..10b48da 100644
--- a/src/test/CppTests/Operators.test.ts
+++ b/src/test/CppTests/Operators.test.ts
@@ -18,283 +18,283 @@ suite("C++ - Operators Tests", () => {
     // Tests
     test("+ operator", () => {
         const result = testSetup.SetLine("T operator +(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("- operator", () => {
         const result = testSetup.SetLine("T operator- (const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("* operator with params", () => {
         const result = testSetup.SetLine("T operator*(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("/ operator", () => {
         const result = testSetup.SetLine("T operator/(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("% operator", () => {
         const result = testSetup.SetLine("T operator%(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("^ operator", () => {
         const result = testSetup.SetLine("T operator^(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("& operator with params", () => {
         const result = testSetup.SetLine("T operator&(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("| operator", () => {
         const result = testSetup.SetLine("T operator|(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("~ operator", () => {
         const result = testSetup.SetLine("T operator~(const T& t);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param t \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param t \n * @return T \n */");
     });
 
     test("<< operator", () => {
         const result = testSetup.SetLine("T operator<<(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test(">> operator", () => {
         const result = testSetup.SetLine("T operator>>(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return T \n */");
     });
 
     test("! operator", () => {
         const result = testSetup.SetLine("bool operator!(const T& t);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param t \n * @return true \n * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param t \n * @return true \n * @return false \n */");
     });
 
     test("&& operator", () => {
         const result = testSetup.SetLine("bool operator&&(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
-            + " * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
+            + " * @return false \n */");
     });
 
     test("|| operator", () => {
         const result = testSetup.SetLine("bool operator||(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
-            + " * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
+            + " * @return false \n */");
     });
 
     test("!= operator", () => {
         const result = testSetup.SetLine("bool operator!=(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
-            + " * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
+            + " * @return false \n */");
     });
 
     test("== operator", () => {
         const result = testSetup.SetLine("bool operator==(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
-            + " * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
+            + " * @return false \n */");
     });
 
     test("<= operator", () => {
         const result = testSetup.SetLine("bool operator<=(const T& lhs, const T2& rhs);").GetResult();
-        assert.strictEqual("/**\n * @brief \n * \n * @param lhs \n * @param rhs \n * @return true \n"
-            + " * @return false \n */", result);
+        assert.strictEqual(result, "/**\n * @brief \n * \n * @param lh