X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsaml2%2Fcore%2Fimpl%2FNewEncryptedID20Test.h;h=51c72c8e338e277ea7f2b6780643376f7b149dbf;hb=f1208cd2f514700244816377443c4951dc22c848;hp=4f6435d43b8579cd97358005d422c16002c091ce;hpb=0703fa970c8d1f15600ce3fd1b350bdb90930bb9;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/saml2/core/impl/NewEncryptedID20Test.h b/samltest/saml2/core/impl/NewEncryptedID20Test.h
index 4f6435d..51c72c8 100644
--- a/samltest/saml2/core/impl/NewEncryptedID20Test.h
+++ b/samltest/saml2/core/impl/NewEncryptedID20Test.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"
@@ -39,16 +43,16 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==NULL);
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==nullptr);
         TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 0, encID->getEncryptedKeys().size());
     }
 
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=NULL);
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=nullptr);
         TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 2, encID->getEncryptedKeys().size());
     }