X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltoolingtest%2FXMLObjectBaseTestCase.h;h=f6d6f1e6cefa3f1da570da03b52e5f86cb53ba1f;hp=f36c032bda2cc6376cad4295d4709482cf4b3640;hb=e5a84f387d04247eb6938270f0222cf001bb716e;hpb=c5183613326e3d36a544b2941654d0667a29b836

diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index f36c032..f6d6f1e 100644
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,29 @@
 
 #include <cxxtest/TestSuite.h>
 #include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
-#include <xmltooling/AbstractElementProxy.h>
+#include <xmltooling/AbstractComplexElement.h>
+#include <xmltooling/ElementProxy.h>
 #include <xmltooling/exceptions.h>
 #include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/io/AbstractXMLObjectMarshaller.h>
 #include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>
-#ifndef XMLTOOLING_NO_XMLSEC
-    #include <xmltooling/signature/Signature.h>
-#endif
+#include <xmltooling/impl/AnyElement.h>
+#include <xmltooling/impl/UnknownElement.h>
 #include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLConstants.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xmltooling/util/XMLObjectChildrenList.h>
 
+#ifndef XMLTOOLING_NO_XMLSEC
+    #include <xmltooling/signature/Signature.h>
+    using namespace xmlsignature;
+#endif
+
 using namespace xmltooling;
+using namespace xercesc;
 using namespace std;
 
-extern ParserPool* validatingPool;
-extern ParserPool* nonvalidatingPool;
 extern string data_path;
 
 #if defined (_MSC_VER)
@@ -42,31 +46,65 @@ extern string data_path;
     #pragma warning( disable : 4250 4251 )
 #endif
 
-class SimpleXMLObject : public AbstractXMLObjectMarshaller, public AbstractXMLObjectUnmarshaller
+class SimpleXMLObject
+    : public AbstractAttributeExtensibleXMLObject,
+        public AbstractComplexElement,
+        public AbstractDOMCachingXMLObject,
+        public AbstractXMLObjectMarshaller,
+        public AbstractXMLObjectUnmarshaller
 {
+protected:
+    SimpleXMLObject(const SimpleXMLObject& src)
+            : AbstractXMLObject(src), AbstractAttributeExtensibleXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src),
+                m_id(XMLString::replicate(src.m_id)) {
+#ifndef XMLTOOLING_NO_XMLSEC
+        m_children.push_back(nullptr);
+        m_signature=m_children.begin();
+#endif
+        VectorOf(SimpleXMLObject) mine=getSimpleXMLObjects();
+        for (vector<SimpleXMLObject*>::const_iterator i=src.m_simples.begin(); i!=src.m_simples.end(); i++) {
+            mine.push_back(dynamic_cast<SimpleXMLObject*>((*i)->clone()));
+        }
+    }
+
 public:
     static const XMLCh NAMESPACE[];
     static const XMLCh NAMESPACE_PREFIX[];
     static const XMLCh LOCAL_NAME[];
+    static const XMLCh DERIVED_NAME[];
+    static const XMLCh TYPE_NAME[];
     static const XMLCh ID_ATTRIB_NAME[];
 
