Entities now work in the xml processor the way they should, you can define your

own, use the 5 builtin ones (gt, lt, apos, quot, amp), and even create your own.
The parser now skips any text definition at the top, which is fine for most xml
that you get these days.  I think if we ever make the break to full compliance
we'll need to make a new parser from scratch.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/unit/xml.cpp b/src/unit/xml.cpp
index 559b2f4..e4d779c 100644
--- a/src/unit/xml.cpp
+++ b/src/unit/xml.cpp
@@ -15,6 +15,10 @@ public:
                 TEST_ADD( XmlCoreTestSuite::badXml01 )
                 TEST_ADD( XmlCoreTestSuite::badXml02 )
                 TEST_ADD( XmlCoreTestSuite::badXml03 )
+
+                TEST_ADD( XmlCoreTestSuite::entityBuiltin01 )
+
+                TEST_ADD( XmlCoreTestSuite::entityDoc01 )
         }
         
 private:
@@ -32,6 +36,18 @@ private:
         {
                 TEST_THROWS( XmlStringReader r("<hello param=\"stuff?"), XmlException & );
         }
+
+        void entityBuiltin01()
+        {
+                XmlStringReader r("<hello>&gt;&lt;&amp;&apos;&quot;</hello>");
+                TEST_ASSERT( strcmp( r.getRoot()->getContent(), "><&\'\"" ) == 0 );
+        }
+        
+        void entityDoc01()
+        {
+                XmlStringReader r("<!ENTITY  name  \"bob the man\"><hello>&quot;&name;&quot;</hello>");
+                TEST_ASSERT( strcmp( r.getRoot()->getContent(), "\"bob the man\"" ) == 0 );
+        }
 };
 
 int main( int argc, char *argv[] )