}\r
\r
void testComplexUnmarshalling() {\r
- TS_TRACE("testComplexUnmarshalling");\r
-\r
string path=data_path + "ComplexXMLObject.xml";\r
ifstream fs(path.c_str());\r
DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
public:\r
\r
void testException(void) {\r
- TS_TRACE("testException");\r
-\r
#define TEST(n,b,a) XMLToolingException e##n(b); \\r
TS_ASSERT(!strcmp(a,e##n.what()))\r
\r
}\r
\r
void testKeyInfo1() {\r
- TS_TRACE("testKeyInfo1");\r
-\r
string path=data_path + "KeyInfo1.xml";\r
ifstream fs(path.c_str());\r
DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);\r
const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
TS_ASSERT(b!=NULL);\r
\r
- auto_ptr<KeyInfo> kiObject(\r
- dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))\r
- );\r
+ auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));\r
TS_ASSERT(kiObject.get()!=NULL);\r
TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
3, kiObject->getOrderedChildren().size());\r
1, kiObject->getX509Datas().front()->getX509Certificates().size());\r
\r
auto_ptr_XMLCh expected("Public Key for CN=xmldap.org, OU=Domain Control Validated, O=xmldap.org");\r
- TSM_ASSERT_SAME_DATA("KeyName was not expected value",\r
- expected.get(), kiObject->getKeyNames().front()->getName(), XMLString::stringLen(expected.get()));\r
+ TSM_ASSERT("KeyName was not expected value", XMLString::equals(expected.get(), kiObject->getKeyNames().front()->getName()));\r
\r
KeyInfoSchemaValidators.validate(kiObject.get());\r
}\r
\r
void testKeyInfo2() {\r
- TS_TRACE("testKeyInfo2");\r
-\r
string path=data_path + "KeyInfo2.xml";\r
ifstream fs(path.c_str());\r
DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);\r
const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
TS_ASSERT(b!=NULL);\r
\r
- auto_ptr<KeyInfo> kiObject(\r
- dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))\r
- );\r
+ auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));\r
TS_ASSERT(kiObject.get()!=NULL);\r
TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
2, kiObject->getOrderedChildren().size());\r
}\r
\r
void testKeyInfo3() {\r
- TS_TRACE("testKeyInfo3");\r
-\r
string path=data_path + "KeyInfo3.xml";\r
ifstream fs(path.c_str());\r
DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
TS_ASSERT(b!=NULL);\r
\r
- auto_ptr<KeyInfo> kiObject(\r
- dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))\r
- );\r
+ auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));\r
TS_ASSERT(kiObject.get()!=NULL);\r
TS_ASSERT_THROWS(KeyInfoSchemaValidators.validate(kiObject.get()),ValidationException);\r
}\r
}\r
\r
void testMarshallingWithAttributes() {\r
- TS_TRACE("testMarshallingWithAttributes");\r
-\r
QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
TS_ASSERT(sxObject.get()!=NULL);\r
}\r
\r
void testMarshallingWithElementContent() {\r
- TS_TRACE("testMarshallingWithElementContent");\r
-\r
QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
TS_ASSERT(sxObject.get()!=NULL);\r
}\r
\r
void testMarshallingWithChildElements() {\r
- TS_TRACE("testMarshallingWithChildElements");\r
-\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
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
XMLCh* m_uri;\r
\r
public:\r
- TestValidator(const XMLCh* uri, XSECCryptoKey* key) : SignatureValidator(new KeyResolver(key)) {\r
+ TestValidator(const XMLCh* uri) : SignatureValidator(XMLToolingConfig::getConfig().KeyResolverManager.newPlugin(INLINE_KEY_RESOLVER,NULL)) {\r
m_uri=XMLString::replicate(uri);\r
}\r
\r
TS_ASSERT(sxObject2->getSignature()!=NULL);\r
\r
try {\r
- TestValidator tv(&chNull,m_resolver->getKey());\r
+ TestValidator tv(&chNull);\r
tv.validate(sxObject2->getSignature());\r
}\r
catch (XMLToolingException& e) {\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=XMLToolingConfig::getConfig().getParser().parse(fs);\r
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=XMLToolingConfig::getConfig().getParser().parse(fs);\r
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=XMLToolingConfig::getConfig().getParser().parse(fs);\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=XMLToolingConfig::getConfig().getParser().parse(fs);\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=XMLToolingConfig::getConfig().getParser().parse(fs);\r