X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FXMLObjectBaseTestCase.h;h=1962683c96dd350fb113876601f6f7d49e5a8add;hb=ce200eaef5c771e132b64437d78540bfd4683572;hp=b0088f50b04cc43d77bce1e40205f3000bdb1a97;hpb=2d4144a048a3f248b688e19e1e303d4ee7047090;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index b0088f5..1962683 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.
@@ -15,6 +15,7 @@
  */
 
 #include <cxxtest/TestSuite.h>
+#include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
 #include <xmltooling/AbstractComplexElement.h>
 #include <xmltooling/ElementProxy.h>
 #include <xmltooling/exceptions.h>
@@ -35,10 +36,9 @@
 #endif
 
 using namespace xmltooling;
+using namespace xercesc;
 using namespace std;
 
-extern ParserPool* validatingPool;
-extern ParserPool* nonvalidatingPool;
 extern string data_path;
 
 #if defined (_MSC_VER)
@@ -47,21 +47,23 @@ extern string data_path;
 #endif
 
 class SimpleXMLObject
-    : public AbstractComplexElement,
+    : public AbstractAttributeExtensibleXMLObject,
+        public AbstractComplexElement,
         public AbstractDOMCachingXMLObject,
         public AbstractXMLObjectMarshaller,
         public AbstractXMLObjectUnmarshaller
 {
 protected:
-    SimpleXMLObject(const SimpleXMLObject& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src),
-        m_id(XMLString::replicate(src.m_id)), m_value(XMLString::replicate(src.m_value)) {
+    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(NULL);
         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((*i) ? (*i)->clone() : NULL);
+            mine.push_back(dynamic_cast<SimpleXMLObject*>((*i)->clone()));
         }
     }
 
@@ -74,8 +76,8 @@ public:
     static const XMLCh ID_ATTRIB_NAME[];
 
     SimpleXMLObject(
-        const XMLCh* nsURI=NULL, const XMLCh* localName=NULL, const XMLCh* prefix=NULL, const QName* schemaType=NULL
-        ) : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_id(NULL), m_value(NULL) {
+        const XMLCh* nsURI=NULL, const XMLCh* localName=NULL, const XMLCh* prefix=NULL, const xmltooling::QName* schemaType=NULL
+        ) : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_id(NULL) {
 #ifndef XMLTOOLING_NO_XMLSEC
         m_children.push_back(NULL);
         m_signature=m_children.begin();
@@ -84,10 +86,9 @@ public:
 
     virtual ~SimpleXMLObject() {
         XMLString::release(&m_id);
-        XMLString::release(&m_value);
     }
 
-    SimpleXMLObject* clone() const {
+    XMLObject* clone() const {
         auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
         SimpleXMLObject* ret=dynamic_cast<SimpleXMLObject*>(domClone.get());
         if (ret) {
@@ -98,11 +99,12 @@ public:
         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 {
@@ -123,20 +125,19 @@ public:
     }
 
 protected:
-    void marshallAttributes(DOMElement* domElement) const {
+    void marshallAttributes(xercesc::DOMElement* domElement) const {
         if(getId()) {
             domElement->setAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME, getId());
+#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE
+            domElement->setIdAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME, true);
+#else
             domElement->setIdAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME);
+#endif
         }
+        marshallExtensionAttributes(domElement);
     }
 
-    void marshallElementContent(DOMElement* domElement) const {
-        if(getValue()) {
-            domElement->setTextContent(getValue());
-        }
-    }
-
-    void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
+    void processChildElement(XMLObject* childXMLObject, const xercesc::DOMElement* root) {
         SimpleXMLObject* simple=dynamic_cast<SimpleXMLObject*>(childXMLObject);
         if (simple) {
             getSimpleXMLObjects().push_back(simple);
@@ -154,20 +155,16 @@ protected:
         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))
+    void processAttribute(const xercesc::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.");
-    }
-
-    void processElementContent(const XMLCh* elementContent) {
-        setValue(elementContent);
+            return;
+        }
+        unmarshallExtensionAttribute(attribute);
     }
 
 private:
     XMLCh* m_id;
-    XMLCh* m_value;
     vector<SimpleXMLObject*> m_simples;
 #ifndef XMLTOOLING_NO_XMLSEC
     list<XMLObject*>::iterator m_signature;
@@ -177,24 +174,24 @@ private:
 class SimpleXMLObjectBuilder : public XMLObjectBuilder
 {
 public:
-    SimpleXMLObject* buildObject() const {
+    XMLObject* buildObject() const {
         return buildObject(SimpleXMLObject::NAMESPACE, SimpleXMLObject::LOCAL_NAME, SimpleXMLObject::NAMESPACE_PREFIX);
     }
 
-    SimpleXMLObject* buildObject(
-        const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const QName* schemaType=NULL
+    XMLObject* buildObject(
+        const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const xmltooling::QName* schemaType=NULL
         ) const {
         return new SimpleXMLObject(nsURI, localName, prefix, schemaType);
     }
 
-    static SimpleXMLObject* newSimpleXMLObject() {
-        const SimpleXMLObjectBuilder* b = dynamic_cast<const SimpleXMLObjectBuilder*>(
-            XMLObjectBuilder::getBuilder(QName(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME))
-            );
-        if (b)
-            return b->buildObject();
-        throw XMLObjectException("Unable to obtain typed builder for SimpleXMLObject.");
-    }
+    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.");
+    }
 };
 
 #if defined (_MSC_VER)