Change license header, remove stale pkg files.

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

diff --git a/samltest/saml2/core/impl/NameID20Test.h b/samltest/saml2/core/impl/NameID20Test.h
index ab37af7..8b5617d 100644 (file)
--- a/samltest/saml2/core/impl/NameID20Test.h
+++ b/samltest/saml2/core/impl/NameID20Test.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2007 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"
@@ -52,7 +56,7 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameID* nameid = dynamic_cast<NameID*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         assertEquals("Element content", expectedContent, nameid->getName());
     }
@@ -60,7 +64,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         NameID* nameid = dynamic_cast<NameID*>(xo.get());
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         assertEquals("NameQualifier attribute", expectedNameQualifier, nameid->getNameQualifier());
         assertEquals("SPNameQualifier attribute", expectedSPNameQualifier, nameid->getSPNameQualifier());
@@ -72,7 +76,7 @@ public:
 
     void testSingleElementMarshall() {
         NameID* nameid = NameIDBuilder::buildNameID();
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         nameid->setName(expectedContent);
         assertEquals(expectedDOM, nameid);
@@ -80,7 +84,7 @@ public:
 
     void testSingleElementOptionalAttributesMarshall() {
         NameID* nameid = NameIDBuilder::buildNameID();
-        TS_ASSERT(nameid!=NULL);
+        TS_ASSERT(nameid!=nullptr);
 
         nameid->setNameQualifier(expectedNameQualifier);
         nameid->setSPNameQualifier(expectedSPNameQualifier);