X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=samltest%2Fsaml2%2Fcore%2Fimpl%2FAuthnStatement20Test.h;h=06773285d279da291ecb64f3c5129c7b67e056f7;hp=eb84555fcc7d0cf3a75bc767197dc8522cd78e3b;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hpb=50f75e2cd3ddaca8e9808a3e5af9517deca3c9c3

diff --git a/samltest/saml2/core/impl/AuthnStatement20Test.h b/samltest/saml2/core/impl/AuthnStatement20Test.h
index eb84555..0677328 100644
--- a/samltest/saml2/core/impl/AuthnStatement20Test.h
+++ b/samltest/saml2/core/impl/AuthnStatement20Test.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.
@@ -49,41 +49,41 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         AuthnStatement* statement = dynamic_cast<AuthnStatement*>(xo.get());
-        TS_ASSERT(statement!=NULL);
+        TS_ASSERT(statement!=nullptr);
 
         TSM_ASSERT_EQUALS("AuthnInstant attribute", expectedAuthnInstant->getEpoch(), statement->getAuthnInstant()->getEpoch());
-        TS_ASSERT(statement->getSessionIndex()==NULL);
-        TS_ASSERT(statement->getSessionNotOnOrAfter()==NULL);
+        TS_ASSERT(statement->getSessionIndex()==nullptr);
+        TS_ASSERT(statement->getSessionNotOnOrAfter()==nullptr);
 
-        TS_ASSERT(statement->getSubjectLocality()==NULL);
-        TS_ASSERT(statement->getAuthnContext()==NULL);
+        TS_ASSERT(statement->getSubjectLocality()==nullptr);
+        TS_ASSERT(statement->getAuthnContext()==nullptr);
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         AuthnStatement* statement = dynamic_cast<AuthnStatement*>(xo.get());
-        TS_ASSERT(statement!=NULL);
+        TS_ASSERT(statement!=nullptr);
 
         TSM_ASSERT_EQUALS("AuthnInstant attribute", expectedAuthnInstant->getEpoch(), statement->getAuthnInstant()->getEpoch());
         assertEquals("SessionIndex attribute", expectedSessionIndex, statement->getSessionIndex());
         TSM_ASSERT_EQUALS("SessionNotOnOrAfter attribute", expectedSessionNotOnOrAfter->getEpoch(), statement->getSessionNotOnOrAfter()->getEpoch());
 
-        TS_ASSERT(statement->getSubjectLocality()==NULL);
-        TS_ASSERT(statement->getAuthnContext()==NULL);
+        TS_ASSERT(statement->getSubjectLocality()==nullptr);
+        TS_ASSERT(statement->getAuthnContext()==nullptr);
 
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         AuthnStatement* statement= dynamic_cast<AuthnStatement*>(xo.get());
-        TS_ASSERT(statement!=NULL);
+        TS_ASSERT(statement!=nullptr);
 
-        TS_ASSERT(statement->getAuthnInstant()==NULL);
-        TS_ASSERT(statement->getSessionIndex()==NULL);
-        TS_ASSERT(statement->getSessionNotOnOrAfter()==NULL);
+        TS_ASSERT(statement->getAuthnInstant()==nullptr);
+        TS_ASSERT(statement->getSessionIndex()==nullptr);
+        TS_ASSERT(statement->getSessionNotOnOrAfter()==nullptr);
 
-        TS_ASSERT(statement->getSubjectLocality()!=NULL);
-        TS_ASSERT(statement->getAuthnContext()!=NULL);
+        TS_ASSERT(statement->getSubjectLocality()!=nullptr);
+        TS_ASSERT(statement->getAuthnContext()!=nullptr);
 
     }