-    SimpleXMLObject() : AbstractDOMCachingXMLObject(NAMESPACE, LOCAL_NAME, NAMESPACE_PREFIX), m_id(NULL), m_value(NULL) {
+    SimpleXMLObject(
+        const XMLCh* nsURI=nullptr, const XMLCh* localName=nullptr, const XMLCh* prefix=nullptr, const xmltooling::QName* schemaType=nullptr
+        ) : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_id(nullptr) {
 #ifndef XMLTOOLING_NO_XMLSEC
-        m_children.push_back(NULL);
+        m_children.push_back(nullptr);
         m_signature=m_children.begin();
 #endif
     }
 
     virtual ~SimpleXMLObject() {
         XMLString::release(&m_id);
-        XMLString::release(&m_value);
     }
-    
+
+    XMLObject* clone() const {
+        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
+        SimpleXMLObject* ret=dynamic_cast<SimpleXMLObject*>(domClone.get());
+        if (ret) {
+            domClone.release();
+            return ret;
+        }
+
+        return new SimpleXMLObject(*this);
+    }
+
+    const XMLCh* getXMLID() const { return getId(); }
     const XMLCh* getId() const { return m_id; }
     void setId(const XMLCh* id) { m_id=prepareForAssignment(m_id,id); }
 
-    const XMLCh* getValue() const { return m_value; }
-    void setValue(const XMLCh* value) { m_value=prepareForAssignment(m_value,value); }
+    const XMLCh* getValue() const { return getTextContent(); }
+    void setValue(const XMLCh* value) { setTextContent(value); }
 
 #ifndef XMLTOOLING_NO_XMLSEC    
     Signature* getSignature() const {
@@ -82,60 +120,51 @@ public:
         return VectorOf(SimpleXMLObject)(this, m_simples, &m_children, m_children.end());
     }
     
-    SimpleXMLObject* clone() const {
-        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
-        SimpleXMLObject* ret=dynamic_cast<SimpleXMLObject*>(domClone.get());
-        if (ret) {
-            domClone.release();
-            return ret;
-        }
-
-        ret=new SimpleXMLObject();
-        ret->m_namespaces=m_namespaces;
-        ret->setId(m_id);
-        ret->setValue(m_value);
-        xmltooling::clone(m_children, ret->m_children);
-        return ret;
+    const std::vector<SimpleXMLObject*>& getSimpleXMLObjects() const {
+        return m_simples;
     }
 
-    void marshallAttributes(DOMElement* domElement) const {
+protected:
+    void marshallAttributes(xercesc::DOMElement* domElement) const {
         if(getId()) {
-            domElement->setAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME, getId());
-            domElement->setIdAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME);
+            domElement->setAttributeNS(nullptr, SimpleXMLObject::ID_ATTRIB_NAME, getId());
+#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE
+            domElement->setIdAttributeNS(nullptr, SimpleXMLObject::ID_ATTRIB_NAME, true);
+#else
+            domElement->setIdAttributeNS(nullptr, SimpleXMLObject::ID_ATTRIB_NAME);
+#endif
         }
+        marshallExtensionAttributes(domElement);
     }
 
-    void marshallElementContent(DOMElement* domElement) const {
-        if(getValue()) {
-            domElement->setTextContent(getValue());
+    void processChildElement(XMLObject* childXMLObject, const xercesc::DOMElement* root) {
+        SimpleXMLObject* simple=dynamic_cast<SimpleXMLObject*>(childXMLObject);
+        if (simple) {
+            getSimpleXMLObjects().push_back(simple);
+            return;
         }
-    }
-
-    void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
-        if (XMLHelper::isNodeNamed(root, SimpleXMLObject::NAMESPACE, SimpleXMLObject::LOCAL_NAME))
-            getSimpleXMLObjects().push_back(dynamic_cast<SimpleXMLObject*>(childXMLObject));
+        
 #ifndef XMLTOOLING_NO_XMLSEC
-        else if (XMLHelper::isNodeNamed(root, XMLConstants::XMLSIG_NS, Signature::LOCAL_NAME))
-            setSignature(dynamic_cast<Signature*>(childXMLObject));
+        Signature* sig=dynamic_cast<Signature*>(childXMLObject);
+        if (sig) {
+            setSignature(sig);
+            return;
+        }
 #endif
-        else
-            throw UnmarshallingException("Unknown child element cannot be added to parent object.");
-    }
 
-    void processAttribute(const DOMAttr* attribute) {
-        if (XMLHelper::isNodeNamed(attribute, NULL, SimpleXMLObject::ID_ATTRIB_NAME))
-            setId(attribute->getValue());
-        else
-            throw UnmarshallingException("Unknown attribute cannot be processed by parent object.");
+        throw UnmarshallingException("Unknown child element cannot be added to parent object.");
     }
 
-    void processElementContent(const XMLCh* elementContent) {
-        setValue(elementContent);
+    void processAttribute(const xercesc::DOMAttr* attribute) {
+        if (XMLHelper::isNodeNamed(attribute, nullptr, SimpleXMLObject::ID_ATTRIB_NAME)) {
+            setId(attribute->getValue());
+            return;
+        }
+        unmarshallExtensionAttribute(attribute);
     }
 
 private:
     XMLCh* m_id;
-    XMLCh* m_value;
     vector<SimpleXMLObject*> m_simples;
 #ifndef XMLTOOLING_NO_XMLSEC
     list<XMLObject*>::iterator m_signature;
@@ -145,76 +174,23 @@ private:
 class SimpleXMLObjectBuilder : public XMLObjectBuilder
 {
 public:
-    SimpleXMLObject* buildObject(const DOMElement* e=NULL) const {
-        return new SimpleXMLObject();
+    XMLObject* buildObject() const {
+        return buildObject(SimpleXMLObject::NAMESPACE, SimpleXMLObject::LOCAL_NAME, SimpleXMLObject::NAMESPACE_PREFIX);
     }
-};
 
-class WildcardXMLObject : public AbstractElementProxy, public AbstractAttributeExtensibleXMLObject,
-    public AbstractXMLObjectMarshaller, public AbstractXMLObjectUnmarshaller
-{
-public:
-    WildcardXMLObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix)
-        : AbstractDOMCachingXMLObject(nsURI, localName, prefix),
-        AbstractElementProxy(nsURI, localName, prefix),
-        AbstractAttributeExtensibleXMLObject(nsURI, localName, prefix) {}
-    virtual ~WildcardXMLObject() {}
-    
-    WildcardXMLObject* clone() const {
-        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
-        WildcardXMLObject* ret=dynamic_cast<WildcardXMLObject*>(domClone.get());
-        if (ret) {
-            domClone.release();
-            return ret;
-        }
-
-        ret=new WildcardXMLObject(
-            getElementQName().getNamespaceURI(),getElementQName().getLocalPart(),getElementQName().getPrefix()
-            );
-        ret->m_namespaces=m_namespaces;
-        for (map<QName,XMLCh*>::const_iterator i=m_attributeMap.begin(); i!=m_attributeMap.end(); i++) {
-            ret->m_attributeMap[i->first]=XMLString::replicate(i->second);
-        }
-        ret->setTextContent(getTextContent());
-        xmltooling::clone(m_children, ret->m_children);
-        return ret;
+    XMLObject* buildObject(
+        const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=nullptr, const xmltooling::QName* schemaType=nullptr
+        ) const {
+        return new SimpleXMLObject(nsURI, localName, prefix, schemaType);
     }
 
-    void marshallAttributes(DOMElement* domElement) const {
-        for (map<QName,XMLCh*>::const_iterator i=m_attributeMap.begin(); i!=m_attributeMap.end(); i++) {
-            DOMAttr* attr=domElement->getOwnerDocument()->createAttributeNS(i->first.getNamespaceURI(),i->first.getLocalPart());
-            if (i->first.hasPrefix())
-                attr->setPrefix(i->first.getPrefix());
-            attr->setNodeValue(i->second);
-            domElement->setAttributeNode(attr);
-        }
-    }
-
-    void marshallElementContent(DOMElement* domElement) const {
-        if(getTextContent()) {
-            domElement->appendChild(domElement->getOwnerDocument()->createTextNode(getTextContent()));
-        }
-    }
-
-    void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
-        getXMLObjects().push_back(childXMLObject);
-    }
-
-    void processAttribute(const DOMAttr* attribute) {
-        QName q(attribute->getNamespaceURI(),attribute->getLocalName(),attribute->getPrefix()); 
-        setAttribute(q,attribute->getNodeValue());
-    }
-
-    void processElementContent(const XMLCh* elementContent) {
-        setTextContent(elementContent);
-    }
-};
-
-class WildcardXMLObjectBuilder : public XMLObjectBuilder
-{
-public:
-    WildcardXMLObject* buildObject(const DOMElement* e=NULL) const {
-        return new WildcardXMLObject(e->getNamespaceURI(),e->getLocalName(),e->getPrefix());
+    static SimpleXMLObject* buildSimpleXMLObject() {
+        const SimpleXMLObjectBuilder* b = dynamic_cast<const SimpleXMLObjectBuilder*>(
+            XMLObjectBuilder::getBuilder(xmltooling::QName(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME))
+            );
+        if (b)
+            return dynamic_cast<SimpleXMLObject*>(b->buildObject());
+        throw XMLObjectException("Unable to obtain typed builder for SimpleXMLObject.");
     }
 };