You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/08/31 10:52:20 UTC
svn commit: r264976 - in /xerces/c/trunk: samples/src/PSVIWriter/
src/xercesc/dom/ src/xercesc/dom/impl/ src/xercesc/parsers/
tests/src/DOM/DOMTest/ tests/src/DOM/TypeInfo/
Author: amassari
Date: Wed Aug 31 01:50:57 2005
New Revision: 264976
URL: http://svn.apache.org/viewcvs?rev=264976&view=rev
Log:
DOM L3 Core: DOMElement, DOMAttr and DOMText
Modified:
xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
xerces/c/trunk/src/xercesc/dom/DOMAttr.hpp
xerces/c/trunk/src/xercesc/dom/DOMElement.hpp
xerces/c/trunk/src/xercesc/dom/DOMText.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp
Modified: xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp (original)
+++ xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp Wed Aug 31 01:50:57 2005
@@ -928,7 +928,7 @@
sendElementValue(PSVIUni::fgPrefix, attr->getPrefix());
sendElementValue(PSVIUni::fgNormalizedValue, attr->getValue());
sendElementValue(PSVIUni::fgSpecified, translateBool(attr->getSpecified()));
- sendElementValue(PSVIUni::fgAttributeType, attr->getTypeInfo()->getTypeName());
+ sendElementValue(PSVIUni::fgAttributeType, attr->getSchemaTypeInfo()->getTypeName());
sendElementEmpty(PSVIUni::fgReferences);
sendUnindentedElement(PSVIUni::fgAttribute);
}
@@ -951,7 +951,7 @@
sendElementValue(PSVIUni::fgPrefix, attr->getPrefix());
sendElementValue(PSVIUni::fgNormalizedValue, attr->getValue());
sendElementValue(PSVIUni::fgSpecified, translateBool(attr->getSpecified()));
- sendElementValue(PSVIUni::fgAttributeType, attr->getTypeInfo()->getTypeName());
+ sendElementValue(PSVIUni::fgAttributeType, attr->getSchemaTypeInfo()->getTypeName());
sendElementEmpty(PSVIUni::fgReferences);
sendUnindentedElement(PSVIUni::fgAttribute);
}
Modified: xerces/c/trunk/src/xercesc/dom/DOMAttr.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOMAttr.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMAttr.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMAttr.hpp Wed Aug 31 01:50:57 2005
@@ -149,9 +149,7 @@
/**
* Returns whether this attribute is known to be of type ID or not.
* When it is and its value is unique, the ownerElement of this attribute
- * can be retrieved using getElementById on Document.
- *
- * <p><b>"Experimental - subject to change"</b></p>
+ * can be retrieved using getElementById on DOMDocument.
*
* @return <code>bool</code> stating if this <code>DOMAttr</code> is an ID
* @since DOM level 3
@@ -162,12 +160,10 @@
/**
* Returns the type information associated with this attribute.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @return the <code>DOMTypeInfo</code> associated with this attribute
* @since DOM level 3
*/
- virtual const DOMTypeInfo * getTypeInfo() const = 0;
+ virtual const DOMTypeInfo * getSchemaTypeInfo() const = 0;
//@}
Modified: xerces/c/trunk/src/xercesc/dom/DOMElement.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOMElement.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMElement.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMElement.hpp Wed Aug 31 01:50:57 2005
@@ -388,75 +388,78 @@
//@{
/**
- * Declares the <code>DOMAttr</code> specified by name to be of type ID. If the
- * value of the specified <code>DOMAttr</code> is unique then this element node
- * can later be retrieved using getElementById on Document. Note, however,
- * that this simply affects this node and does not change any grammar that
- * may be in use.
+ * If the parameter isId is <code>true</code>, this method declares the specified
+ * attribute to be a user-determined ID attribute.
+ * This affects the value of <code>DOMAttr::isId</code> and the behavior of
+ * <code>DOMDocument::getElementById</code>, but does not change any schema that
+ * may be in use, in particular this does not affect the <code>DOMAttr::getSchemaTypeInfo</code>
+ * of the specified DOMAttr node. Use the value <code>false</code> for the parameter isId
+ * to undeclare an attribute for being a user-determined ID attribute.
* To specify an <code>DOMAttr</code> by local name and namespace URI, use the
* setIdAttributeNS method.
+ *
* @param name The name of the <code>DOMAttr</code>.
+ * @param isId Whether the attribute is of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code>
* of this element.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
- virtual void setIdAttribute(const XMLCh* name) = 0;
+ virtual void setIdAttribute(const XMLCh* name, bool isId) = 0;
/**
- * Declares the <code>DOMAttr</code> specified by local name and namespace
- * URI to be of type ID. If the value of the specified <code>DOMAttr</code>
- * is unique then this <code>DOMElement</code> node can later be retrieved
- * using getElementById on <code>DOMDocument</code>. Note, however, that
- * this simply affects this node and does not change any grammar that may
- * be in use.
+ * If the parameter isId is <code>true</code>, this method declares the specified
+ * attribute to be a user-determined ID attribute.
+ * This affects the value of <code>DOMAttr::isId</code> and the behavior of
+ * <code>DOMDocument::getElementById</code>, but does not change any schema that
+ * may be in use, in particular this does not affect the <code>DOMAttr::getSchemaTypeInfo</code>
+ * of the specified DOMAttr node. Use the value <code>false</code> for the parameter isId
+ * to undeclare an attribute for being a user-determined ID attribute.
+ *
* @param namespaceURI The namespace URI of the <code>DOMAttr</code>.
* @param localName The local name of the <code>DOMAttr</code>.
+ * @param isId Whether the attribute is of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
- virtual void setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName) = 0;
+ virtual void setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName, bool isId) = 0;
/**
- * Declares the <code>DOMAttr</code> specified by node to be of type ID.
- * If the value of the specified <code>DOMAttr</code> is unique then this
- * <code>DOMElement</code> node can later be retrieved using getElementById
- * on <code>DOMDocument</code>. Note, however, that this simply affects this
- * node and does not change any grammar that may be in use.
+ * If the parameter isId is <code>true</code>, this method declares the specified
+ * attribute to be a user-determined ID attribute.
+ * This affects the value of <code>DOMAttr::isId</code> and the behavior of
+ * <code>DOMDocument::getElementById</code>, but does not change any schema that
+ * may be in use, in particular this does not affect the <code>DOMAttr::getSchemaTypeInfo</code>
+ * of the specified DOMAttr node. Use the value <code>false</code> for the parameter isId
+ * to undeclare an attribute for being a user-determined ID attribute.
+ *
* @param idAttr The <code>DOMAttr</code> node.
+ * @param isId Whether the attribute is of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
- virtual void setIdAttributeNode(const DOMAttr *idAttr) = 0;
+ virtual void setIdAttributeNode(const DOMAttr *idAttr, bool isId) = 0;
/**
* Returns the type information associated with this element.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @return the <code>DOMTypeInfo</code> associated with this element
* @since DOM level 3
*/
- virtual const DOMTypeInfo* getTypeInfo() const = 0;
+ virtual const DOMTypeInfo* getSchemaTypeInfo() const = 0;
//@}
Modified: xerces/c/trunk/src/xercesc/dom/DOMText.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOMText.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMText.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMText.hpp Wed Aug 31 01:50:57 2005
@@ -109,25 +109,19 @@
/** @name Functions introduced in DOM Level 3 */
//@{
/**
- * Returns whether this text node contains whitespace in element content,
- * often abusively called "ignorable whitespace". An implementation can
- * only return <code>true</code> if, one way or another, it has access
- * to the relevant information (e.g., the DTD or schema).
+ * Returns whether this text node contains element content whitespace,
+ * often abusively called "ignorable whitespace". The text node is determined
+ * to contain whitespace in element content during the load of the document
+ * or if validation occurs while using <code>DOMDocument::normalizeDocument()</code>.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * <br> This attribute represents the property [element content
- * whitespace] defined in .
* @since DOM Level 3
*/
- virtual bool getIsWhitespaceInElementContent() const = 0;
+ virtual bool getIsElementContentWhitespace() const = 0;
/**
* Returns all text of <code>DOMText</code> nodes logically-adjacent text
* nodes to this node, concatenated in document order.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
virtual const XMLCh* getWholeText() = 0;
@@ -136,8 +130,6 @@
* Substitutes the a specified text for the text of the current node and
* all logically-adjacent text nodes.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* <br>This method returns the node in the hierarchy which received the
* replacement text, which is null if the text was empty or is the
* current node if the current node is not read-only or otherwise is a
@@ -154,6 +146,7 @@
* method must fail before performing any modification of the document,
* raising a <code>DOMException</code> with the code
* <code>NO_MODIFICATION_ALLOWED_ERR</code>.
+ *
* @param content The content of the replacing <code>DOMText</code> node.
* @return The <code>DOMText</code> node created with the specified content.
* @exception DOMException
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp Wed Aug 31 01:50:57 2005
@@ -286,7 +286,7 @@
}
}
-const DOMTypeInfo *DOMAttrImpl::getTypeInfo() const
+const DOMTypeInfo *DOMAttrImpl::getSchemaTypeInfo() const
{
if(!fSchemaType)
return &DOMTypeInfoImpl::g_DtdNotValidatedAttribute;
@@ -295,7 +295,7 @@
}
-void DOMAttrImpl::setTypeInfo(const DOMTypeInfoImpl* typeInfo)
+void DOMAttrImpl::setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo)
{
fSchemaType = typeInfo;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp Wed Aug 31 01:50:57 2005
@@ -63,23 +63,21 @@
DOMNODE_FUNCTIONS;
virtual const XMLCh * getName() const;
- virtual bool getSpecified() const;
- virtual const XMLCh * getValue() const;
- virtual void setSpecified(bool arg);
- virtual void setValue(const XMLCh * value);
- virtual bool isId() const;
+ virtual bool getSpecified() const;
+ virtual const XMLCh * getValue() const;
+ virtual void setSpecified(bool arg);
+ virtual void setValue(const XMLCh * value);
+ virtual DOMElement * getOwnerElement() const;
+ virtual bool isId() const;
+ virtual const DOMTypeInfo* getSchemaTypeInfo() const;
- //Introduced in DOM Level 2
- DOMElement *getOwnerElement() const;
void setOwnerElement(DOMElement *ownerElem); //internal use only
// helper function for DOM Level 3 renameNode
virtual DOMNode* rename(const XMLCh* namespaceURI, const XMLCh* name);
- virtual const DOMTypeInfo* getTypeInfo() const;
-
//helper function for DOM Level 3 TypeInfo
- virtual void setTypeInfo(const DOMTypeInfoImpl* typeInfo);
+ virtual void setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo);
// helper method that sets this attr to an idnode and places it into the document map
virtual void addAttrToIDNodeMap();
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp Wed Aug 31 01:50:57 2005
@@ -228,7 +228,7 @@
newAttr->setNodeValue(val);
}
-void DOMElementImpl::setIdAttribute(const XMLCh* name)
+void DOMElementImpl::setIdAttribute(const XMLCh* name, bool isId)
{
if (fNode.isReadOnly())
throw DOMException(
@@ -239,10 +239,13 @@
if (!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
- ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
+ if(isId)
+ ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
+ else
+ ((DOMAttrImpl *)attr)->removeAttrFromIDNodeMap();
}
-void DOMElementImpl::setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName) {
+void DOMElementImpl::setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName, bool isId) {
if (fNode.isReadOnly())
throw DOMException(
@@ -253,12 +256,14 @@
if (!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
- ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
-
+ if(isId)
+ ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
+ else
+ ((DOMAttrImpl *)attr)->removeAttrFromIDNodeMap();
}
-void DOMElementImpl::setIdAttributeNode(const DOMAttr *idAttr) {
+void DOMElementImpl::setIdAttributeNode(const DOMAttr *idAttr, bool isId) {
if (fNode.isReadOnly())
throw DOMException(
@@ -274,7 +279,10 @@
if(!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
- ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
+ if(isId)
+ ((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
+ else
+ ((DOMAttrImpl *)attr)->removeAttrFromIDNodeMap();
}
@@ -644,7 +652,7 @@
}
}
-const DOMTypeInfo *DOMElementImpl::getTypeInfo() const
+const DOMTypeInfo *DOMElementImpl::getSchemaTypeInfo() const
{
return &DOMTypeInfoImpl::g_DtdValidatedElement;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp Wed Aug 31 01:50:57 2005
@@ -98,10 +98,10 @@
const XMLCh *localName) const;
//Introduced in DOM level 3
- virtual void setIdAttribute(const XMLCh* name);
- virtual void setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName);
- virtual void setIdAttributeNode(const DOMAttr *idAttr);
- virtual const DOMTypeInfo * getTypeInfo() const;
+ virtual void setIdAttribute(const XMLCh* name, bool isId);
+ virtual void setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName, bool isId);
+ virtual void setIdAttributeNode(const DOMAttr *idAttr, bool isId);
+ virtual const DOMTypeInfo * getSchemaTypeInfo() const;
// for handling of default attribute
virtual DOMAttr* setDefaultAttributeNode(DOMAttr *newAttr);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.cpp Wed Aug 31 01:50:57 2005
@@ -246,14 +246,14 @@
this -> fNamespaceURI = (URI == 0) ? 0 : ownerDoc->getPooledString(URI);
}
-const DOMTypeInfo *DOMElementNSImpl::getTypeInfo() const
+const DOMTypeInfo *DOMElementNSImpl::getSchemaTypeInfo() const
{
if(!fSchemaType)
return &DOMTypeInfoImpl::g_DtdValidatedElement;
return fSchemaType;
}
-void DOMElementNSImpl::setTypeInfo(const DOMTypeInfoImpl* typeInfo)
+void DOMElementNSImpl::setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo)
{
fSchemaType = typeInfo;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp Wed Aug 31 01:50:57 2005
@@ -65,14 +65,14 @@
//Introduced in DOM Level 3
virtual const XMLCh *getBaseURI() const;
- virtual const DOMTypeInfo * getTypeInfo() const;
+ virtual const DOMTypeInfo * getSchemaTypeInfo() const;
// helper function for DOM Level 3 renameNode
virtual DOMNode* rename(const XMLCh* namespaceURI, const XMLCh* name);
void setName(const XMLCh* namespaceURI, const XMLCh* name);
//helper function for DOM Level 3 TypeInfo
- virtual void setTypeInfo(const DOMTypeInfoImpl* typeInfo);
+ virtual void setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo);
private:
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp Wed Aug 31 01:50:57 2005
@@ -125,7 +125,7 @@
}
-bool DOMTextImpl::getIsWhitespaceInElementContent() const
+bool DOMTextImpl::getIsElementContentWhitespace() const
{
return isIgnorableWhitespace();
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp Wed Aug 31 01:50:57 2005
@@ -55,7 +55,7 @@
virtual ~DOMTextImpl();
virtual DOMText* splitText(XMLSize_t offset);
// DOM Level 3
- virtual bool getIsWhitespaceInElementContent() const;
+ virtual bool getIsElementContentWhitespace() const;
virtual const XMLCh* getWholeText();
virtual DOMText* replaceWholeText(const XMLCh* content);
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp Wed Aug 31 01:50:57 2005
@@ -664,7 +664,7 @@
typeInfo->setStringProperty(DOMPSVITypeInfo::PSVI_Schema_Default, fDocument->getPooledString(elementInfo->getSchemaDefault()));
typeInfo->setStringProperty(DOMPSVITypeInfo::PSVI_Schema_Normalized_Value, fDocument->getPooledString(elementInfo->getSchemaNormalizedValue()));
typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Schema_Specified, true);
- ((DOMElementNSImpl*)fCurrentParent)->setTypeInfo(typeInfo);
+ ((DOMElementNSImpl*)fCurrentParent)->setSchemaTypeInfo(typeInfo);
}
if(fPSVIHandler)
fPSVIHandler->handleElementPSVI(localName, uri, elementInfo);
@@ -721,7 +721,7 @@
typeInfo->setStringProperty(DOMPSVITypeInfo::PSVI_Schema_Default, fDocument->getPooledString(attrInfo->getSchemaDefault()));
typeInfo->setStringProperty(DOMPSVITypeInfo::PSVI_Schema_Normalized_Value, fDocument->getPooledString(attrInfo->getSchemaNormalizedValue()));
typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Schema_Specified, true);
- ((DOMAttrImpl*)pAttrNode)->setTypeInfo(typeInfo);
+ ((DOMAttrImpl*)pAttrNode)->setSchemaTypeInfo(typeInfo);
}
}
}
@@ -995,17 +995,17 @@
{
switch(oneAttrib->getType())
{
- case XMLAttDef::CData: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedCDATAAttribute); break;
- case XMLAttDef::ID: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDAttribute); break;
- case XMLAttDef::IDRef: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFAttribute); break;
- case XMLAttDef::IDRefs: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFSAttribute); break;
- case XMLAttDef::Entity: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITYAttribute); break;
- case XMLAttDef::Entities: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITIESAttribute); break;
- case XMLAttDef::NmToken: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENAttribute); break;
- case XMLAttDef::NmTokens: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENSAttribute); break;
- case XMLAttDef::Notation: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNOTATIONAttribute); break;
- case XMLAttDef::Enumeration: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENUMERATIONAttribute); break;
- default: attr->setTypeInfo(&DOMTypeInfoImpl::g_DtdNotValidatedAttribute); break;
+ case XMLAttDef::CData: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedCDATAAttribute); break;
+ case XMLAttDef::ID: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDAttribute); break;
+ case XMLAttDef::IDRef: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFAttribute); break;
+ case XMLAttDef::IDRefs: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFSAttribute); break;
+ case XMLAttDef::Entity: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITYAttribute); break;
+ case XMLAttDef::Entities: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITIESAttribute); break;
+ case XMLAttDef::NmToken: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENAttribute); break;
+ case XMLAttDef::NmTokens: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENSAttribute); break;
+ case XMLAttDef::Notation: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNOTATIONAttribute); break;
+ case XMLAttDef::Enumeration: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENUMERATIONAttribute); break;
+ default: attr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdNotValidatedAttribute); break;
}
}
}
@@ -1073,17 +1073,17 @@
{
switch(attr->getType())
{
- case XMLAttDef::CData: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedCDATAAttribute); break;
- case XMLAttDef::ID: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDAttribute); break;
- case XMLAttDef::IDRef: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFAttribute); break;
- case XMLAttDef::IDRefs: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFSAttribute); break;
- case XMLAttDef::Entity: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITYAttribute); break;
- case XMLAttDef::Entities: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITIESAttribute); break;
- case XMLAttDef::NmToken: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENAttribute); break;
- case XMLAttDef::NmTokens: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENSAttribute); break;
- case XMLAttDef::Notation: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNOTATIONAttribute); break;
- case XMLAttDef::Enumeration: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENUMERATIONAttribute); break;
- default: insertAttr->setTypeInfo(&DOMTypeInfoImpl::g_DtdNotValidatedAttribute); break;
+ case XMLAttDef::CData: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedCDATAAttribute); break;
+ case XMLAttDef::ID: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDAttribute); break;
+ case XMLAttDef::IDRef: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFAttribute); break;
+ case XMLAttDef::IDRefs: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedIDREFSAttribute); break;
+ case XMLAttDef::Entity: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITYAttribute); break;
+ case XMLAttDef::Entities: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENTITIESAttribute); break;
+ case XMLAttDef::NmToken: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENAttribute); break;
+ case XMLAttDef::NmTokens: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNMTOKENSAttribute); break;
+ case XMLAttDef::Notation: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedNOTATIONAttribute); break;
+ case XMLAttDef::Enumeration: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdValidatedENUMERATIONAttribute); break;
+ default: insertAttr->setSchemaTypeInfo(&DOMTypeInfoImpl::g_DtdNotValidatedAttribute); break;
}
}
}
Modified: xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp Wed Aug 31 01:50:57 2005
@@ -1430,12 +1430,19 @@
OK = false;
}
- testElementNode->setIdAttributeNode(idAtt);
+ testElementNode->setIdAttributeNode(idAtt,true);
if(!idAtt->isId()) {
fprintf(stderr, "isID failed in line %i\n", __LINE__);
OK = false;
}
+
+ testElementNode->setIdAttributeNode(idAtt,false);
+
+ if(idAtt->isId()) {
+ fprintf(stderr, "isID failed in line %i\n", __LINE__);
+ OK = false;
+ }
//clean up
testElementNode->removeAttributeNode(idAtt);
@@ -3265,16 +3272,16 @@
DOMAttr *idAtt = document->createAttributeNS(tempStr4, tempStr5);
//tests for node not being on testElementNode
- EXCEPTIONSTEST(testElementNode->setIdAttribute(tempStr4), DOMException::NOT_FOUND_ERR, OK, 1000);
- EXCEPTIONSTEST(testElementNode->setIdAttributeNS(tempStr4, tempStr5), DOMException::NOT_FOUND_ERR, OK, 1001);
- EXCEPTIONSTEST(testElementNode->setIdAttributeNode(idAtt), DOMException::NOT_FOUND_ERR, OK, 1002);
+ EXCEPTIONSTEST(testElementNode->setIdAttribute(tempStr4, true), DOMException::NOT_FOUND_ERR, OK, 1000);
+ EXCEPTIONSTEST(testElementNode->setIdAttributeNS(tempStr4, tempStr5, true), DOMException::NOT_FOUND_ERR, OK, 1001);
+ EXCEPTIONSTEST(testElementNode->setIdAttributeNode(idAtt, true), DOMException::NOT_FOUND_ERR, OK, 1002);
//should test NO_MODIFICATION_ALLOWED_ERR but dont know how to without direct access to DOMAttrImpl.
idAtt = document->createAttributeNS(tempStr4, tempStr5);
idAtt->setValue(tempStr3);
testElementNode->setAttributeNode(idAtt);
- testElementNode->setIdAttributeNode(idAtt);
+ testElementNode->setIdAttributeNode(idAtt, true);
if(!idAtt->isId()) {
fprintf(stderr, "setIdAttributeNode failed in line %i\n", __LINE__);
@@ -3288,6 +3295,20 @@
OK = false;
}
+ testElementNode->setIdAttributeNode(idAtt, false);
+
+ if(idAtt->isId()) {
+ fprintf(stderr, "setIdAttributeNode failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
+ idEle = document->getElementById(tempStr3);
+
+ if(idEle) {
+ fprintf(stderr, "setIdAttributeNode failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
testElementNode->removeAttributeNode(idAtt);
@@ -3295,7 +3316,7 @@
idAtt = document->createAttributeNS(tempStr4, tempStr5);
idAtt->setValue(tempStr3);
testElementNode->setAttributeNode(idAtt);
- testElementNode->setIdAttributeNS(tempStr4, tempStr5);
+ testElementNode->setIdAttributeNS(tempStr4, tempStr5, true);
if(!idAtt->isId()) {
fprintf(stderr, "setIdAttributeNS failed in line %i\n", __LINE__);
@@ -3309,6 +3330,20 @@
OK = false;
}
+ testElementNode->setIdAttributeNS(tempStr4, tempStr5, false);
+
+ if(idAtt->isId()) {
+ fprintf(stderr, "setIdAttributeNS failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
+ idEle = document->getElementById(tempStr3);
+
+ if(idEle) {
+ fprintf(stderr, "setIdAttributeNS failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
testElementNode->removeAttributeNode(idAtt);
idAtt->release();
@@ -3317,7 +3352,7 @@
idAtt = document->createAttribute(tempStr5);
idAtt->setValue(tempStr3);
testElementNode->setAttributeNode(idAtt);
- testElementNode->setIdAttribute(tempStr5);
+ testElementNode->setIdAttribute(tempStr5, true);
if(!idAtt->isId()) {
fprintf(stderr, "setIdAttribute failed in line %i\n", __LINE__);
@@ -3327,6 +3362,20 @@
idEle = document->getElementById(tempStr3);
if(!idEle || !idEle->isSameNode(testElementNode)) {
+ fprintf(stderr, "setIdAttribute failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
+ testElementNode->setIdAttribute(tempStr5, false);
+
+ if(idAtt->isId()) {
+ fprintf(stderr, "setIdAttribute failed in line %i\n", __LINE__);
+ OK = false;
+ }
+
+ idEle = document->getElementById(tempStr3);
+
+ if(idEle) {
fprintf(stderr, "setIdAttribute failed in line %i\n", __LINE__);
OK = false;
}
Modified: xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp?rev=264976&r1=264975&r2=264976&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp Wed Aug 31 01:50:57 2005
@@ -159,159 +159,158 @@
bool passed = true;
DOMElement *testEle = findElement(X("attrTest"));
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("attrTestType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("attrTestType"), X(""), __LINE__);
DOMAttr *testAttr;
testAttr = testEle->getAttributeNodeNS(0, X("anySimpleType"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_ANYSIMPLETYPE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_ANYSIMPLETYPE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("string"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("boolean"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_BOOLEAN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_BOOLEAN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("decimal"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DECIMAL, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DECIMAL, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("float"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_FLOAT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_FLOAT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("double"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DOUBLE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DOUBLE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("duration"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DURATION, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DURATION, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("dateTime"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DATETIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DATETIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("time"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_TIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_TIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("date"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DATE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DATE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("gYearMonth"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_YEARMONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_YEARMONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("gYear"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_YEAR, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_YEAR, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("gMonthDay"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_MONTHDAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_MONTHDAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("gDay"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_DAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_DAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("gMonth"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_MONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_MONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("hexBinary"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_HEXBINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_HEXBINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("base64Binary"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_BASE64BINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_BASE64BINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("anyURI"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("QName"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_QNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
-
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_QNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("normalizedString"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NORMALIZEDSTRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NORMALIZEDSTRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("token"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_TOKEN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_TOKEN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("language"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_LANGUAGE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_LANGUAGE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("NMTOKEN"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgNmTokenString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgNmTokenString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("NMTOKENS"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgNmTokensString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgNmTokensString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("Name"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("NCName"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NCNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NCNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("ID"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgIDString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgIDString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("IDREF"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgIDRefString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgIDRefString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("IDREFS"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgIDRefsString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgIDRefsString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
if(DTDPresent) {
testAttr = testEle->getAttributeNodeNS(0, X("ENTITY"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgEntityString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgEntityString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("ENTITIES"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), XMLUni::fgEntitiesString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), XMLUni::fgEntitiesString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
}
testAttr = testEle->getAttributeNodeNS(0, X("integer"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("nonPositiveInteger"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NONPOSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NONPOSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("negativeInteger"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("long"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_LONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_LONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("int"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_INT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_INT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("short"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_SHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_SHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("byte"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_BYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_BYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("nonNegativeInteger"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_NONNEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_NONNEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("unsignedLong"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_ULONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_ULONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("unsignedInt"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_UINT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_UINT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("unsignedShort"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_USHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_USHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("unsignedByte"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_UBYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_UBYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("positiveInteger"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_POSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_POSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
//couple of defaulted ones
testAttr = testEle->getAttributeNodeNS(0, X("defaultString"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("defaultInt"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
//ns attr
testAttr = testEle->getAttributeNodeNS(X("http://www.w3.org/2000/xmlns/"), X("prefix"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X("http://www.w3.org/2001/XMLSchema-instance"), X("noNamespaceSchemaLocation"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
return passed;
}
@@ -326,120 +325,120 @@
DOMElement *testEle = findElement(X("eleTest"));
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_BOOLEAN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_BOOLEAN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DECIMAL, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DECIMAL, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_FLOAT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_FLOAT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DOUBLE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DOUBLE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DURATION, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DURATION, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DATETIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DATETIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_TIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_TIME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DATE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DATE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_YEARMONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_YEARMONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_YEAR, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_YEAR, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_MONTHDAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_MONTHDAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_DAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_DAY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_MONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_MONTH, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_HEXBINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_HEXBINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_BASE64BINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_BASE64BINARY, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_ANYURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_QNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_QNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NORMALIZEDSTRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NORMALIZEDSTRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_TOKEN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_TOKEN, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_LANGUAGE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_LANGUAGE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), XMLUni::fgNmTokenString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), XMLUni::fgNmTokenString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), XMLUni::fgNmTokensString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), XMLUni::fgNmTokensString, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NCNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NCNAME, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NONPOSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NONPOSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_LONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_LONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_INT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_INT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_SHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_SHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_BYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_BYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_NONNEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_NONNEGATIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_ULONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_ULONG, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_UINT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_UINT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_USHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_USHORT, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_UBYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_UBYTE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_POSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_POSITIVEINTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgATTVAL_ANYTYPE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgATTVAL_ANYTYPE, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
return passed;
}
@@ -454,16 +453,16 @@
->getNextSibling()->getNextSibling()->getNextSibling();
DOMAttr *testAtt = testEle->getAttributeNodeNS(0, X("decimalDerived"));
- DOMTYPEINFOTEST(testAtt->getTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAtt->getSchemaTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
testAtt = testEle->getAttributeNodeNS(0, X("stringDerived"));
- DOMTYPEINFOTEST(testAtt->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAtt->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
return passed;
}
@@ -475,10 +474,10 @@
//element complexTest
DOMElement *testEle = findElement(X("complexTest"));
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("complexTestType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("complexTestType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("complexDerTestType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("complexDerTestType"), X(""), __LINE__);
return passed;
}
@@ -493,40 +492,40 @@
DOMElement *testEle = findElement(X("unionTest"));
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
testAttr = testEle->getAttributeNodeNS(0, X("testAttr"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("testAttr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
testAttr = testEle->getAttributeNodeNS(0, X("testAttr"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("testAttr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("decimalDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
testAttr = testEle->getAttributeNodeNS(0, X("testAttr"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("testAttr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
testAttr = testEle->getAttributeNodeNS(0, X("testAttr"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("string"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(0, X("testAttr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("decimal"), SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
return passed;
@@ -541,19 +540,19 @@
//element anonymousTest
DOMElement *testEle = findElement(X("anonymousTest"));
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("__AnonC1"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("__AnonC1"), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("partNum"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("__AnonS7"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("__AnonS7"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("__AnonS2"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("__AnonS2"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("__AnonS4"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("__AnonS4"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("__AnonS6"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("__AnonS6"), X(""), __LINE__);
return passed;
}
@@ -568,22 +567,22 @@
DOMElement *testEle = findElement(X("xsiTypeTest"));
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("base"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("base"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("level1"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("level1"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("level2"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("level2"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("baseComplex"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("baseComplex"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("level1Complex"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("level1Complex"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("level2Complex"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("level2Complex"), X(""), __LINE__);
return passed;
}
@@ -601,19 +600,19 @@
DOMElement *back = testEle;
testAttr = testEle->getAttributeNodeNS(X("http://www.w3.org/1999/xhtml"), X("attr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), 0, 0, __LINE__);
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("anyTestPartialType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("anyTestPartialType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), 0, 0, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), 0, 0, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
//element anyTest
@@ -621,46 +620,46 @@
back = testEle;
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr1"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr3"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr4"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_INTEGER, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("anyTestType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("anyTestType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), 0, 0, __LINE__);
//anyTestAttr1
testEle = (DOMElement *)back->getNextSibling()->getNextSibling();
back = testEle;
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr5"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), 0, 0, __LINE__);
//anyTestAttr2
testEle = (DOMElement *)back->getNextSibling()->getNextSibling();
back = testEle;
testAttr = testEle->getAttributeNodeNS(X("http://www.secondSchema"), X("attr5"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), 0, 0, __LINE__);
//anyTestMissing
testEle = (DOMElement *)back->getNextSibling()->getNextSibling();
back = testEle;
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("anyTestType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("anyTestType"), X(""), __LINE__);
return passed;
}
@@ -673,47 +672,47 @@
DOMAttr *testAttr;
- DOMTYPEINFOTEST(((DOMElement *)docEle)->getTypeInfo(), X("rootType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(((DOMElement *)docEle)->getSchemaTypeInfo(), X("rootType"), X(""), __LINE__);
//element invalidTest
DOMElement *testEle = findElement(X("invalidTest"));
testAttr = testEle->getAttributeNodeNS(X(""), X("simple"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("invalid"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), 0, 0, __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("baseComplex"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("baseComplex"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
// this is a "number" of type "base" but it has a xsi:type="stringDerivedType"
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("stringDerivedType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("baseComplex"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("baseComplex"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("uType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("uType"), X(""), __LINE__);
//an undeclared element does not have anon value. Test this here
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), 0, 0, __LINE__);
DOMElement *testEle2 = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle2->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle2->getSchemaTypeInfo(), 0, 0, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("attrOnlyType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("attrOnlyType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("attrOnlyType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("attrOnlyType"), X(""), __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("prohibitedAttrType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("prohibitedAttrType"), X(""), __LINE__);
return passed;
}
@@ -730,49 +729,49 @@
DOMElement *testEle = doc->getDocumentElement();
DOMAttr *testAttr;
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X(""), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X(""), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("cdata"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("enum"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("ENUMERATION"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("ENUMERATION"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("id"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("ID"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("ID"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("idRef"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("IDREF"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("IDREF"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("idRefs"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("IDREFS"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("IDREFS"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("nmToken"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("nmTokenDefault"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("nmTokenDefault2"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("NMTOKEN"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("nmTokens"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("NMTOKENS"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("NMTOKENS"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("entity"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("ENTITY"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("ENTITY"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("entities"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("ENTITIES"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("ENTITIES"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("notation"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("NOTATION"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("NOTATION"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("noDecl"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
testAttr = testEle->getAttributeNode(X("xmlns:foo"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), X("CDATA"), X("http://www.w3.org/TR/REC-xml"), __LINE__);
return passed;
@@ -784,22 +783,22 @@
DOMAttr *testAttr;
DOMElement *testEle = doc->getDocumentElement();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), X("rootType"), X(""), __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), X("rootType"), X(""), __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("attBoth"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("attSchema"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testAttr = testEle->getAttributeNodeNS(X(""), X("attDTD"));
- DOMTYPEINFOTEST(testAttr->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testAttr->getSchemaTypeInfo(), 0, 0, __LINE__);
testEle = (DOMElement *)testEle->getFirstChild()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), SchemaSymbols::fgDT_STRING, SchemaSymbols::fgURI_SCHEMAFORSCHEMA, __LINE__);
testEle = (DOMElement *)testEle->getNextSibling()->getNextSibling();
- DOMTYPEINFOTEST(testEle->getTypeInfo(), 0, 0, __LINE__);
+ DOMTYPEINFOTEST(testEle->getSchemaTypeInfo(), 0, 0, __LINE__);
return passed;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org