Remove some tracing, fix string compares.

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

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
-        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
@@ -55,8 +53,6 @@ public:
     }\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
@@ -75,8 +71,6 @@ public:
     }\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
@@ -95,7 +89,7 @@ public:
         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