revert error logger tests

Author: Nettozx

test/testerrorlogger.cpp

@@ -315,7 +315,7 @@ class TestErrorLogger : public TestFixture {
     }
 
     #define testReportType(reportType, severity, errorId, expectedClassification, expectedGuideline) \
-    testReportType_(__FILE__, __LINE__, reportType, severity, errorId, expectedClassification, expectedGuideline)
+        testReportType_(__FILE__, __LINE__, reportType, severity, errorId, expectedClassification, expectedGuideline)
     void testReportType_(const char *file, int line, ReportType reportType, Severity severity, const std::string &errorId,
                          const std::string &expectedClassification, const std::string &expectedGuideline) const
     {
@@ -508,7 +508,6 @@ class TestErrorLogger : public TestFixture {
                       "17 Programming error"
                       "17 Programming error"
                       "0 "
-                      "17 Programming error"
                       "0 ", msg_str);
 
         ErrorMessage msg2;
@@ -551,11 +550,9 @@ class TestErrorLogger : public TestFixture {
                                "1 0"
                                "0 "
                                "8 test.cpp"
-                               "1 0"
                                "17 Programming error"
                                "17 Programming error"
                                "0 "
-                               "17 Programming error"
                                "0 ";
             ErrorMessage msg;
             ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - not an integer");
@@ -566,13 +563,12 @@ class TestErrorLogger : public TestFixture {
                                "5 error"
                                "1 0"
                                "7 invalid" // hash
+                               "1 0"
                                "0 "
                                "8 test.cpp"
-                               "1 0"
                                "17 Programming error"
                                "17 Programming error"
                                "0 "
-                               "17 Programming error"
                                "0 ";
             ErrorMessage msg;
             ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid hash - not an integer");
@@ -610,7 +606,6 @@ class TestErrorLogger : public TestFixture {
                       "33 Illegal character in \"foo\\001bar\""
                       "33 Illegal character in \"foo\\001bar\""
                       "0 "
-                      "29 Illegal character in \"string\""
                       "0 ", msg_str);
 
         ErrorMessage msg2;
@@ -639,7 +634,6 @@ class TestErrorLogger : public TestFixture {
                       "17 Programming error"
                       "17 Programming error"
                       "0 "
-                      "17 Programming error"
                       "1 "
                       "27 654\t33\t[]:;,()\t:/,;\tabcd:/,", msg_str);