Change license header, remove stale pkg files.

[shibboleth/cpp-opensaml.git] / samltest / saml1 / core / impl / AssertionTest.h

diff --git a/samltest/saml1/core/impl/AssertionTest.h b/samltest/saml1/core/impl/AssertionTest.h
index 7b0ed6b..2b079b7 100644 (file)
--- a/samltest/saml1/core/impl/AssertionTest.h
+++ b/samltest/saml1/core/impl/AssertionTest.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2006 Internet2
- * 
- * 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
+/**
+ * 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.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 #include "internal.h"
@@ -48,12 +52,12 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());
-        TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);
+        TSM_ASSERT("Issuer attribute", assertion.getIssuer()==nullptr);
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch());
         assertEquals("ID attribute", expectedID, assertion.getAssertionID());
 
-        TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);
-        TSM_ASSERT("Advice element", assertion.getAdvice()==NULL);
+        TSM_ASSERT("Conditions element", assertion.getConditions()==nullptr);
+        TSM_ASSERT("Advice element", assertion.getAdvice()==nullptr);
 
         TSM_ASSERT_EQUALS("Statement element count", 0, assertion.getStatements().size());
         TSM_ASSERT_EQUALS("SubjectStatements element count", 0, assertion.getSubjectStatements().size());
@@ -71,8 +75,8 @@ public:
         assertEquals("ID attribute", expectedID, assertion.getAssertionID());
         TSM_ASSERT_EQUALS("Issuer expectedMinorVersion", expectedMinorVersion, assertion.getMinorVersion().second);
 
-        TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);
-        TSM_ASSERT("Advice element", assertion.getAdvice()==NULL);
+        TSM_ASSERT("Conditions element", assertion.getConditions()==nullptr);
+        TSM_ASSERT("Advice element", assertion.getAdvice()==nullptr);
 
         TSM_ASSERT_EQUALS("Statement element count", 0, assertion.getStatements().size());
         TSM_ASSERT_EQUALS("SubjectStatements element count", 0, assertion.getSubjectStatements().size());
@@ -85,12 +89,12 @@ public:
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());
 
-        TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);
+        TSM_ASSERT("Issuer attribute", assertion.getIssuer()==nullptr);
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch());
         assertEquals("ID attribute", expectedID, assertion.getAssertionID());
 
-        TSM_ASSERT("Conditions element null", assertion.getConditions()!=NULL);
-        TSM_ASSERT("Advice element null", assertion.getAdvice()!=NULL);
+        TSM_ASSERT("Conditions element null", assertion.getConditions()!=nullptr);
+        TSM_ASSERT("Advice element null", assertion.getAdvice()!=nullptr);
 
         TSM_ASSERT_EQUALS("AuthenticationStatements element count", 2, assertion.getAuthenticationStatements().size());
         TSM_ASSERT_EQUALS("AttributeStatements element count", 3, assertion.getAttributeStatements().size());