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

diff --git a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
index 6489852..501dfd3 100644
--- a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingRequest20Test.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.
@@ -55,48 +55,48 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameIDMappingRequest* request = dynamic_cast<NameIDMappingRequest*>(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->getNameIDPolicy()==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);
+        TS_ASSERT(request->getNameIDPolicy()==nullptr);
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         NameIDMappingRequest* request = dynamic_cast<NameIDMappingRequest*>(xo.get());
-        TS_ASSERT(request!=NULL);
+        TS_ASSERT(request!=nullptr);
 
         assertEquals("Consent attribute", expectedConsent, request->getConsent());
         assertEquals("Destination attribute", expectedDestination, request->getDestination());
 
-        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->getNameIDPolicy()==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);
+        TS_ASSERT(request->getNameIDPolicy()==nullptr);
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         NameIDMappingRequest* request= dynamic_cast<NameIDMappingRequest*>(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->getNameIDPolicy()!=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);
+        TS_ASSERT(request->getNameIDPolicy()!=nullptr);
     }
 
     void testSingleElementMarshall() {
@@ -122,7 +122,7 @@ public:
         request->setID(expectedID);
         request->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);
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());