Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/opensaml2.git] / samltest / saml2 / core / impl / Assertion20Test.h

diff --git a/samltest/saml2/core/impl/Assertion20Test.h b/samltest/saml2/core/impl/Assertion20Test.h
index 0f28e4d..bea0592 100644 (file)
--- a/samltest/saml2/core/impl/Assertion20Test.h
+++ b/samltest/saml2/core/impl/Assertion20Test.h
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2006 Internet2
- * 
+ *  Copyright 2001-2010 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
@@ -27,18 +27,18 @@ class Assertion20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase
 
 public:
     void setUp() {
-        expectedVersion = SAMLConstants::SAML20_VERSION;
+        expectedVersion = samlconstants::SAML20_VERSION;
         expectedID = XMLString::transcode("abc123");
         expectedIssueInstant = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
         expectedIssueInstant->parseDateTime();
-    
+
 
         singleElementFile = data_path + "saml2/core/impl/Assertion.xml";
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AssertionOptionalAttributes.xml";
-        childElementsFile  = data_path + "saml2/core/impl/AssertionChildElements.xml";    
+        childElementsFile  = data_path + "saml2/core/impl/AssertionChildElements.xml";
         SAMLObjectBaseTestCase::setUp();
     }
-    
+
     void tearDown() {
         delete expectedIssueInstant;
         XMLString::release(&expectedID);
@@ -48,17 +48,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,19 +69,19 @@ 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", 0, assertion->getStatements().size());
+        TSM_ASSERT_EQUALS("# of Statement child elements", 1, assertion->getStatements().size());
         TSM_ASSERT_EQUALS("# of AuthnStatement child elements", 1, assertion->getAuthnStatements().size());
         TSM_ASSERT_EQUALS("# of AttributeStatement child elements", 3, assertion->getAttributeStatements().size());
         TSM_ASSERT_EQUALS("# of AuthzDecisionStatement child elements", 2, assertion->getAuthzDecisionStatements().size());
@@ -95,6 +95,8 @@ public:
     }
 
     void testChildElementsMarshall() {
+        xmltooling::QName qext("http://www.opensaml.org/", "Foo", "ext");
+
         Assertion* assertion=AssertionBuilder::buildAssertion();
         assertion->setID(expectedID);
         assertion->setIssueInstant(expectedIssueInstant);
@@ -103,17 +105,18 @@ public:
         assertion->setConditions(ConditionsBuilder::buildConditions());
         assertion->setAdvice(AdviceBuilder::buildAdvice());
 
-        //Test storing children as their direct type 
+        //Test storing children as their direct type
         assertion->getAuthnStatements().push_back(AuthnStatementBuilder::buildAuthnStatement());
         assertion->getAttributeStatements().push_back(AttributeStatementBuilder::buildAttributeStatement());
         assertion->getAttributeStatements().push_back(AttributeStatementBuilder::buildAttributeStatement());
         assertion->getAuthzDecisionStatements().push_back(AuthzDecisionStatementBuilder::buildAuthzDecisionStatement());
         assertion->getAuthzDecisionStatements().push_back(AuthzDecisionStatementBuilder::buildAuthzDecisionStatement());
         assertion->getAttributeStatements().push_back(AttributeStatementBuilder::buildAttributeStatement());
+        assertion->getStatements().push_back(StatementBuilder::buildStatement(qext));
         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);
@@ -129,6 +132,7 @@ public:
         assertion->getStatements().push_back(AuthzDecisionStatementBuilder::buildAuthzDecisionStatement());
         assertion->getStatements().push_back(AuthzDecisionStatementBuilder::buildAuthzDecisionStatement());
         assertion->getStatements().push_back(AttributeStatementBuilder::buildAttributeStatement());
+        assertion->getStatements().push_back(StatementBuilder::buildStatement(qext));
         assertEquals(expectedChildElementsDOM, assertion);
     }