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

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

diff --git a/samltest/saml2/core/impl/NameID20Test.h b/samltest/saml2/core/impl/NameID20Test.h
index ab37af7..714b261 100644 (file)
--- a/samltest/saml2/core/impl/NameID20Test.h
+++ b/samltest/saml2/core/impl/NameID20Test.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.
@@ -52,7 +52,7 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameID* nameid = dynamic_cast<NameID*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         assertEquals("Element content", expectedContent, nameid->getName());
     }
@@ -60,7 +60,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         NameID* nameid = dynamic_cast<NameID*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         assertEquals("NameQualifier attribute", expectedNameQualifier, nameid->getNameQualifier());
         assertEquals("SPNameQualifier attribute", expectedSPNameQualifier, nameid->getSPNameQualifier());
@@ -72,7 +72,7 @@ public:
 
     void testSingleElementMarshall() {
         NameID* nameid = NameIDBuilder::buildNameID();
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         nameid->setName(expectedContent);
         assertEquals(expectedDOM, nameid);
@@ -80,7 +80,7 @@ public:
 
     void testSingleElementOptionalAttributesMarshall() {
         NameID* nameid = NameIDBuilder::buildNameID();
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         nameid->setNameQualifier(expectedNameQualifier);
         nameid->setSPNameQualifier(expectedSPNameQualifier);