Revise boolean attribute methods to handle defaults.

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

diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h
index 5c5a689..140d675 100644 (file)
--- a/samltest/saml2/core/impl/AuthnRequest20Test.h
+++ b/samltest/saml2/core/impl/AuthnRequest20Test.h
@@ -76,8 +76,8 @@ public:
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r
-        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", false, request->ForceAuthn().first);\r
-        TSM_ASSERT_EQUALS("IsPassive attribute presence", false, request->IsPassive().first);\r
+        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", XMLConstants::XML_BOOL_NULL, request->getForceAuthn());\r
+        TSM_ASSERT_EQUALS("IsPassive attribute presence", XMLConstants::XML_BOOL_NULL, request->getIsPassive());\r
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);\r
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);\r
 \r
@@ -98,10 +98,8 @@ public:
 \r
         assertEquals("Consent attribute", expectedConsent, request->getConsent());\r
         assertEquals("Destination attribute", expectedDestination, request->getDestination());\r
-        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", true, request->ForceAuthn().first);\r
-        TSM_ASSERT_EQUALS("ForceAuthn attribute value", expectedForceAuthn, request->ForceAuthn().second);\r
-        TSM_ASSERT_EQUALS("IsPassive attribute presence", true, request->IsPassive().first);\r
-        TSM_ASSERT_EQUALS("IsPassive attribute value", expectedIsPassive, request->IsPassive().second);\r
+        TSM_ASSERT_EQUALS("ForceAuthn attribute value", expectedForceAuthn, request->ForceAuthn());\r
+        TSM_ASSERT_EQUALS("IsPassive attribute value", expectedIsPassive, request->IsPassive());\r
         assertEquals("ProtocolBinding attribute", expectedProtocolBinding,request->getProtocolBinding());\r
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",true, request->getAssertionConsumerServiceIndex().first);\r
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute value",expectedAssertionConsumerServiceIndex, request->getAssertionConsumerServiceIndex().second);\r
@@ -132,8 +130,8 @@ public:
         TS_ASSERT(request->getConditions()!=NULL);\r
         TS_ASSERT(request->getRequestedAuthnContext()!=NULL);\r
         TS_ASSERT(request->getScoping()!=NULL);\r
-        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", false, request->ForceAuthn().first);\r
-        TSM_ASSERT_EQUALS("IsPassive attribute presence", false, request->IsPassive().first);\r
+        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", XMLConstants::XML_BOOL_NULL, request->getForceAuthn());\r
+        TSM_ASSERT_EQUALS("IsPassive attribute presence", XMLConstants::XML_BOOL_NULL, request->getIsPassive());\r
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);\r
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);\r
     }\r