X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsaml2%2Fcore%2Fimpl%2FNameIDMappingResponse20Test.h;h=d7c5d353d39a7cf18e9adb42748b536410b328f9;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hp=5eb94b63078cabdc461d06b7f4f5fa1ec10f02e9;hpb=1ffcb743f90aeb3da11054316f3d005ff7edbf7b;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
index 5eb94b6..d7c5d35 100644
--- a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 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.
@@ -58,53 +58,53 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameIDMappingResponse* response = dynamic_cast<NameIDMappingResponse*>(xo.get());
-        TS_ASSERT(response!=NULL);
+        TS_ASSERT(response!=nullptr);
 
         assertEquals("ID attribute", expectedID, response->getID());
         assertEquals("Version attribute", expectedVersion, response->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());
 
-        TS_ASSERT(response->getIssuer()==NULL);
-        TS_ASSERT(response->getSignature()==NULL);
-        TS_ASSERT(response->getExtensions()==NULL);
-        TS_ASSERT(response->getStatus()==NULL);
-        TS_ASSERT(response->getNameID()==NULL);
-        TS_ASSERT(response->getEncryptedID()==NULL);
+        TS_ASSERT(response->getIssuer()==nullptr);
+        TS_ASSERT(response->getSignature()==nullptr);
+        TS_ASSERT(response->getExtensions()==nullptr);
+        TS_ASSERT(response->getStatus()==nullptr);
+        TS_ASSERT(response->getNameID()==nullptr);
+        TS_ASSERT(response->getEncryptedID()==nullptr);
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         NameIDMappingResponse* response = dynamic_cast<NameIDMappingResponse*>(xo.get());
-        TS_ASSERT(response!=NULL);
+        TS_ASSERT(response!=nullptr);
 
         assertEquals("Consent attribute", expectedConsent, response->getConsent());
         assertEquals("Destination attribute", expectedDestination, response->getDestination());
         assertEquals("InResponseTo attribute", expectedInResponseTo, response->getInResponseTo());
 
-        TS_ASSERT(response->getIssuer()==NULL);
-        TS_ASSERT(response->getSignature()==NULL);
-        TS_ASSERT(response->getExtensions()==NULL);
-        TS_ASSERT(response->getStatus()==NULL);
-        TS_ASSERT(response->getNameID()==NULL);
-        TS_ASSERT(response->getEncryptedID()==NULL);
+        TS_ASSERT(response->getIssuer()==nullptr);
+        TS_ASSERT(response->getSignature()==nullptr);
+        TS_ASSERT(response->getExtensions()==nullptr);
+        TS_ASSERT(response->getStatus()==nullptr);
+        TS_ASSERT(response->getNameID()==nullptr);
+        TS_ASSERT(response->getEncryptedID()==nullptr);
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         NameIDMappingResponse* response= dynamic_cast<NameIDMappingResponse*>(xo.get());
-        TS_ASSERT(response!=NULL);
-
-        TS_ASSERT(response->getIssuer()!=NULL);
-        TS_ASSERT(response->getSignature()==NULL);
-        TS_ASSERT(response->getExtensions()==NULL);
-        TS_ASSERT(response->getStatus()!=NULL);
-        TS_ASSERT(response->getNameID()!=NULL);
-        TS_ASSERT(response->getEncryptedID()==NULL);
+        TS_ASSERT(response!=nullptr);
+
+        TS_ASSERT(response->getIssuer()!=nullptr);
+        TS_ASSERT(response->getSignature()==nullptr);
+        TS_ASSERT(response->getExtensions()==nullptr);
+        TS_ASSERT(response->getStatus()!=nullptr);
+        TS_ASSERT(response->getNameID()!=nullptr);
+        TS_ASSERT(response->getEncryptedID()==nullptr);
     }
 
     void testSingleElementMarshall() {
         NameIDMappingResponse* response = NameIDMappingResponseBuilder::buildNameIDMappingResponse();
-        TS_ASSERT(response!=NULL);
+        TS_ASSERT(response!=nullptr);
 
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
@@ -114,7 +114,7 @@ public:
 
     void testSingleElementOptionalAttributesMarshall() {
         NameIDMappingResponse* response = NameIDMappingResponseBuilder::buildNameIDMappingResponse();
-        TS_ASSERT(response!=NULL);
+        TS_ASSERT(response!=nullptr);
 
         response->setID(expectedID);
         response->setInResponseTo(expectedInResponseTo);
@@ -128,12 +128,12 @@ public:
 
     void testChildElementsMarshall() {
         NameIDMappingResponse* response = NameIDMappingResponseBuilder::buildNameIDMappingResponse();
-        TS_ASSERT(response!=NULL);
+        TS_ASSERT(response!=nullptr);
 
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());