XmlNode’s copy constructor now recursively copies the children nodes as well

2 files changed, 24 insertions, 13 deletions

diff --git a/src/test.cpp b/src/test.cpp
index e71ea35..8fe739c 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -151,18 +151,25 @@ int main()
   std::cout << color << "Testing XML parsing…" << reset << std::endl;
   XmppParser xml;
   const std::string doc = "<stream xmlns='stream_ns'><stanza b='c'>inner<child1><grandchild/></child1><child2 xmlns='child2_ns'/>tail</stanza></stream>";
-  xml.add_stanza_callback([](const Stanza& stanza)
+  auto check_stanza = [](const Stanza& stanza)
+    {
+      assert(stanza.get_name() == "stanza");
+      assert(stanza.get_tag("xmlns") == "stream_ns");
+      assert(stanza.get_tag("b") == "c");
+      assert(stanza.get_inner() == "inner");
+      assert(stanza.get_tail() == "");
+      assert(stanza.get_child("child1", "stream_ns") != nullptr);
+      assert(stanza.get_child("child2", "stream_ns") == nullptr);
+      assert(stanza.get_child("child2", "child2_ns") != nullptr);
+      assert(stanza.get_child("child2", "child2_ns")->get_tail() == "tail");
+    };
+  xml.add_stanza_callback([check_stanza](const Stanza& stanza)
       {
         std::cout << stanza.to_string() << std::endl;
-        assert(stanza.get_name() == "stanza");
-        assert(stanza.get_tag("xmlns") == "stream_ns");
-        assert(stanza.get_tag("b") == "c");
-        assert(stanza.get_inner() == "inner");
-        assert(stanza.get_tail() == "");
-        assert(stanza.get_child("child1", "stream_ns") != nullptr);
-        assert(stanza.get_child("child2", "stream_ns") == nullptr);
-        assert(stanza.get_child("child2", "child2_ns") != nullptr);
-        assert(stanza.get_child("child2", "child2_ns")->get_tail() == "tail");
+        check_stanza(stanza);
+        // Do the same checks on a copy of that stanza.
+        Stanza copy(stanza);
+        check_stanza(copy);
       });
   xml.feed(doc.data(), doc.size(), true);
 
diff --git a/src/xmpp/xmpp_stanza.hpp b/src/xmpp/xmpp_stanza.hpp
index e55d555..53e0139 100644
--- a/src/xmpp/xmpp_stanza.hpp
+++ b/src/xmpp/xmpp_stanza.hpp
@@ -35,9 +35,8 @@ public:
     node.parent = nullptr;
   }
   /**
-   * The copy constructor do not copy the children or parent attributes. The
-   * copied node is identical to the original except that it is not attached
-   * to any other node.
+   * The copy constructor do not copy the parent attribute. The children
+   * nodes are all copied recursively.
    */
   XmlNode(const XmlNode& node):
     name(node.name),
@@ -48,6 +47,11 @@ public:
     inner(node.inner),
     tail(node.tail)
   {
+    for (XmlNode* child: node.children)
+      {
+        XmlNode* child_copy = new XmlNode(*child);
+        this->add_child(child_copy);
+      }
   }
 
   ~XmlNode();