Remove some tracing, fix string compares.

diff --git a/xmltoolingtest/ComplexXMLObjectTest.h b/xmltoolingtest/ComplexXMLObjectTest.h
index 73647b4..45af7a9 100644 (file)
--- a/xmltoolingtest/ComplexXMLObjectTest.h
+++ b/xmltoolingtest/ComplexXMLObjectTest.h
@@ -32,8 +32,6 @@ public:
     }\r
 \r
     void testComplexUnmarshalling() {\r
     }\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
         string path=data_path + "ComplexXMLObject.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r

diff --git a/xmltoolingtest/ExceptionTest.h b/xmltoolingtest/ExceptionTest.h
index 70edcf4..d290fbe 100644 (file)
--- a/xmltoolingtest/ExceptionTest.h
+++ b/xmltoolingtest/ExceptionTest.h
@@ -23,8 +23,6 @@ class ExceptionTest : public CxxTest::TestSuite {
 public:\r
 \r
     void testException(void) {\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
 #define TEST(n,b,a) XMLToolingException e##n(b); \\r
                 TS_ASSERT(!strcmp(a,e##n.what()))\r
 \r

diff --git a/xmltoolingtest/KeyInfoTest.h b/xmltoolingtest/KeyInfoTest.h
index 8672906..64fb6c7 100644 (file)
--- a/xmltoolingtest/KeyInfoTest.h
+++ b/xmltoolingtest/KeyInfoTest.h
@@ -34,8 +34,6 @@ public:
     }\r
 \r
     void testKeyInfo1() {\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
         string path=data_path + "KeyInfo1.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);\r


@@ -44,9 +42,7 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
         TS_ASSERT(b!=NULL);\r
 \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
         TS_ASSERT(kiObject.get()!=NULL);\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
             3, kiObject->getOrderedChildren().size());\r


@@ -56,15 +52,12 @@ public:
             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
             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
 \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
         string path=data_path + "KeyInfo2.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);\r


@@ -73,9 +66,7 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
         TS_ASSERT(b!=NULL);\r
 \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
         TS_ASSERT(kiObject.get()!=NULL);\r
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
             2, kiObject->getOrderedChildren().size());\r


@@ -88,8 +79,6 @@ public:
     }\r
 \r
     void testKeyInfo3() {\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
         string path=data_path + "KeyInfo3.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r


@@ -98,9 +87,7 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());\r
         TS_ASSERT(b!=NULL);\r
 \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
         TS_ASSERT(kiObject.get()!=NULL);\r
         TS_ASSERT_THROWS(KeyInfoSchemaValidators.validate(kiObject.get()),ValidationException);\r
     }\r

diff --git a/xmltoolingtest/MarshallingTest.h b/xmltoolingtest/MarshallingTest.h
index 0b3e056..1a5c53a 100644 (file)
--- a/xmltoolingtest/MarshallingTest.h
+++ b/xmltoolingtest/MarshallingTest.h
@@ -35,8 +35,6 @@ public:
     }\r
 \r
     void testMarshallingWithAttributes() {\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
         QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
         auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
         TS_ASSERT(sxObject.get()!=NULL);\r


@@ -55,8 +53,6 @@ public:
     }\r
 \r
     void testMarshallingWithElementContent() {\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
         QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
         auto_ptr<SimpleXMLObject> sxObject(SimpleXMLObjectBuilder::newSimpleXMLObject());\r
         TS_ASSERT(sxObject.get()!=NULL);\r


@@ -75,8 +71,6 @@ public:
     }\r
 \r
     void testMarshallingWithChildElements() {\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
         QName qname(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME);\r
         const SimpleXMLObjectBuilder* b=dynamic_cast<const SimpleXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(qname));\r
         TS_ASSERT(b!=NULL);\r


@@ -95,7 +89,7 @@ public:
         kids.begin()->setId(foo.get());\r
         kids.at(2)->setValue(bar.get());\r
         kids.erase(kids.begin()+1);\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
         \r
         QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME,SimpleXMLObject::NAMESPACE_PREFIX);\r
         kids.push_back(\r

diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 8f3ec2c..c50b86f 100644 (file)
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -48,7 +48,7 @@ class TestValidator : public SignatureValidator
     XMLCh* m_uri;\r
     \r
 public:\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
         m_uri=XMLString::replicate(uri);\r
     }\r
     \r


@@ -157,7 +157,7 @@ public:
         TS_ASSERT(sxObject2->getSignature()!=NULL);\r
         \r
         try {\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
             tv.validate(sxObject2->getSignature());\r
         }\r
         catch (XMLToolingException& e) {\r

diff --git a/xmltoolingtest/UnmarshallingTest.h b/xmltoolingtest/UnmarshallingTest.h
index 3687ea3..b645f11 100644 (file)
--- a/xmltoolingtest/UnmarshallingTest.h
+++ b/xmltoolingtest/UnmarshallingTest.h
@@ -69,8 +69,6 @@ public:
     }\r
 \r
     void testUnmarshallingWithAttributes() {\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
         string path=data_path + "SimpleXMLObjectWithAttribute.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r


@@ -85,12 +83,10 @@ public:
         TS_ASSERT(sxObject.get()!=NULL);\r
 \r
         auto_ptr_XMLCh expected("Firefly");\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
     }\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
         string path=data_path + "SimpleXMLObjectWithContent.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r


@@ -105,12 +101,10 @@ public:
         TS_ASSERT(sxObject.get()!=NULL);\r
 \r
         auto_ptr_XMLCh expected("Sample Content");\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
     }\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
         string path=data_path + "SimpleXMLObjectWithChildren.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r


@@ -131,8 +125,6 @@ public:
     }\r
 \r
     void testUnmarshallingWithClone() {\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
         string path=data_path + "SimpleXMLObjectWithChildren.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r


@@ -156,8 +148,6 @@ public:
     }\r
 \r
     void testUnmarshallingWithUnknownChild() {\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
         string path=data_path + "SimpleXMLObjectWithUnknownChild.xml";\r
         ifstream fs(path.c_str());\r
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r