X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsaml1%2Fcore%2Fimpl%2FAttributeTest.h;h=716c24dfad0e8490ed3f5f2b619f68e623e680c2;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hp=6f38fa16f9f88260531b2df1f068e448914d5956;hpb=932cfaae2176c2eba1a9938dc420591a9551a7f3;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/saml1/core/impl/AttributeTest.h b/samltest/saml1/core/impl/AttributeTest.h
index 6f38fa1..716c24d 100644
--- a/samltest/saml1/core/impl/AttributeTest.h
+++ b/samltest/saml1/core/impl/AttributeTest.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.
@@ -42,8 +42,8 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Attribute& a = dynamic_cast<Attribute&>(*xo.get());
-        TSM_ASSERT("AttributeName", a.getAttributeName()==NULL);
-        TSM_ASSERT("AttributeNamespace", a.getAttributeNamespace()==NULL);
+        TSM_ASSERT("AttributeName", a.getAttributeName()==nullptr);
+        TSM_ASSERT("AttributeNamespace", a.getAttributeNamespace()==nullptr);
         TSM_ASSERT_EQUALS("<AttributeValue> subelement found", 0, a.getAttributeValues().size());
     }
 
@@ -76,9 +76,9 @@ public:
         
         const XMLCh xsdstring[] = UNICODE_LITERAL_6(s,t,r,i,n,g);
        
-        const XMLObjectBuilder* builder=XMLObjectBuilder::getBuilder(QName(samlconstants::SAML1_NS,AttributeValue::LOCAL_NAME));
-        TS_ASSERT(builder!=NULL);
-        QName xsitype(xmlconstants::XSD_NS,xsdstring,xmlconstants::XSD_PREFIX);
+        const XMLObjectBuilder* builder=XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML1_NS,AttributeValue::LOCAL_NAME));
+        TS_ASSERT(builder!=nullptr);
+        xmltooling::QName xsitype(xmlconstants::XSD_NS,xsdstring,xmlconstants::XSD_PREFIX);
         for (int i=0; i<4; i++)
             a->getAttributeValues().push_back(builder->buildObject(samlconstants::SAML1_NS, AttributeValue::LOCAL_NAME, samlconstants::SAML1_PREFIX, &xsitype));