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

diff --git a/samltest/saml2/core/impl/NewEncryptedID20Test.h b/samltest/saml2/core/impl/NewEncryptedID20Test.h
index abb4d89..c09a904 100644
--- a/samltest/saml2/core/impl/NewEncryptedID20Test.h
+++ b/samltest/saml2/core/impl/NewEncryptedID20Test.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.
@@ -39,16 +39,16 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==NULL);
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==nullptr);
         TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 0, encID->getEncryptedKeys().size());
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=NULL);
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=nullptr);
         TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 2, encID->getEncryptedKeys().size());
     }