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

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

diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h
index 0ca7db4..375a65a 100644 (file)
--- a/samltest/saml2/core/impl/AuthnRequest20Test.h
+++ b/samltest/saml2/core/impl/AuthnRequest20Test.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.
@@ -72,7 +72,7 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         AuthnRequest* request = dynamic_cast<AuthnRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
+        TS_ASSERT(request!=nullptr);
         assertEquals("ID attribute", expectedID, request->getID());
         assertEquals("Version attribute", expectedVersion, request->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());
@@ -81,20 +81,20 @@ public:
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);
 
-        TS_ASSERT(request->getIssuer()==NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getSubject()==NULL);
-        TS_ASSERT(request->getNameIDPolicy()==NULL);
-        TS_ASSERT(request->getConditions()==NULL);
-        TS_ASSERT(request->getRequestedAuthnContext()==NULL);
-        TS_ASSERT(request->getScoping()==NULL);
+        TS_ASSERT(request->getIssuer()==nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getSubject()==nullptr);
+        TS_ASSERT(request->getNameIDPolicy()==nullptr);
+        TS_ASSERT(request->getConditions()==nullptr);
+        TS_ASSERT(request->getRequestedAuthnContext()==nullptr);
+        TS_ASSERT(request->getScoping()==nullptr);
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         AuthnRequest* request = dynamic_cast<AuthnRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
+        TS_ASSERT(request!=nullptr);
 
         assertEquals("Consent attribute", expectedConsent, request->getConsent());
         assertEquals("Destination attribute", expectedDestination, request->getDestination());
@@ -108,28 +108,28 @@ public:
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute value", expectedAttributeConsumingServiceIndex, request->getAttributeConsumingServiceIndex().second);
         assertEquals("ProviderName attribute", expectedProviderName, request->getProviderName());
 
-        TS_ASSERT(request->getIssuer()==NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getSubject()==NULL);
-        TS_ASSERT(request->getNameIDPolicy()==NULL);
-        TS_ASSERT(request->getConditions()==NULL);
-        TS_ASSERT(request->getRequestedAuthnContext()==NULL);
-        TS_ASSERT(request->getScoping()==NULL);
+        TS_ASSERT(request->getIssuer()==nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getSubject()==nullptr);
+        TS_ASSERT(request->getNameIDPolicy()==nullptr);
+        TS_ASSERT(request->getConditions()==nullptr);
+        TS_ASSERT(request->getRequestedAuthnContext()==nullptr);
+        TS_ASSERT(request->getScoping()==nullptr);
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         AuthnRequest* request= dynamic_cast<AuthnRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
-        TS_ASSERT(request->getIssuer()!=NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getSubject()!=NULL);
-        TS_ASSERT(request->getNameIDPolicy()!=NULL);
-        TS_ASSERT(request->getConditions()!=NULL);
-        TS_ASSERT(request->getRequestedAuthnContext()!=NULL);
-        TS_ASSERT(request->getScoping()!=NULL);
+        TS_ASSERT(request!=nullptr);
+        TS_ASSERT(request->getIssuer()!=nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getSubject()!=nullptr);
+        TS_ASSERT(request->getNameIDPolicy()!=nullptr);
+        TS_ASSERT(request->getConditions()!=nullptr);
+        TS_ASSERT(request->getRequestedAuthnContext()!=nullptr);
+        TS_ASSERT(request->getScoping()!=nullptr);
         TSM_ASSERT_EQUALS("ForceAuthn attribute presence", xmlconstants::XML_BOOL_NULL, request->getForceAuthn());
         TSM_ASSERT_EQUALS("IsPassive attribute presence", xmlconstants::XML_BOOL_NULL, request->getIsPassive());
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);