Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / samltest / saml2 / core / impl / Conditions20Test.h

diff --git a/samltest/saml2/core/impl/Conditions20Test.h b/samltest/saml2/core/impl/Conditions20Test.h
index 9ef7d60..b3b018b 100644 (file)
--- a/samltest/saml2/core/impl/Conditions20Test.h
+++ b/samltest/saml2/core/impl/Conditions20Test.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.
@@ -46,11 +46,11 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Conditions* conditions = dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
 
-        TS_ASSERT(conditions->getNotBefore()==NULL);
-        TS_ASSERT(conditions->getNotOnOrAfter()==NULL);
+        TS_ASSERT(conditions->getNotBefore()==nullptr);
+        TS_ASSERT(conditions->getNotOnOrAfter()==nullptr);
 
         TSM_ASSERT_EQUALS("# of Condition child elements", 0, conditions->getConditions().size());
         TSM_ASSERT_EQUALS("# of AudienceRestriction child elements", 0, conditions->getAudienceRestrictions().size());
@@ -61,7 +61,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         Conditions* conditions = dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
         TSM_ASSERT_EQUALS("NotBefore attribute", expectedNotBefore->getEpoch(), conditions->getNotBefore()->getEpoch());
         TSM_ASSERT_EQUALS("NotOnOrAfter attribute", expectedNotOnOrAfter->getEpoch(), conditions->getNotOnOrAfter()->getEpoch());
@@ -75,10 +75,10 @@ public:
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         Conditions* conditions= dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
-        TS_ASSERT(conditions->getNotBefore()==NULL);
-        TS_ASSERT(conditions->getNotOnOrAfter()==NULL);
+        TS_ASSERT(conditions->getNotBefore()==nullptr);
+        TS_ASSERT(conditions->getNotOnOrAfter()==nullptr);
 
         TSM_ASSERT_EQUALS("# of Condition child elements", 1, conditions->getConditions().size());
         TSM_ASSERT_EQUALS("# of AudienceRestriction child elements", 3, conditions->getAudienceRestrictions().size());
@@ -113,7 +113,7 @@ public:
         assertEquals(expectedChildElementsDOM, conditions);
 
         // Note: assertEquals() above has already 'delete'-ed the XMLObject* it was passed
-        conditions=NULL;
+        conditions=nullptr;
         conditions=ConditionsBuilder::buildConditions();
 
         //Test storing children as a Condition (each is a derived type of ConditionAbstractType)