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

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

diff --git a/samltest/saml2/core/impl/LogoutRequest20Test.h b/samltest/saml2/core/impl/LogoutRequest20Test.h
index c545f85..d0f473e 100644 (file)
--- a/samltest/saml2/core/impl/LogoutRequest20Test.h
+++ b/samltest/saml2/core/impl/LogoutRequest20Test.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.
@@ -62,49 +62,49 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         LogoutRequest* request = dynamic_cast<LogoutRequest*>(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());
 
-        TS_ASSERT(request->getIssuer()==NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getBaseID()==NULL);
-        TS_ASSERT(request->getNameID()==NULL);
-        TS_ASSERT(request->getEncryptedID()==NULL);
+        TS_ASSERT(request->getIssuer()==nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getBaseID()==nullptr);
+        TS_ASSERT(request->getNameID()==nullptr);
+        TS_ASSERT(request->getEncryptedID()==nullptr);
         TSM_ASSERT_EQUALS("# of SessionIndex child elements", 0, request->getSessionIndexs().size());
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         LogoutRequest* request = dynamic_cast<LogoutRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
+        TS_ASSERT(request!=nullptr);
 
         assertEquals("Consent attribute", expectedConsent, request->getConsent());
         assertEquals("Destination attribute", expectedDestination, request->getDestination());
         assertEquals("Reason attribute", expectedReason, request->getReason());
         TSM_ASSERT_EQUALS("NotOnOrAfter attribute", expectedNotOnOrAfter->getEpoch(), request->getNotOnOrAfter()->getEpoch());
 
-        TS_ASSERT(request->getIssuer()==NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getBaseID()==NULL);
-        TS_ASSERT(request->getNameID()==NULL);
-        TS_ASSERT(request->getEncryptedID()==NULL);
+        TS_ASSERT(request->getIssuer()==nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getBaseID()==nullptr);
+        TS_ASSERT(request->getNameID()==nullptr);
+        TS_ASSERT(request->getEncryptedID()==nullptr);
         TSM_ASSERT_EQUALS("# of SessionIndex child elements", 0, request->getSessionIndexs().size());
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         LogoutRequest* request= dynamic_cast<LogoutRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
-        TS_ASSERT(request->getIssuer()!=NULL);
-        TS_ASSERT(request->getSignature()==NULL);
-        TS_ASSERT(request->getExtensions()==NULL);
-        TS_ASSERT(request->getBaseID()==NULL);
-        TS_ASSERT(request->getNameID()!=NULL);
-        TS_ASSERT(request->getEncryptedID()==NULL);
+        TS_ASSERT(request!=nullptr);
+        TS_ASSERT(request->getIssuer()!=nullptr);
+        TS_ASSERT(request->getSignature()==nullptr);
+        TS_ASSERT(request->getExtensions()==nullptr);
+        TS_ASSERT(request->getBaseID()==nullptr);
+        TS_ASSERT(request->getNameID()!=nullptr);
+        TS_ASSERT(request->getEncryptedID()==nullptr);
         TSM_ASSERT_EQUALS("# of SessionIndex child elements", 2, request->getSessionIndexs().size());
     }