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

diff --git a/samltest/saml2/core/impl/Status20Test.h b/samltest/saml2/core/impl/Status20Test.h
index e164045..a7adad8 100644
--- a/samltest/saml2/core/impl/Status20Test.h
+++ b/samltest/saml2/core/impl/Status20Test.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.
@@ -35,19 +35,19 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Status* status = dynamic_cast<Status*>(xo.get());
-        TS_ASSERT(status!=NULL);
-        TSM_ASSERT("StatusCode child element", status->getStatusCode()==NULL);
-        TSM_ASSERT("StatusMessage child element", status->getStatusMessage()==NULL);
-        TSM_ASSERT("StatusDetail child element", status->getStatusDetail()==NULL);
+        TS_ASSERT(status!=nullptr);
+        TSM_ASSERT("StatusCode child element", status->getStatusCode()==nullptr);
+        TSM_ASSERT("StatusMessage child element", status->getStatusMessage()==nullptr);
+        TSM_ASSERT("StatusDetail child element", status->getStatusDetail()==nullptr);
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         Status* status = dynamic_cast<Status*>(xo.get());
-        TS_ASSERT(status!=NULL);
-        TSM_ASSERT("StatusCode child element", status->getStatusCode()!=NULL);
-        TSM_ASSERT("StatusMessage child element", status->getStatusMessage()!=NULL);
-        TSM_ASSERT("StatusDetail child element", status->getStatusDetail()!=NULL);
+        TS_ASSERT(status!=nullptr);
+        TSM_ASSERT("StatusCode child element", status->getStatusCode()!=nullptr);
+        TSM_ASSERT("StatusMessage child element", status->getStatusMessage()!=nullptr);
+        TSM_ASSERT("StatusDetail child element", status->getStatusDetail()!=nullptr);
     }
 
     void testSingleElementMarshall() {