Change license header, remove stale pkg files.

[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 32e2e46..28898d7 100644 (file)
--- a/samltest/saml2/core/impl/Conditions20Test.h
+++ b/samltest/saml2/core/impl/Conditions20Test.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2007 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 #include "internal.h"
@@ -46,11 +50,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 +65,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 +79,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());
@@ -99,7 +103,7 @@ public:
     }
 
     void testChildElementsMarshall() {
-        QName qext("http://www.opensaml.org/", "Foo", "ext");
+        xmltooling::QName qext("http://www.opensaml.org/", "Foo", "ext");
         Conditions* conditions=ConditionsBuilder::buildConditions();
 
         //Test storing children as their direct type
@@ -113,7 +117,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)