Change license header, remove stale pkg files.

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

diff --git a/samltest/saml2/core/impl/Assertion20Test.h b/samltest/saml2/core/impl/Assertion20Test.h
index 7a0039d..c3132ba 100644 (file)
--- a/samltest/saml2/core/impl/Assertion20Test.h
+++ b/samltest/saml2/core/impl/Assertion20Test.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"
@@ -48,17 +52,17 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Assertion* assertion = dynamic_cast<Assertion*>(xo.get());
-        TS_ASSERT(assertion!=NULL);
+        TS_ASSERT(assertion!=nullptr);
 
         assertEquals("ID attribute", expectedID, assertion->getID());
         assertEquals("Version attribute", expectedVersion, assertion->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion->getIssueInstant()->getEpoch());
 
-        TS_ASSERT(assertion->getIssuer()==NULL);
-        TS_ASSERT(assertion->getSignature()==NULL);
-        TS_ASSERT(assertion->getSubject()==NULL);
-        TS_ASSERT(assertion->getConditions()==NULL);
-        TS_ASSERT(assertion->getAdvice()==NULL);
+        TS_ASSERT(assertion->getIssuer()==nullptr);
+        TS_ASSERT(assertion->getSignature()==nullptr);
+        TS_ASSERT(assertion->getSubject()==nullptr);
+        TS_ASSERT(assertion->getConditions()==nullptr);
+        TS_ASSERT(assertion->getAdvice()==nullptr);
 
         TSM_ASSERT_EQUALS("# of Statement child elements", 0, assertion->getStatements().size());
         TSM_ASSERT_EQUALS("# of AuthnStatement child elements", 0, assertion->getAuthnStatements().size());
@@ -69,17 +73,17 @@ public:
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         Assertion* assertion= dynamic_cast<Assertion*>(xo.get());
-        TS_ASSERT(assertion!=NULL);
+        TS_ASSERT(assertion!=nullptr);
 
         assertEquals("ID attribute", expectedID, assertion->getID());
         assertEquals("Version attribute", expectedVersion, assertion->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion->getIssueInstant()->getEpoch());
 
-        TS_ASSERT(assertion->getIssuer()!=NULL);
-        TS_ASSERT(assertion->getSignature()==NULL);
-        TS_ASSERT(assertion->getSubject()!=NULL);
-        TS_ASSERT(assertion->getConditions()!=NULL);
-        TS_ASSERT(assertion->getAdvice()!=NULL);
+        TS_ASSERT(assertion->getIssuer()!=nullptr);
+        TS_ASSERT(assertion->getSignature()==nullptr);
+        TS_ASSERT(assertion->getSubject()!=nullptr);
+        TS_ASSERT(assertion->getConditions()!=nullptr);
+        TS_ASSERT(assertion->getAdvice()!=nullptr);
 
         TSM_ASSERT_EQUALS("# of Statement child elements", 1, assertion->getStatements().size());
         TSM_ASSERT_EQUALS("# of AuthnStatement child elements", 1, assertion->getAuthnStatements().size());
@@ -95,7 +99,7 @@ public:
     }
 
     void testChildElementsMarshall() {
-        QName qext("http://www.opensaml.org/", "Foo", "ext");
+        xmltooling::QName qext("http://www.opensaml.org/", "Foo", "ext");
 
         Assertion* assertion=AssertionBuilder::buildAssertion();
         assertion->setID(expectedID);
@@ -116,7 +120,7 @@ public:
         assertEquals(expectedChildElementsDOM, assertion);
 
         // Note: assertEquals() above has already 'delete'-ed the XMLObject* it was passed
-        assertion=NULL;
+        assertion=nullptr;
         assertion=AssertionBuilder::buildAssertion();
         assertion->setID(expectedID);
         assertion->setIssueInstant(expectedIssueInstant);