Remove some tracing, fix string compares.

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

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
-        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
@@ -85,12 +83,10 @@ 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=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
-        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
@@ -131,8 +125,6 @@ public:
     }\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
@@ -156,8 +148,6 @@ public:
     }\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