Simplify storage context mgmt.

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

diff --git a/xmltoolingtest/UnmarshallingTest.h b/xmltoolingtest/UnmarshallingTest.h
index 248671d..b645f11 100644 (file)
--- a/xmltoolingtest/UnmarshallingTest.h
+++ b/xmltoolingtest/UnmarshallingTest.h
@@ -53,28 +53,25 @@ const XMLCh SimpleXMLObject::ID_ATTRIB_NAME[] = {
 };\r
 \r
 class UnmarshallingTest : public CxxTest::TestSuite {\r
-    QName m_qname;\r
-    QName m_qtype;\r
 public:\r
-    UnmarshallingTest() : m_qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME,SimpleXMLObject::NAMESPACE_PREFIX),\r
-        m_qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME,SimpleXMLObject::NAMESPACE_PREFIX) {}\r
-\r
     void setUp() {\r
-        XMLObjectBuilder::registerBuilder(m_qname, new SimpleXMLObjectBuilder());\r
-        XMLObjectBuilder::registerBuilder(m_qtype, 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
-        XMLObjectBuilder::deregisterBuilder(m_qtype);\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 testUnmarshallingWithAttributes() {\r
-        TS_TRACE("testUnmarshallingWithAttributes");\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
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
@@ -86,15 +83,13 @@ public:
         TS_ASSERT(sxObject.get()!=NULL);\r
 \r
         auto_ptr_XMLCh expected("Firefly");\r
-        TSM_ASSERT_SAME_DATA("ID was not expected value", expected.get(), sxObject->getId(), XMLString::stringLen(expected.get()));\r
+        TSM_ASSERT("ID was not expected value", XMLString::equals(expected.get(), sxObject->getId()));\r
     }\r
 \r
     void testUnmarshallingWithElementContent() {\r
-        TS_TRACE("testUnmarshallingWithElementContent");\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
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
@@ -106,15 +101,13 @@ public:
         TS_ASSERT(sxObject.get()!=NULL);\r
 \r
         auto_ptr_XMLCh expected("Sample Content");\r
-        TSM_ASSERT_SAME_DATA("Element content was not expected value", expected.get(), sxObject->getValue(), XMLString::stringLen(expected.get()));\r
+        TSM_ASSERT("Element content was not expected value", XMLString::equals(expected.get(), sxObject->getValue()));\r
     }\r
 \r
     void testUnmarshallingWithChildElements() {\r
-        TS_TRACE("testUnmarshallingWithChildElements");\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
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
@@ -127,15 +120,14 @@ public:
 \r
         VectorOf(SimpleXMLObject) kids=sxObject->getSimpleXMLObjects();\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value", 3, kids.size());\r
-        TSM_ASSERT_EQUALS("Child's schema type was not expected value", m_qtype, *(kids.back()->getSchemaType()));\r
+        QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME);\r
+        TSM_ASSERT_EQUALS("Child's schema type was not expected value", qtype, *(kids.back()->getSchemaType()));\r
     }\r
 \r
     void testUnmarshallingWithClone() {\r
-        TS_TRACE("testUnmarshallingWithClone");\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
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
@@ -151,15 +143,14 @@ public:
 \r
         VectorOf(SimpleXMLObject) kids=clonedObject->getSimpleXMLObjects();\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value", 3, kids.size());\r
-        TSM_ASSERT_EQUALS("Child's schema type was not expected value", m_qtype, *(kids.back()->getSchemaType()));\r
+        QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME);\r
+        TSM_ASSERT_EQUALS("Child's schema type was not expected value", qtype, *(kids.back()->getSchemaType()));\r
     }\r
 \r
     void testUnmarshallingWithUnknownChild() {\r
-        TS_TRACE("testUnmarshallingWithUnknownChild");\r
-\r
         string path=data_path + "SimpleXMLObjectWithUnknownChild.xml";\r
         ifstream fs(path.c_str());\r
-        DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
         TS_ASSERT(doc!=NULL);\r
 \r
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r