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

[shibboleth/cpp-opensaml.git] / samltest / saml2 / binding / SAML2POSTTest.h

diff --git a/samltest/saml2/binding/SAML2POSTTest.h b/samltest/saml2/binding/SAML2POSTTest.h
index 7b7f774..f9a713a 100644 (file)
--- a/samltest/saml2/binding/SAML2POSTTest.h
+++ b/samltest/saml2/binding/SAML2POSTTest.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.
@@ -51,11 +51,11 @@ public:
             cc.setUsage(Credential::SIGNING_CREDENTIAL);
             Locker clocker(m_creds);
             const Credential* cred = m_creds->resolve(&cc);
-            TSM_ASSERT("Retrieved credential was null", cred!=NULL);
+            TSM_ASSERT("Retrieved credential was null", cred!=nullptr);
 
             // Freshen timestamp and ID.
-            toSend->setIssueInstant(time(NULL));
-            toSend->setID(NULL);
+            toSend->setIssueInstant(time(nullptr));
+            toSend->setID(nullptr);
     
             // Encode message.
             auto_ptr_XMLCh lit1("MessageEncoder");
@@ -64,11 +64,11 @@ public:
             auto_ptr_XMLCh lit3(path.c_str());
             DOMDocument* encoder_config = XMLToolingConfig::getConfig().getParser().newDocument();
             XercesJanitor<DOMDocument> janitor2(encoder_config);
-            encoder_config->appendChild(encoder_config->createElementNS(NULL,lit1.get()));
-            encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
+            encoder_config->appendChild(encoder_config->createElementNS(nullptr,lit1.get()));
+            encoder_config->getDocumentElement()->setAttributeNS(nullptr,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
-                    samlconstants::SAML20_BINDING_HTTP_POST, pair<const DOMElement*,const XMLCh*>(encoder_config->getDocumentElement(), NULL)
+                    samlconstants::SAML20_BINDING_HTTP_POST, pair<const DOMElement*,const XMLCh*>(encoder_config->getDocumentElement(), nullptr)
                     )
                 );
             Locker locker(m_metadata);
@@ -78,7 +78,7 @@ public:
                 "https://sp.example.org/SAML/SSO",
                 m_metadata->getEntityDescriptor(MetadataProvider::Criteria("https://sp.example.org/")).first,
                 "state",
-                NULL,
+                nullptr,
                 cred
                 );
             toSend.release();
@@ -87,7 +87,7 @@ public:
             string relayState;
             auto_ptr<MessageDecoder> decoder(
                 SAMLConfig::getConfig().MessageDecoderManager.newPlugin(
-                    samlconstants::SAML20_BINDING_HTTP_POST, pair<const DOMElement*,const XMLCh*>(NULL,NULL)
+                    samlconstants::SAML20_BINDING_HTTP_POST, pair<const DOMElement*,const XMLCh*>(nullptr,nullptr)
                     )
                 );
             auto_ptr<Response> response(dynamic_cast<Response*>(decoder->decode(relayState,*this,policy)));
@@ -130,11 +130,11 @@ public:
             cc.setUsage(Credential::SIGNING_CREDENTIAL);
             Locker clocker(m_creds);
             const Credential* cred = m_creds->resolve(&cc);
-            TSM_ASSERT("Retrieved credential was null", cred!=NULL);
+            TSM_ASSERT("Retrieved credential was null", cred!=nullptr);
 
             // Freshen timestamp and ID.
-            toSend->setIssueInstant(time(NULL));
-            toSend->setID(NULL);
+            toSend->setIssueInstant(time(nullptr));
+            toSend->setID(nullptr);
     
             // Encode message.
             auto_ptr_XMLCh lit1("MessageEncoder");
@@ -143,11 +143,11 @@ public:
             auto_ptr_XMLCh lit3(path.c_str());
             DOMDocument* encoder_config = XMLToolingConfig::getConfig().getParser().newDocument();
             XercesJanitor<DOMDocument> janitor2(encoder_config);
-            encoder_config->appendChild(encoder_config->createElementNS(NULL,lit1.get()));
-            encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
+            encoder_config->appendChild(encoder_config->createElementNS(nullptr,lit1.get()));
+            encoder_config->getDocumentElement()->setAttributeNS(nullptr,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
-                    samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair<const DOMElement*,const XMLCh*>(encoder_config->getDocumentElement(),NULL)
+                    samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair<const DOMElement*,const XMLCh*>(encoder_config->getDocumentElement(),nullptr)
                     )
                 );
             Locker locker(m_metadata);
@@ -157,7 +157,7 @@ public:
                 "https://sp.example.org/SAML/SSO",
                 m_metadata->getEntityDescriptor(MetadataProvider::Criteria("https://sp.example.org/")).first,
                 "state",
-                NULL,
+                nullptr,
                 cred
                 );
             toSend.release();
@@ -166,7 +166,7 @@ public:
             string relayState;
             auto_ptr<MessageDecoder> decoder(
                 SAMLConfig::getConfig().MessageDecoderManager.newPlugin(
-                    samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair<const DOMElement*,const XMLCh*>(NULL,NULL)
+                    samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair<const DOMElement*,const XMLCh*>(nullptr,nullptr)
                     )
                 );
             auto_ptr<Response> response(dynamic_cast<Response*>(decoder->decode(relayState,*this,policy)));