Removed ValidatingXMLObject interface and implementations.

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

diff --git a/xmltoolingtest/ComplexXMLObjectTest.h b/xmltoolingtest/ComplexXMLObjectTest.h
index da0ecfb..73647b4 100644 (file)
--- a/xmltoolingtest/ComplexXMLObjectTest.h
+++ b/xmltoolingtest/ComplexXMLObjectTest.h
@@ -24,15 +24,11 @@ public:
     ComplexXMLObjectTest() {}\r
 \r
     void setUp() {\r
-        XMLObjectBuilder::registerDefaultBuilder(new WildcardXMLObjectBuilder());\r
-        Marshaller::registerDefaultMarshaller(new WildcardXMLObjectMarshaller());\r
-        Unmarshaller::registerDefaultUnmarshaller(new WildcardXMLObjectUnmarshaller());\r
+        XMLObjectBuilder::registerDefaultBuilder(new AnyElementBuilder());\r
     }\r
 \r
     void tearDown() {\r
         XMLObjectBuilder::deregisterDefaultBuilder();\r
-        Marshaller::deregisterDefaultMarshaller();\r
-        Unmarshaller::deregisterDefaultUnmarshaller();\r
     }\r
 \r
     void testComplexUnmarshalling() {\r
@@ -40,21 +36,22 @@ public:
 \r
         string path=data_path + "ComplexXMLObject.xml";\r
         ifstream fs(path.c_str());\r
-        DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().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<ElementProxy> wcObject(\r
+            dynamic_cast<ElementProxy*>(b->buildFromDocument(doc))\r
+            );\r
         TS_ASSERT(wcObject.get()!=NULL);\r
-\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
+        ElementProxy* wc1=dynamic_cast<ElementProxy*>(*(++kids.begin()));\r
+        ElementProxy* wc2=dynamic_cast<ElementProxy*>(*(++(wc1->getXMLObjects().begin())));\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value", 3, wc2->getXMLObjects().size());\r
 \r
         static const XMLCh html[] = {chLatin_h, chLatin_t, chLatin_m, chLatin_l, chNull};\r