Handle variant element names, merge in wildcard class, add test cases.

[shibboleth/cpp-xmltooling.git] / xmltoolingtest / MarshallingTest.h

diff --git a/xmltoolingtest/MarshallingTest.h b/xmltoolingtest/MarshallingTest.h
index dd476c9..af687e3 100644 (file)
--- a/xmltoolingtest/MarshallingTest.h
+++ b/xmltoolingtest/MarshallingTest.h
@@ -20,30 +20,30 @@
 \r
 class MarshallingTest : public CxxTest::TestSuite {\r
     QName m_qname;\r
+    QName m_qtype;\r
 public:\r
-    MarshallingTest() : m_qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME) {}\r
+    MarshallingTest() : m_qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME,SimpleXMLObject::NAMESPACE_PREFIX),\r
+        m_qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME,SimpleXMLObject::NAMESPACE_PREFIX) {}\r
 \r
     void setUp() {\r
         XMLObjectBuilder::registerBuilder(m_qname, new SimpleXMLObjectBuilder());\r
-        Marshaller::registerMarshaller(m_qname, new SimpleXMLObjectMarshaller());\r
-        Unmarshaller::registerUnmarshaller(m_qname, new SimpleXMLObjectUnmarshaller());\r
+        XMLObjectBuilder::registerBuilder(m_qtype, new SimpleXMLObjectBuilder());\r
     }\r
 \r
     void tearDown() {\r
         XMLObjectBuilder::deregisterBuilder(m_qname);\r
-        Marshaller::deregisterMarshaller(m_qname);\r
-        Unmarshaller::deregisterUnmarshaller(m_qname);\r
+        XMLObjectBuilder::deregisterBuilder(m_qtype);\r
     }\r
 \r
     void testMarshallingWithAttributes() {\r
         TS_TRACE("testMarshallingWithAttributes");\r
 \r
         auto_ptr_XMLCh expected("Firefly");\r
-        auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::getBuilder(m_qname)->buildObject()));\r
+        auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::buildOne(m_qname)));\r
         TS_ASSERT(sxObject.get()!=NULL);\r
         sxObject->setId(expected.get());\r
         \r
-        DOMElement* rootElement = Marshaller::getMarshaller(sxObject.get())->marshall(sxObject.get());\r
+        DOMElement* rootElement = sxObject->marshall();\r
 \r
         string path=data_path + "SimpleXMLObjectWithAttribute.xml";\r
         ifstream fs(path.c_str());\r
@@ -58,11 +58,11 @@ public:
         TS_TRACE("testMarshallingWithElementContent");\r
 \r
         auto_ptr_XMLCh expected("Sample Content");\r
-        auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::getBuilder(m_qname)->buildObject()));\r
+        auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::buildOne(m_qname)));\r
         TS_ASSERT(sxObject.get()!=NULL);\r
         sxObject->setValue(expected.get());\r
         \r
-        DOMElement* rootElement = Marshaller::getMarshaller(sxObject.get())->marshall(sxObject.get());\r
+        DOMElement* rootElement = sxObject->marshall();\r
 \r
         string path=data_path + "SimpleXMLObjectWithContent.xml";\r
         ifstream fs(path.c_str());\r
@@ -76,24 +76,30 @@ public:
     void testMarshallingWithChildElements() {\r
         TS_TRACE("testMarshallingWithChildElements");\r
 \r
-        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(m_qname);\r
+        const SimpleXMLObjectBuilder* b=dynamic_cast<const SimpleXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(m_qname));\r
         TS_ASSERT(b!=NULL);\r
         \r
-        auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(b->buildObject()));\r
+        auto_ptr<SimpleXMLObject> sxObject(b->buildObject());\r
         TS_ASSERT(sxObject.get()!=NULL);\r
-        ListOf(SimpleXMLObject) kids=sxObject->getSimpleXMLObjects();\r
-        kids.push_back(dynamic_cast<SimpleXMLObject*>(b->buildObject()));\r
-        kids.push_back(dynamic_cast<SimpleXMLObject*>(b->buildObject()));\r
-        kids.push_back(dynamic_cast<SimpleXMLObject*>(b->buildObject()));\r
+        VectorOf(SimpleXMLObject) kids=sxObject->getSimpleXMLObjects();\r
+        kids.push_back(b->buildObject());\r
+        kids.push_back(b->buildObject());\r
+        kids.push_back(b->buildObject());\r
         \r
         // Test some collection stuff\r
         auto_ptr_XMLCh foo("Foo");\r
         auto_ptr_XMLCh bar("Bar");\r
-        kids[0]->setId(foo.get());\r
+        auto_ptr_XMLCh baz("Baz");\r
+        kids.begin()->setId(foo.get());\r
         kids.at(2)->setValue(bar.get());\r
         kids.erase(kids.begin()+1);\r
+        TS_ASSERT_SAME_DATA(kids.back()->getValue(), bar.get(), XMLString::stringLen(bar.get()));\r
         \r
-        DOMElement* rootElement = Marshaller::getMarshaller(sxObject.get())->marshall(sxObject.get());\r
+        kids.push_back(b->buildObject(SimpleXMLObject::NAMESPACE,SimpleXMLObject::DERIVED_NAME,SimpleXMLObject::NAMESPACE_PREFIX));\r
+        kids.back()->setSchemaType(&m_qtype);\r
+        kids.back()->setValue(baz.get());\r
+        \r
+        DOMElement* rootElement = sxObject->marshall();\r
 \r
         string path=data_path + "SimpleXMLObjectWithChildren.xml";\r
         ifstream fs(path.c_str());\r