update existing tests

Author: jhaigh0

Framework/Kernel/test/ErrorReporterTest.h

@@ -66,7 +66,7 @@ class ErrorReporterTest : public CxxTest::TestSuite {
     const std::string appName = "My testing application name";
     const Mantid::Types::Core::time_duration upTime(5, 0, 7, 0);
     const std::string stackTrace = "File \" C :\\file\\path\\file.py\", line 194, in broken_function";
-    TestableErrorReporter reporter(appName, upTime, "0", true, "name", "email", "textBox", stackTrace);
+    TestableErrorReporter reporter(appName, upTime, "0", true, "name", "email", "textBox", stackTrace, "");
     const std::string message = reporter.generateErrorMessage();
 
     ::Json::Value root;
@@ -102,7 +102,7 @@ class ErrorReporterTest : public CxxTest::TestSuite {
   void test_errorMessageWithShareAndRecoveryFileHash() {
     const std::string name = "My testing application name";
     const Mantid::Types::Core::time_duration upTime(5, 0, 7, 0);
-    TestableErrorReporter errorService(name, upTime, "0", true, "name", "email", "textBox", "stacktrace");
+    TestableErrorReporter errorService(name, upTime, "0", true, "name", "email", "textBox", "stacktrace", "cppTraces");
     const std::string message = errorService.generateErrorMessage();
 
     ::Json::Value root;
@@ -111,7 +111,7 @@ class ErrorReporterTest : public CxxTest::TestSuite {
     const std::vector<std::string> expectedMembers{
         "ParaView", "application", "host",      "mantidSha1", "mantidVersion", "osArch",
         "osName",   "osReadable",  "osVersion", "uid",        "facility",      "upTime",
-        "exitCode", "textBox",     "name",      "email",      "stacktrace"};
+        "exitCode", "textBox",     "name",      "email",      "stacktrace",    "cppCompressedTraces"};
     for (auto expectedMember : expectedMembers) {
       TSM_ASSERT(expectedMember + " not found",
                  std::find(members.begin(), members.end(), expectedMember) != members.end());
@@ -124,12 +124,13 @@ class ErrorReporterTest : public CxxTest::TestSuite {
     TS_ASSERT_EQUALS(root["email"].asString(), "email");
     TS_ASSERT_EQUALS(root["textBox"].asString(), "textBox");
     TS_ASSERT_EQUALS(root["stacktrace"].asString(), "stacktrace");
+    TS_ASSERT_EQUALS(root["cppCompressedTraces"].asString(), "cppTraces");
   }
 
   void test_errorMessageWithNoShareAndRecoveryFileHash() {
     const std::string name = "My testing application name";
     const Mantid::Types::Core::time_duration upTime(5, 0, 7, 0);
-    TestableErrorReporter errorService(name, upTime, "0", false, "name", "email", "textBox", "stacktrace");
+    TestableErrorReporter errorService(name, upTime, "0", false, "name", "email", "textBox", "stacktrace", "cppTraces");
     const std::string message = errorService.generateErrorMessage();
 
     ::Json::Value root;
@@ -138,7 +139,8 @@ class ErrorReporterTest : public CxxTest::TestSuite {
     const std::vector<std::string> expectedMembers{
         "ParaView", "application", "host",      "mantidSha1", "mantidVersion", "osArch",
         "osName",   "osReadable",  "osVersion", "uid",        "facility",      "upTime",
-        "exitCode", "textBox",     "name",      "email",      "stacktrace"};
+        "exitCode", "textBox",     "name",      "email",      "stacktrace",    "upTime",
+        "exitCode", "textBox",     "name",      "email",      "stacktrace",    "cppCompressedTraces"};
     for (auto expectedMember : expectedMembers) {
       TSM_ASSERT(expectedMember + " not found",
                  std::find(members.begin(), members.end(), expectedMember) != members.end());
@@ -151,5 +153,6 @@ class ErrorReporterTest : public CxxTest::TestSuite {
     TS_ASSERT_EQUALS(root["email"].asString(), "");
     TS_ASSERT_EQUALS(root["textBox"].asString(), "textBox");
     TS_ASSERT_EQUALS(root["stacktrace"].asString(), "");
+    TS_ASSERT_EQUALS(root["cppCompressedTraces"].asString(), "");
   }
 };

qt/python/mantidqt/mantidqt/dialogs/errorreports/test/test_errorreport_presenter.py

@@ -62,7 +62,7 @@ def test_send_error_report_to_server_calls_ErrorReport_correctly(self):
         self.errorreport_mock_instance.sendErrorReport.return_value = 201
         self.error_report_presenter._send_report_to_server(False, name=name, email=email, uptime=uptime, text_box=text_box)
 
-        self.errorreport_mock.assert_called_once_with(self.app_name, uptime, self.exit_code, False, name, email, text_box, "")
+        self.errorreport_mock.assert_called_once_with(self.app_name, uptime, self.exit_code, False, name, email, text_box, "", b"")
         self.errorreport_mock_instance.sendErrorReport.assert_called_once_with()
 
     def test_send_error_report_to_server_calls_ErrorReport_correctly_and_triggers_view_upon_failure(self):
@@ -74,7 +74,7 @@ def test_send_error_report_to_server_calls_ErrorReport_correctly_and_triggers_vi
         self.errorreport_mock_instance.sendErrorReport.return_value = 500
         self.error_report_presenter._send_report_to_server(True, name=name, email=email, uptime=uptime, text_box=text_box)
 
-        self.errorreport_mock.assert_called_once_with(self.app_name, uptime, self.exit_code, True, name, email, text_box, "")
+        self.errorreport_mock.assert_called_once_with(self.app_name, uptime, self.exit_code, True, name, email, text_box, "", b"")
         self.errorreport_mock_instance.sendErrorReport.assert_called_once_with()
         self.view.display_message_box.assert_called_once_with(
             "Error contacting server", ErrorReporterPresenter.SENDING_ERROR_MESSAGE, "http request returned with status 500"