X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43a302f200f1e9f5f21380bbc7ba74ad8c22d6d6..bbd55ff9564dcaf1a5d2ee93d789c4d656baabef:/tests/xml/xmltest.cpp

diff --git a/tests/xml/xmltest.cpp b/tests/xml/xmltest.cpp
index 09bc9598d4..9f3d6056a5 100644
--- a/tests/xml/xmltest.cpp
+++ b/tests/xml/xmltest.cpp
@@ -22,6 +22,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/xml/xml.h"
+#include "wx/sstream.h"
 
 #include <stdarg.h>
 
@@ -46,7 +47,7 @@ void CheckXml(wxXmlNode *n, ...)
             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 );
 
@@ -73,10 +74,14 @@ private:
     CPPUNIT_TEST_SUITE( XmlTestCase );
         CPPUNIT_TEST( InsertChild );
         CPPUNIT_TEST( InsertChildAfter );
+        CPPUNIT_TEST( LoadSave );
+        CPPUNIT_TEST( CDATA );
     CPPUNIT_TEST_SUITE_END();
 
     void InsertChild();
     void InsertChildAfter();
+    void LoadSave();
+    void CDATA();
 
     DECLARE_NO_COPY_CLASS(XmlTestCase)
 };
@@ -130,3 +135,83 @@ void XmlTestCase::InsertChildAfter()
     root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), three);
     CheckXml(root, "1", "A", "2", "B", "3", "C", NULL);
 }
+
+void XmlTestCase::LoadSave()
+{
+    // NB: this is not real XRC but rather some XRC-like XML fragment which
+    //     exercises different XML constructs to check that they're saved back
+    //     correctly
+    //
+    // Also note that there should be no blank lines here as they disappear
+    // after saving.
+    const char *xmlText =
+"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
+"<resource xmlns=\"http://www.wxwidgets.org/wxxrc\" version=\"2.3.0.1\">\n"
+"  <object class=\"wxDialog\" name=\"my_dialog\">\n"
+"    <children>\n"
+"      <grandchild id=\"1\"/>\n"
+"    </children>\n"
+"    <subobject/>\n"
+"  </object>\n"
+"</resource>\n"
+    ;
+
+    wxStringInputStream sis(xmlText);
+
+    wxXmlDocument doc;
+    CPPUNIT_ASSERT( doc.Load(sis) );
+
+    wxStringOutputStream sos;
+    CPPUNIT_ASSERT( doc.Save(sos) );
+
+    CPPUNIT_ASSERT_EQUAL( xmlText, sos.GetString() );
+
+
+    const char *utf8xmlText =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<word>\n"
+"  <lang name=\"fr\">\xc3\xa9t\xc3\xa9</lang>\n"
+"  <lang name=\"ru\">\xd0\xbb\xd0\xb5\xd1\x82\xd0\xbe</lang>\n"
+"</word>\n"
+    ;
+
+    wxStringInputStream sis8(wxString::FromUTF8(utf8xmlText));
+    CPPUNIT_ASSERT( doc.Load(sis8) );
+
+    // this contents can't be represented in Latin-1 as it contains Cyrillic
+    // letters
+    doc.SetFileEncoding("ISO-8859-1");
+    CPPUNIT_ASSERT( !doc.Save(sos) );
+
+    // but it should work in UTF-8
+    wxStringOutputStream sos8;
+    doc.SetFileEncoding("UTF-8");
+    CPPUNIT_ASSERT( doc.Save(sos8) );
+    CPPUNIT_ASSERT_EQUAL( wxString(utf8xmlText),
+                          wxString(sos8.GetString().ToUTF8()) );
+}
+
+void XmlTestCase::CDATA()
+{
+    const char *xmlText =
+        "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n"
+        "<name>\n"
+        "  <![CDATA[Giovanni Mittone]]>\n"
+        "</name>\n"
+    ;
+
+    wxStringInputStream sis(xmlText);
+    wxXmlDocument doc;
+    CPPUNIT_ASSERT( doc.Load(sis) );
+
+    wxXmlNode *n = doc.GetRoot();
+    CPPUNIT_ASSERT( n );
+
+    n = n->GetChildren();
+    CPPUNIT_ASSERT( n );
+
+    // check that both leading ("  ") and trailing white space is not part of
+    // the node contents when CDATA is used and wxXMLDOC_KEEP_WHITESPACE_NODES
+    // is not
+    CPPUNIT_ASSERT_EQUAL( "Giovanni Mittone", n->GetContent() );
+}