fixed #13393 - do not convert error location paths in XML output (danmar#7563)

Author: firewave

lib/errorlogger.cpp

@@ -508,7 +508,7 @@ std::string ErrorMessage::toXML() const
 
     for (auto it = callStack.crbegin(); it != callStack.crend(); ++it) {
         printer.OpenElement("location", false);
-        printer.PushAttribute("file", it->getfile().c_str());
+        printer.PushAttribute("file", it->getfile(false).c_str());
         printer.PushAttribute("line", std::max(it->line,0));
         printer.PushAttribute("column", it->column);
         if (!it->getinfo().empty())
@@ -726,6 +726,7 @@ std::string ErrorMessage::FileLocation::getOrigFile(bool convert) const
 
 void ErrorMessage::FileLocation::setfile(std::string file)
 {
+    // TODO: consistently simplify mFileName
     mFileName = Path::simplifyPath(std::move(file));
 }
 

test/cli/other_test.py

@@ -2390,6 +2390,7 @@ def test_xml_output(tmp_path):  # #13391 / #13485
     exitcode_1, stdout_1, stderr_1 = cppcheck(args)
     assert exitcode_1 == 0, stdout_1
     assert stdout_1 == ''
+    test_file_exp = str(test_file).replace('\\', '/')
     assert (stderr_1 ==
 '''<?xml version="1.0" encoding="UTF-8"?>
 <results version="2">
@@ -2402,7 +2403,7 @@ def test_xml_output(tmp_path):  # #13391 / #13485
         </error>
     </errors>
 </results>
-'''.format(version_str, str(test_file).replace('\\', '/'), test_file, test_file))  # TODO: the slashes are inconsistent
+'''.format(version_str, test_file_exp, test_file_exp, test_file_exp))
 
 
 def test_internal_error_loc_int(tmp_path):

test/testerrorlogger.cpp

@@ -296,18 +296,24 @@ class TestErrorLogger : public TestFixture {
     }
 
     void ToXmlV2Locations() const {
-        std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8_i };
+        const ErrorMessage::FileLocation dir1loc{"dir1/a.cpp", 1, 1};
+        const ErrorMessage::FileLocation dir2loc{"dir2\\a.cpp", 1, 1};
+        ErrorMessage::FileLocation dir3loc{"dir/a.cpp", 1, 1};
+        dir3loc.setfile("dir3/a.cpp");
+        ErrorMessage::FileLocation dir4loc{"dir/a.cpp", 1, 1};
+        dir4loc.setfile("dir4\\a.cpp");
+        std::list<ErrorMessage::FileLocation> locs = { dir4loc, dir3loc, dir2loc, dir1loc, fooCpp5, barCpp8_i };
+
         ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
-        std::string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results version=\"2\">\n");
-        header += "    <cppcheck version=\"";
-        header += CppCheck::version();
-        header += "\"/>\n    <errors>";
-        ASSERT_EQUALS(header, ErrorMessage::getXMLHeader(""));
-        ASSERT_EQUALS("    </errors>\n</results>", ErrorMessage::getXMLFooter(2));
-        std::string message("        <error id=\"errorId\" severity=\"error\"");
-        message += " msg=\"Programming error.\" verbose=\"Verbose error\">\n";
+        std::string message;
+        message += "        <error id=\"errorId\" severity=\"error\" msg=\"Programming error.\" verbose=\"Verbose error\">\n";
         message += "            <location file=\"bar.cpp\" line=\"8\" column=\"1\" info=\"\\303\\244\"/>\n";
-        message += "            <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n        </error>";
+        message += "            <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n";
+        message += "            <location file=\"dir1/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location file=\"dir2\\a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location file=\"dir3/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location file=\"dir4/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "        </error>";
         ASSERT_EQUALS(message, msg.toXML());
     }