|
@@ -3,7 +3,7 @@
|
|
* Company: Lynar Studios
|
|
* Company: Lynar Studios
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* Created: 2020-09-25
|
|
* Created: 2020-09-25
|
|
- * Changed: 2023-03-25
|
|
|
|
|
|
+ * Changed: 2023-05-16
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
|
|
|
|
@@ -279,10 +279,10 @@ namespace
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogs"};
|
|
XmlNode dialogsNode{"dialogs"};
|
|
shared_ptr<XmlNode> currentNode{};
|
|
shared_ptr<XmlNode> currentNode{};
|
|
- shared_ptr<XmlNode> dialogNodeA = make_shared<XmlNode>("dialogNodeA");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeB = make_shared<XmlNode>("dialogNodeB");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeC = make_shared<XmlNode>("dialogNodeC");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeD = make_shared<XmlNode>("dialogNodeD");
|
|
|
|
|
|
+ auto dialogNodeA = make_shared<XmlNode>("dialogNodeA");
|
|
|
|
+ auto dialogNodeB = make_shared<XmlNode>("dialogNodeB");
|
|
|
|
+ auto dialogNodeC = make_shared<XmlNode>("dialogNodeC");
|
|
|
|
+ auto dialogNodeD = make_shared<XmlNode>("dialogNodeD");
|
|
|
|
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeB));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeB));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeC));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeC));
|
|
@@ -320,8 +320,8 @@ namespace
|
|
TEST_F(XmlNodeTest, addChildAfter_no_search_node_available)
|
|
TEST_F(XmlNodeTest, addChildAfter_no_search_node_available)
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogs"};
|
|
XmlNode dialogsNode{"dialogs"};
|
|
- shared_ptr<XmlNode> newChild = make_shared<XmlNode>("newChild");
|
|
|
|
- shared_ptr<XmlNode> searchNode = make_shared<XmlNode>("searchNode");
|
|
|
|
|
|
+ auto newChild = make_shared<XmlNode>("newChild");
|
|
|
|
+ auto searchNode = make_shared<XmlNode>("searchNode");
|
|
|
|
|
|
ASSERT_FALSE(dialogsNode.addChildAfter(newChild, searchNode));
|
|
ASSERT_FALSE(dialogsNode.addChildAfter(newChild, searchNode));
|
|
}
|
|
}
|
|
@@ -366,10 +366,10 @@ namespace
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogs"};
|
|
XmlNode dialogsNode{"dialogs"};
|
|
shared_ptr<XmlNode> currentNode{};
|
|
shared_ptr<XmlNode> currentNode{};
|
|
- shared_ptr<XmlNode> dialogNodeA = make_shared<XmlNode>("dialogNodeA");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeB = make_shared<XmlNode>("dialogNodeB");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeC = make_shared<XmlNode>("dialogNodeC");
|
|
|
|
- shared_ptr<XmlNode> dialogNodeD = make_shared<XmlNode>("dialogNodeD");
|
|
|
|
|
|
+ auto dialogNodeA = make_shared<XmlNode>("dialogNodeA");
|
|
|
|
+ auto dialogNodeB = make_shared<XmlNode>("dialogNodeB");
|
|
|
|
+ auto dialogNodeC = make_shared<XmlNode>("dialogNodeC");
|
|
|
|
+ auto dialogNodeD = make_shared<XmlNode>("dialogNodeD");
|
|
|
|
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeB));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeB));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeC));
|
|
ASSERT_TRUE(dialogsNode.addChildToEnd(dialogNodeC));
|
|
@@ -407,8 +407,8 @@ namespace
|
|
TEST_F(XmlNodeTest, addChildBefore_no_search_node_available)
|
|
TEST_F(XmlNodeTest, addChildBefore_no_search_node_available)
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogs"};
|
|
XmlNode dialogsNode{"dialogs"};
|
|
- shared_ptr<XmlNode> newChild = make_shared<XmlNode>("newChild");
|
|
|
|
- shared_ptr<XmlNode> searchNode = make_shared<XmlNode>("searchNode");
|
|
|
|
|
|
+ auto newChild = make_shared<XmlNode>("newChild");
|
|
|
|
+ auto searchNode = make_shared<XmlNode>("searchNode");
|
|
|
|
|
|
ASSERT_FALSE(dialogsNode.addChildBefore(newChild, searchNode));
|
|
ASSERT_FALSE(dialogsNode.addChildBefore(newChild, searchNode));
|
|
}
|
|
}
|
|
@@ -701,7 +701,7 @@ namespace
|
|
TEST_F(XmlNodeTest, hasChildV2)
|
|
TEST_F(XmlNodeTest, hasChildV2)
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogsNode"};
|
|
XmlNode dialogsNode{"dialogsNode"};
|
|
- shared_ptr<XmlNode> searchNode = make_shared<XmlNode>("dialogB");
|
|
|
|
|
|
+ auto searchNode = make_shared<XmlNode>("dialogB");
|
|
dialogsNode.addChildToEnd(make_shared<XmlNode>("dialogA"));
|
|
dialogsNode.addChildToEnd(make_shared<XmlNode>("dialogA"));
|
|
dialogsNode.addChildToEnd(searchNode);
|
|
dialogsNode.addChildToEnd(searchNode);
|
|
dialogsNode.addChildToEnd(make_shared<XmlNode>("dialogC"));
|
|
dialogsNode.addChildToEnd(make_shared<XmlNode>("dialogC"));
|
|
@@ -712,7 +712,7 @@ namespace
|
|
TEST_F(XmlNodeTest, hasChildV2_child_not_available)
|
|
TEST_F(XmlNodeTest, hasChildV2_child_not_available)
|
|
{
|
|
{
|
|
XmlNode dialogsNode{"dialogsNode"};
|
|
XmlNode dialogsNode{"dialogsNode"};
|
|
- shared_ptr<XmlNode> searchNode = make_shared<XmlNode>("dialogB");
|
|
|
|
|
|
+ auto searchNode = make_shared<XmlNode>("dialogB");
|
|
|
|
|
|
ASSERT_FALSE(dialogsNode.hasChild(searchNode));
|
|
ASSERT_FALSE(dialogsNode.hasChild(searchNode));
|
|
}
|
|
}
|
|
@@ -938,8 +938,8 @@ namespace
|
|
|
|
|
|
TEST_F(XmlNodeTest, toXml_no_value)
|
|
TEST_F(XmlNodeTest, toXml_no_value)
|
|
{
|
|
{
|
|
- shared_ptr<XmlNode> singleLineElement = make_shared<XmlNode>("info");
|
|
|
|
- shared_ptr<XmlAttribute> attribute = make_shared<XmlAttribute>("id");
|
|
|
|
|
|
+ auto singleLineElement = make_shared<XmlNode>("info");
|
|
|
|
+ auto attribute = make_shared<XmlAttribute>("id");
|
|
attribute->setValue("important");
|
|
attribute->setValue("important");
|
|
singleLineElement->addAttributeToEnd(attribute);
|
|
singleLineElement->addAttributeToEnd(attribute);
|
|
|
|
|