Fixed XMLReader class

- XMLReader class now merges parsed nodes correctly together
- extended tests for XMLReader class

source/io/xml/XMLReader.cpp

@@ -189,27 +189,30 @@ void ls_std::XMLReader::_mergeNodes()
   this->document->setRootElement(this->parseData.front().node);
 }
 
-void ls_std::XMLReader::_mergeChildrenToParentNode(const std::shared_ptr<ls_std::XMLNode>& _parent, std::list<ls_std::XMLParseData>::iterator& _iterator)
+void ls_std::XMLReader::_mergeChildrenToParentNode(const std::shared_ptr<ls_std::XMLNode>& _parent, std::list<ls_std::XMLParseData>::iterator& _iterator, uint8_t _parentLevel)
 {
   do {
     _iterator++;
 
-    if(_iterator != this->parseData.end() && _iterator->level == this->maxLevel) {
-      _parent->addChildToEnd(_iterator->node);
+    if(_iterator == this->parseData.end()) {
+      break;
+    }
+    else {
+      if(_iterator->level == this->maxLevel) {
+        _parent->addChildToEnd(_iterator->node);
+      }
     }
   }
-  while(_iterator->level == this->maxLevel);
+  while(_iterator->level > _parentLevel);
 }
 
 void ls_std::XMLReader::_mergeNodesOnCurrentLevel() {
   auto iterator = this->parseData.begin();
-  uint8_t parentLevel;
+  uint8_t parentLevel = this->maxLevel - 1;
 
   while(iterator != this->parseData.end()) {
-    parentLevel = this->maxLevel - 1;
-
     if(iterator->level == parentLevel) {
-      this->_mergeChildrenToParentNode(iterator->node, iterator);
+      this->_mergeChildrenToParentNode(iterator->node, iterator, parentLevel);
     }
     else {
       iterator++;

source/io/xml/XMLReader.hpp

@@ -60,7 +60,7 @@ namespace ls_std {
       void _isDeclaration(const ls_std::byte_field& _data, std::string::size_type _index);
       void _isOpeningTag(const ls_std::byte_field& _data, std::string::size_type _index);
       void _mergeNodes();
-      void _mergeChildrenToParentNode(const std::shared_ptr<ls_std::XMLNode>& _parent, std::list<ls_std::XMLParseData>::iterator& _iterator);
+      void _mergeChildrenToParentNode(const std::shared_ptr<ls_std::XMLNode>& _parent, std::list<ls_std::XMLParseData>::iterator& _iterator, uint8_t _parentLevel);
       void _mergeNodesOnCurrentLevel();
       void _parse(const ls_std::byte_field& _data);
       static std::pair<std::string, std::string> _parseAttribute(const ls_std::byte_field& _data);

test/cases/io/xml/XMLReaderTest.cpp

@@ -3,13 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-10
- * Changed:         2020-10-18
+ * Changed:         2020-10-22
  *
  * */
 
 #include <gtest/gtest.h>
 #include "../../../../source/io/xml/XMLReader.hpp"
 #include "../../../TestHelper.hpp"
+#include "../../../../source/utils/STLUtils.hpp"
 
 namespace {
   class XMLReaderTest : public ::testing::Test {
@@ -26,6 +27,8 @@ namespace {
   {
     std::string xmlPath = TestHelper::getResourcesFolderLocation() + "state_machine_test.xml";
     ls_std::XMLReader xmlReader {std::make_shared<ls_std::XMLDocument>(), xmlPath};
+    std::list<std::shared_ptr<ls_std::XMLNode>> children, statesChildren, memoryChildren {};
+    std::list<std::shared_ptr<ls_std::XMLAttribute>> attributes {};
 
     ASSERT_TRUE(!xmlReader.read().empty());
 
@@ -34,6 +37,57 @@ namespace {
     ASSERT_STREQ("UTF-8", xmlReader.getDocument()->getDeclaration()->getEncoding().c_str());
     ASSERT_STREQ("1.0", xmlReader.getDocument()->getDeclaration()->getVersion().c_str());
     ASSERT_TRUE(xmlReader.getDocument()->getDeclaration()->getStandalone().empty());
+
+    // check root element
+
+    std::shared_ptr<ls_std::XMLNode> root = xmlReader.getDocument()->getRootElement();
+    ASSERT_STREQ("stateMachine", root->getName().c_str());
+    ASSERT_STREQ("name", root->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("test_machine", root->getAttributes().front()->getValue().c_str());
+
+    // check 2. level
+
+    children = root->getChildren();
+    ASSERT_EQ(3, children.size());
+    ASSERT_STREQ("states", ls_std::STLUtils::getListElementAt(children, 0)->getName().c_str());
+    ASSERT_STREQ("currentState", ls_std::STLUtils::getListElementAt(children, 1)->getName().c_str());
+    ASSERT_STREQ("memory", ls_std::STLUtils::getListElementAt(children, 2)->getName().c_str());
+
+    // states
+
+    statesChildren = ls_std::STLUtils::getListElementAt(children, 0)->getChildren();
+    ASSERT_EQ(5, statesChildren.size());
+
+    ASSERT_STREQ("state", ls_std::STLUtils::getListElementAt(statesChildren, 0)->getName().c_str());
+    ASSERT_STREQ("id", ls_std::STLUtils::getListElementAt(statesChildren, 0)->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("A", ls_std::STLUtils::getListElementAt(statesChildren, 0)->getAttributes().front()->getValue().c_str());
+
+    ASSERT_STREQ("state", ls_std::STLUtils::getListElementAt(statesChildren, 1)->getName().c_str());
+    ASSERT_STREQ("id", ls_std::STLUtils::getListElementAt(statesChildren, 1)->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("B", ls_std::STLUtils::getListElementAt(statesChildren, 1)->getAttributes().front()->getValue().c_str());
+
+    ASSERT_STREQ("state", ls_std::STLUtils::getListElementAt(statesChildren, 2)->getName().c_str());
+    ASSERT_STREQ("id", ls_std::STLUtils::getListElementAt(statesChildren, 2)->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("C", ls_std::STLUtils::getListElementAt(statesChildren, 2)->getAttributes().front()->getValue().c_str());
+
+    ASSERT_STREQ("state", ls_std::STLUtils::getListElementAt(statesChildren, 3)->getName().c_str());
+    ASSERT_STREQ("id", ls_std::STLUtils::getListElementAt(statesChildren, 3)->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("D", ls_std::STLUtils::getListElementAt(statesChildren, 3)->getAttributes().front()->getValue().c_str());
+
+    ASSERT_STREQ("state", ls_std::STLUtils::getListElementAt(statesChildren, 4)->getName().c_str());
+    ASSERT_STREQ("id", ls_std::STLUtils::getListElementAt(statesChildren, 4)->getAttributes().front()->getName().c_str());
+    ASSERT_STREQ("E", ls_std::STLUtils::getListElementAt(statesChildren, 4)->getAttributes().front()->getValue().c_str());
+
+    //TODO: current state
+
+    // memory
+
+    memoryChildren = ls_std::STLUtils::getListElementAt(children, 2)->getChildren();
+    ASSERT_EQ(3, memoryChildren.size());
+
+    ASSERT_STREQ("location", ls_std::STLUtils::getListElementAt(memoryChildren, 0)->getName().c_str());
+    ASSERT_STREQ("location", ls_std::STLUtils::getListElementAt(memoryChildren, 1)->getName().c_str());
+    ASSERT_STREQ("location", ls_std::STLUtils::getListElementAt(memoryChildren, 2)->getName().c_str());
   }
 
   TEST_F(XMLReaderTest, getDocument)