add xml tag name

Author: ludviggunne

lib/cppcheck.cpp

@@ -1773,17 +1773,14 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
                 picojson::object metric_json = obj["metric"].get<picojson::object>();
 
                 std::stringstream ss;
-                ss << "<";
+                ss << "<metric";
 
-                bool isFirst = true;
                 for (auto pair : metric_json) {
-                    std::string sep = isFirst ? "" : " ";
-                    isFirst = false;
                     const std::string id = pair.first;
                     if (pair.second.is<std::int64_t>())
-                        ss << sep << id << "=\"" << pair.second.get<std::int64_t>() << "\"";
+                        ss << " " << id << "=\"" << pair.second.get<std::int64_t>() << "\"";
                     else if (pair.second.is<std::string>())
-                        ss << sep << id << "=\"" << pair.second.get<std::string>() << "\"";
+                        ss << " " << id << "=\"" << pair.second.get<std::string>() << "\"";
                 }
 
                 ss << "/>";

test/cli/metrics_test.py

@@ -7,14 +7,14 @@
 __addon_path = os.path.join(__script_dir, 'metrics_test', 'dummy_addon.py')
 __source_path = os.path.join(__script_dir, 'metrics_test', 'dummy_file.c')
 __expected_xml = [
-    '<fileName="1.cpp" function="write" id="HISCall" lineNumber="6" value="2"/>',
-    '<fileName="1.cpp" function="write" id="HISGoto" lineNumber="6" value="0"/>',
-    '<fileName="1.cpp" function="write" id="HISLevel" lineNumber="6" value="2"/>',
-    '<fileName="1.cpp" function="write" id="HISParam" lineNumber="6" value="2"/>',
-    '<fileName="1.cpp" function="write" id="HISPath" lineNumber="6" value="3"/>',
-    '<fileName="1.cpp" function="write" id="HISReturn" lineNumber="6" value="0"/>',
-    '<fileName="1.cpp" function="write" id="HISStmt" lineNumber="6" value="15"/>',
-    '<fileName="1.cpp" function="write" id="cyclomaticComplexity" lineNumber="6" value="3"/>'
+    '<metric fileName="1.cpp" function="write" id="HISCall" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISGoto" lineNumber="6" value="0"/>',
+    '<metric fileName="1.cpp" function="write" id="HISLevel" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISParam" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISPath" lineNumber="6" value="3"/>',
+    '<metric fileName="1.cpp" function="write" id="HISReturn" lineNumber="6" value="0"/>',
+    '<metric fileName="1.cpp" function="write" id="HISStmt" lineNumber="6" value="15"/>',
+    '<metric fileName="1.cpp" function="write" id="cyclomaticComplexity" lineNumber="6" value="3"/>'
 ]
 
 def test_dummy_metrics_xml_report(tmpdir):