Log error when default profiles xml loads with error + unittest [5596] (

#556) * Log error when default profiles xml loads with error + unittest * More verbose error * log opening error also when the file is DEFAULT_FASTRTPS_PROFILES * combine xml loading and error checking
eProsima · Jun 18, 2019 · cccb13f · cccb13f
1 parent 4f331c8
commit cccb13f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,8 @@ Session.vim
 .netrwhist
 *~
 
+### VisualStudio Code ###
+*.vscode
 
 ### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and

diff --git a/src/cpp/xmlparser/XMLParser.cpp b/src/cpp/xmlparser/XMLParser.cpp
@@ -2542,9 +2542,7 @@ XMLP_ret XMLParser::loadXML(const std::string& filename, up_base_node_t& root)
     tinyxml2::XMLDocument xmlDoc;
     if (tinyxml2::XMLError::XML_SUCCESS != xmlDoc.LoadFile(filename.c_str()))
     {
-        if (filename != std::string(DEFAULT_FASTRTPS_PROFILES))
-            logError(XMLPARSER, "Error opening '" << filename << "'");
-
+        logError(XMLPARSER, "Error opening '" << filename << "'");
         return XMLP_ret::XML_ERROR;
     }
 

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -166,6 +166,14 @@ TEST_F(XMLParserTests, NoFIle)
     ASSERT_EQ(XMLParser::loadXML("missing_file.xml", root), XMLP_ret::XML_ERROR);
 }
 
+TEST_F(XMLParserTests, EmptyDefaultFile)
+{
+    std::ifstream inFile;
+    inFile.open("DEFAULT_FASTRTPS_PROFILES.xml");
+    std::unique_ptr<BaseNode> root;
+    ASSERT_EQ(XMLParser::loadDefaultXMLFile(root), XMLP_ret::XML_ERROR);
+}
+
 TEST_F(XMLParserTests, EmptyString)
 {
     std::ifstream inFile;