Merged marshalling/unmarshalling methods into core interface.

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

diff --git a/xmltoolingtest/ComplexXMLObjectTest.h b/xmltoolingtest/ComplexXMLObjectTest.h
index 3e55771..82c23ec 100644 (file)
--- a/xmltoolingtest/ComplexXMLObjectTest.h
+++ b/xmltoolingtest/ComplexXMLObjectTest.h
@@ -25,14 +25,10 @@ public:
 \r
     void setUp() {\r
         XMLObjectBuilder::registerDefaultBuilder(new WildcardXMLObjectBuilder());\r
-        Marshaller::registerDefaultMarshaller(new WildcardXMLObjectMarshaller());\r
-        Unmarshaller::registerDefaultUnmarshaller(new WildcardXMLObjectUnmarshaller());\r
     }\r
 \r
     void tearDown() {\r
         //XMLObjectBuilder::deregisterDefaultBuilder();\r
-        //Marshaller::deregisterDefaultMarshaller();\r
-        //Unmarshaller::deregisterDefaultUnmarshaller();\r
     }\r
 \r
     void testComplexUnmarshalling() {\r
@@ -43,16 +39,17 @@ public:
         DOMDocument* doc=nonvalidatingPool->parse(fs);\r
         TS_ASSERT(doc!=NULL);\r
 \r
-        const Unmarshaller* u = Unmarshaller::getUnmarshaller(doc->getDocumentElement());\r
-        TS_ASSERT(u!=NULL);\r
+        const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
+        TS_ASSERT(b!=NULL);\r
 \r
-        auto_ptr<WildcardXMLObject> wcObject(dynamic_cast<WildcardXMLObject*>(u->unmarshall(doc->getDocumentElement(),true)));\r
+        auto_ptr<WildcardXMLObject> wcObject(\r
+            dynamic_cast<WildcardXMLObject*>(b->buildObject(doc->getDocumentElement())->unmarshall(doc->getDocumentElement(),true))\r
+            );\r
         TS_ASSERT(wcObject.get()!=NULL);\r
 \r
         ListOf(XMLObject) kids=wcObject->getXMLObjects();\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value", 2, kids.size());\r
         \r
-\r
         WildcardXMLObject* wc1=dynamic_cast<WildcardXMLObject*>(*(++kids.begin()));\r
         WildcardXMLObject* wc2=dynamic_cast<WildcardXMLObject*>(*(++(wc1->getXMLObjects().begin())));\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value", 3, wc2->getXMLObjects().size());\r