OSX reshuffling

[wxWidgets.git] / tests / xml / xmltest.cpp

diff --git a/tests/xml/xmltest.cpp b/tests/xml/xmltest.cpp
index 1f354224f1dc0f05dce966a417d4b5718e52d2a5..96f812b600b7a2c7dbc05891348cfd898be2c622 100644 (file)
--- a/tests/xml/xmltest.cpp
+++ b/tests/xml/xmltest.cpp
@@ -46,7 +46,7 @@ void CheckXml(wxXmlNode *n, ...)
             break;
 
         CPPUNIT_ASSERT( child );
             break;
 
         CPPUNIT_ASSERT( child );

-        WX_ASSERT_STR_EQUAL( childName, child->GetName() );
+        CPPUNIT_ASSERT_EQUAL( childName, child->GetName() );

         CPPUNIT_ASSERT( child->GetChildren() == NULL );
         CPPUNIT_ASSERT( child->GetParent() == n );
 
         CPPUNIT_ASSERT( child->GetChildren() == NULL );
         CPPUNIT_ASSERT( child->GetParent() == n );
 


@@ -72,9 +72,11 @@ public:
 private:
     CPPUNIT_TEST_SUITE( XmlTestCase );
         CPPUNIT_TEST( InsertChild );
 private:
     CPPUNIT_TEST_SUITE( XmlTestCase );
         CPPUNIT_TEST( InsertChild );

+        CPPUNIT_TEST( InsertChildAfter );

     CPPUNIT_TEST_SUITE_END();
 
     void InsertChild();
     CPPUNIT_TEST_SUITE_END();
 
     void InsertChild();

+    void InsertChildAfter();

 
     DECLARE_NO_COPY_CLASS(XmlTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(XmlTestCase)
 };


@@ -104,3 +106,27 @@ void XmlTestCase::InsertChild()
     root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), two);
     CheckXml(root, "B", "A", "1", "C", "2", "3", NULL);
 }
     root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), two);
     CheckXml(root, "B", "A", "1", "C", "2", "3", NULL);
 }

+
+void XmlTestCase::InsertChildAfter()
+{
+    wxXmlNode *root = new wxXmlNode(wxXML_ELEMENT_NODE, "root");
+
+    root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "1"), NULL);
+    CheckXml(root, "1", NULL);
+
+    wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2");
+    root->AddChild(two);
+    wxXmlNode *three = new wxXmlNode(wxXML_ELEMENT_NODE, "3");
+    root->AddChild(three);
+    CheckXml(root, "1", "2", "3", NULL);
+
+    // check inserting in the middle:
+    root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "A"), root->GetChildren());
+    CheckXml(root, "1", "A", "2", "3", NULL);
+    root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "B"), two);
+    CheckXml(root, "1", "A", "2", "B", "3", NULL);
+
+    // and at the end:
+    root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), three);
+    CheckXml(root, "1", "A", "2", "B", "3", "C", NULL);
+}