Remove some tracing, fix string compares.

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

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
-        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
@@ -44,9 +42,7 @@ public:
         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
@@ -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
-        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
@@ -73,9 +66,7 @@ public:
         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
@@ -88,8 +79,6 @@ public:
     }\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
@@ -98,9 +87,7 @@ public:
         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