Change license header, remove stale pkg files.

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

diff --git a/samltest/saml2/core/impl/Conditions20Test.h b/samltest/saml2/core/impl/Conditions20Test.h
index 121283a..28898d7 100644 (file)
--- a/samltest/saml2/core/impl/Conditions20Test.h
+++ b/samltest/saml2/core/impl/Conditions20Test.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"
@@ -33,10 +37,10 @@ public:
 
         singleElementFile = data_path + "saml2/core/impl/Conditions.xml";
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ConditionsOptionalAttributes.xml";
-        childElementsFile  = data_path + "saml2/core/impl/ConditionsChildElements.xml";    
+        childElementsFile  = data_path + "saml2/core/impl/ConditionsChildElements.xml";
         SAMLObjectBaseTestCase::setUp();
     }
-    
+
     void tearDown() {
         delete expectedNotBefore;
         delete expectedNotOnOrAfter;
@@ -46,11 +50,11 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Conditions* conditions = dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
 
-        TS_ASSERT(conditions->getNotBefore()==NULL);
-        TS_ASSERT(conditions->getNotOnOrAfter()==NULL);
+        TS_ASSERT(conditions->getNotBefore()==nullptr);
+        TS_ASSERT(conditions->getNotOnOrAfter()==nullptr);
 
         TSM_ASSERT_EQUALS("# of Condition child elements", 0, conditions->getConditions().size());
         TSM_ASSERT_EQUALS("# of AudienceRestriction child elements", 0, conditions->getAudienceRestrictions().size());
@@ -61,7 +65,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         Conditions* conditions = dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
         TSM_ASSERT_EQUALS("NotBefore attribute", expectedNotBefore->getEpoch(), conditions->getNotBefore()->getEpoch());
         TSM_ASSERT_EQUALS("NotOnOrAfter attribute", expectedNotOnOrAfter->getEpoch(), conditions->getNotOnOrAfter()->getEpoch());
@@ -75,12 +79,12 @@ public:
     void testChildElementsUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
         Conditions* conditions= dynamic_cast<Conditions*>(xo.get());
-        TS_ASSERT(conditions!=NULL);
+        TS_ASSERT(conditions!=nullptr);
 
-        TS_ASSERT(conditions->getNotBefore()==NULL);
-        TS_ASSERT(conditions->getNotOnOrAfter()==NULL);
+        TS_ASSERT(conditions->getNotBefore()==nullptr);
+        TS_ASSERT(conditions->getNotOnOrAfter()==nullptr);
 
-        TSM_ASSERT_EQUALS("# of Condition child elements", 0, conditions->getConditions().size());
+        TSM_ASSERT_EQUALS("# of Condition child elements", 1, conditions->getConditions().size());
         TSM_ASSERT_EQUALS("# of AudienceRestriction child elements", 3, conditions->getAudienceRestrictions().size());
         TSM_ASSERT_EQUALS("# of OneTimeUse child elements", 1, conditions->getOneTimeUses().size());
         TSM_ASSERT_EQUALS("# of ProxyRestriction child elements", 2, conditions->getProxyRestrictions().size());
@@ -99,19 +103,21 @@ public:
     }
 
     void testChildElementsMarshall() {
+        xmltooling::QName qext("http://www.opensaml.org/", "Foo", "ext");
         Conditions* conditions=ConditionsBuilder::buildConditions();
 
-        //Test storing children as their direct type 
+        //Test storing children as their direct type
         conditions->getAudienceRestrictions().push_back(AudienceRestrictionBuilder::buildAudienceRestriction());
         conditions->getAudienceRestrictions().push_back(AudienceRestrictionBuilder::buildAudienceRestriction());
         conditions->getProxyRestrictions().push_back(ProxyRestrictionBuilder::buildProxyRestriction());
         conditions->getAudienceRestrictions().push_back(AudienceRestrictionBuilder::buildAudienceRestriction());
         conditions->getOneTimeUses().push_back(OneTimeUseBuilder::buildOneTimeUse());
         conditions->getProxyRestrictions().push_back(ProxyRestrictionBuilder::buildProxyRestriction());
+        conditions->getConditions().push_back(ConditionBuilder::buildCondition(qext));
         assertEquals(expectedChildElementsDOM, conditions);
 
         // Note: assertEquals() above has already 'delete'-ed the XMLObject* it was passed
-        conditions=NULL;
+        conditions=nullptr;
         conditions=ConditionsBuilder::buildConditions();
 
         //Test storing children as a Condition (each is a derived type of ConditionAbstractType)
@@ -121,6 +127,7 @@ public:
         conditions->getConditions().push_back(AudienceRestrictionBuilder::buildAudienceRestriction());
         conditions->getConditions().push_back(OneTimeUseBuilder::buildOneTimeUse());
         conditions->getConditions().push_back(ProxyRestrictionBuilder::buildProxyRestriction());
+        conditions->getConditions().push_back(ConditionBuilder::buildCondition(qext));
         assertEquals(expectedChildElementsDOM, conditions);
     }