Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / samltest / saml2 / core / impl / NameIDType20Test.h

diff --git a/samltest/saml2/core/impl/NameIDType20Test.h b/samltest/saml2/core/impl/NameIDType20Test.h
index 4b8ef09..7db32dc 100644 (file)
--- a/samltest/saml2/core/impl/NameIDType20Test.h
+++ b/samltest/saml2/core/impl/NameIDType20Test.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,15 +84,15 @@ public:
 
     //TODO possibly move this functionality up to SAMLObjectBaseTestCase, as optional helper method
     XMLObject * buildObject() {
-        const XMLObjectBuilder* builder = XMLObjectBuilder::getBuilder(QName(typeNS,typeName));
-        QName type(typeNS,typeName,typePrefix);
+        const XMLObjectBuilder* builder = XMLObjectBuilder::getBuilder(xmltooling::QName(typeNS,typeName));
+        xmltooling::QName type(typeNS,typeName,typePrefix);
         return builder->buildObject(elementNS, elementName, elementPrefix, &type);
     }
 
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameIDType* nameid = dynamic_cast<NameIDType*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         checkNameAndType(nameid);
 
@@ -102,7 +102,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         NameIDType* nameid = dynamic_cast<NameIDType*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         checkNameAndType(nameid);
 
@@ -116,7 +116,7 @@ public:
 
     void testSingleElementMarshall() {
         NameIDType* nameid = dynamic_cast<NameIDType*>(buildObject());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
         checkNameAndType(nameid);
 
         nameid->setName(expectedContent);
@@ -125,7 +125,7 @@ public:
 
     void testSingleElementOptionalAttributesMarshall() {
         NameIDType* nameid = dynamic_cast<NameIDType*>(buildObject());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
         checkNameAndType(nameid);
 
         nameid->setNameQualifier(expectedNameQualifier);