#include <fstream>\r
\r
class MarshallingTest : public CxxTest::TestSuite {\r
- QName m_qname;\r
public:\r
- MarshallingTest() : m_qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME) {}\r
-\r
void setUp() {\r
- XMLObjectBuilder::registerBuilder(m_qname, new SimpleXMLObjectBuilder());\r
+ QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
+ QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME);\r
+ XMLObjectBuilder::registerBuilder(qname, new SimpleXMLObjectBuilder());\r
+ XMLObjectBuilder::registerBuilder(qtype, new SimpleXMLObjectBuilder());\r
}\r
\r
void tearDown() {\r
- XMLObjectBuilder::deregisterBuilder(m_qname);\r
+ QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
+ QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME);\r
+ XMLObjectBuilder::deregisterBuilder(qname);\r
+ XMLObjectBuilder::deregisterBuilder(qtype);\r
}\r
\r
void testMarshallingWithAttributes() {\r
- TS_TRACE("testMarshallingWithAttributes");\r
-\r
- auto_ptr_XMLCh expected("Firefly");\r
- auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::buildOne(m_qname)));\r
+ QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
+ auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
TS_ASSERT(sxObject.get()!=NULL);\r
+ auto_ptr_XMLCh expected("Firefly");\r
sxObject->setId(expected.get());\r
\r
DOMElement* rootElement = sxObject->marshall();\r
\r
string path=data_path + "SimpleXMLObjectWithAttribute.xml";\r
ifstream fs(path.c_str());\r
- DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+ DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
TS_ASSERT(doc!=NULL);\r
\r
TS_ASSERT(rootElement->isEqualNode(doc->getDocumentElement()));\r
}\r
\r
void testMarshallingWithElementContent() {\r
- TS_TRACE("testMarshallingWithElementContent");\r
-\r
- auto_ptr_XMLCh expected("Sample Content");\r
- auto_ptr<SimpleXMLObject> sxObject(dynamic_cast<SimpleXMLObject*>(XMLObjectBuilder::buildOne(m_qname)));\r
+ QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
+ auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
TS_ASSERT(sxObject.get()!=NULL);\r
+ auto_ptr_XMLCh expected("Sample Content");\r
sxObject->setValue(expected.get());\r
\r
DOMElement* rootElement = sxObject->marshall();\r
\r
string path=data_path + "SimpleXMLObjectWithContent.xml";\r
ifstream fs(path.c_str());\r
- DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+ DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
TS_ASSERT(doc!=NULL);\r
\r
TS_ASSERT(rootElement->isEqualNode(doc->getDocumentElement()));\r
}\r
\r
void testMarshallingWithChildElements() {\r
- TS_TRACE("testMarshallingWithChildElements");\r
-\r
- const SimpleXMLObjectBuilder* b=dynamic_cast<const SimpleXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(m_qname));\r
+ QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
+ const SimpleXMLObjectBuilder* b=dynamic_cast<const SimpleXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(qname));\r
TS_ASSERT(b!=NULL);\r
\r
auto_ptr<SimpleXMLObject> sxObject(b->buildObject());\r
// Test some collection stuff\r
auto_ptr_XMLCh foo("Foo");\r
auto_ptr_XMLCh bar("Bar");\r
+ auto_ptr_XMLCh baz("Baz");\r
kids.begin()->setId(foo.get());\r
kids.at(2)->setValue(bar.get());\r
kids.erase(kids.begin()+1);\r
- TS_ASSERT_SAME_DATA(kids.back()->getValue(), bar.get(), XMLString::stringLen(bar.get()));\r
+ TS_ASSERT(XMLString::equals(kids.back()->getValue(), bar.get()));\r
+ \r
+ QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME,SimpleXMLObject::NAMESPACE_PREFIX);\r
+ kids.push_back(\r
+ b->buildObject(SimpleXMLObject::NAMESPACE,SimpleXMLObject::DERIVED_NAME,SimpleXMLObject::NAMESPACE_PREFIX,&qtype)\r
+ );\r
+ kids.back()->setValue(baz.get());\r
\r
DOMElement* rootElement = sxObject->marshall();\r
\r
string path=data_path + "SimpleXMLObjectWithChildren.xml";\r
ifstream fs(path.c_str());\r
- DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+ DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
TS_ASSERT(doc!=NULL);\r
\r
TS_ASSERT(rootElement->isEqualNode(doc->getDocumentElement()));\r