Change license header, remove stale pkg files.

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

diff --git a/samltest/saml1/core/impl/AuthenticationStatementTest.h b/samltest/saml1/core/impl/AuthenticationStatementTest.h
index 3a5a41d..8468b85 100644 (file)
--- a/samltest/saml1/core/impl/AuthenticationStatementTest.h
+++ b/samltest/saml1/core/impl/AuthenticationStatementTest.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"
@@ -42,11 +46,11 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         AuthenticationStatement& as = dynamic_cast<AuthenticationStatement&>(*xo.get());
-        TSM_ASSERT("AuthenticationMethod attribute present", as.getAuthenticationMethod()==NULL);
-        TSM_ASSERT("AuthenticationInstant attribute present", as.getAuthenticationInstant()==NULL);
+        TSM_ASSERT("AuthenticationMethod attribute present", as.getAuthenticationMethod()==nullptr);
+        TSM_ASSERT("AuthenticationInstant attribute present", as.getAuthenticationInstant()==nullptr);
 
-        TSM_ASSERT("Subject element", as.getSubject()==NULL);
-        TSM_ASSERT("SubjectLocality element", as.getSubjectLocality()==NULL);
+        TSM_ASSERT("Subject element", as.getSubject()==nullptr);
+        TSM_ASSERT("SubjectLocality element", as.getSubjectLocality()==nullptr);
         TSM_ASSERT_EQUALS("AuthorityBinding element count", 0, as.getAuthorityBindings().size());
     }
 
@@ -65,8 +69,8 @@ public:
         auto_ptr<AuthenticationStatement> as2(as1.cloneAuthenticationStatement());
         AuthenticationStatement& as=*as2.get();
 
-        TSM_ASSERT("Subject element", as.getSubject()!=NULL);
-        TSM_ASSERT("SubjectLocality element", as.getSubjectLocality()!=NULL);
+        TSM_ASSERT("Subject element", as.getSubject()!=nullptr);
+        TSM_ASSERT("SubjectLocality element", as.getSubjectLocality()!=nullptr);
 
         TSM_ASSERT_EQUALS("AuthorityBinding element count", 2, as.getAuthorityBindings().size());
         as.getAuthorityBindings().erase(as.getAuthorityBindings().begin());