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

diff --git a/samltest/saml2/core/impl/RequestedAuthnContext20Test.h b/samltest/saml2/core/impl/RequestedAuthnContext20Test.h
index 4a6a57c..88cc9b9 100644
--- a/samltest/saml2/core/impl/RequestedAuthnContext20Test.h
+++ b/samltest/saml2/core/impl/RequestedAuthnContext20Test.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.
@@ -42,8 +42,8 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         RequestedAuthnContext* rac = dynamic_cast<RequestedAuthnContext*>(xo.get());
-        TS_ASSERT(rac !=NULL);
-        TS_ASSERT(rac->getComparison()==NULL);
+        TS_ASSERT(rac !=nullptr);
+        TS_ASSERT(rac->getComparison()==nullptr);
 
         TSM_ASSERT_EQUALS("# of AuthnContextClassRef child elements", 0, rac->getAuthnContextClassRefs().size());
         TSM_ASSERT_EQUALS("# of AuthnContextDeclRef child elements", 0, rac->getAuthnContextDeclRefs().size());
@@ -52,7 +52,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         RequestedAuthnContext* rac = dynamic_cast<RequestedAuthnContext*>(xo.get());
-        TS_ASSERT(rac!=NULL);
+        TS_ASSERT(rac!=nullptr);
         assertEquals("Comparison attribute", expectedComparison, rac->getComparison());
 
         TSM_ASSERT_EQUALS("# of AuthnContextClassRef child elements", 0, rac->getAuthnContextClassRefs().size());
@@ -62,8 +62,8 @@ public:
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         RequestedAuthnContext* rac = dynamic_cast<RequestedAuthnContext*>(xo.get());
-        TS_ASSERT(rac !=NULL);
-        TS_ASSERT(rac->getComparison()==NULL);
+        TS_ASSERT(rac !=nullptr);
+        TS_ASSERT(rac->getComparison()==nullptr);
 
         TSM_ASSERT_EQUALS("# of AuthnContextClassRef child elements", 3, rac->getAuthnContextClassRefs().size());
         TSM_ASSERT_EQUALS("# of AuthnContextDeclRef child elements", 0, rac->getAuthnContextDeclRefs().size());
@@ -83,7 +83,7 @@ public:
     void testChildElementsMarshall() {
         RequestedAuthnContext* rac=RequestedAuthnContextBuilder::buildRequestedAuthnContext();
         // 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);
         rac->addNamespace(*ns);
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());