From 36737d2d4507e3eec5d1fcfc59d381bd0f79b2c9 Mon Sep 17 00:00:00 2001 From: Brent Putman Date: Tue, 11 Jul 2006 23:09:47 +0000 Subject: [PATCH] Multi-line svn commit, see body. Change unit tests to use overloaded assertEquals() for XMLCh comparisons. Change unit tests to use epoch for DateTime comparisons. --- samltest/saml1/core/impl/ActionTest.h | 4 ++-- samltest/saml1/core/impl/AssertionIDReferenceTest.h | 2 +- samltest/saml1/core/impl/AssertionTest.h | 21 +++++++++++---------- samltest/saml1/core/impl/AttributeDesignatorTest.h | 4 ++-- samltest/saml1/core/impl/AttributeTest.h | 4 ++-- samltest/saml1/core/impl/AudienceTest.h | 2 +- .../saml1/core/impl/AuthenticationStatementTest.h | 4 ++-- samltest/saml2/core/impl/ArtifactResolve20Test.h | 3 ++- samltest/saml2/core/impl/ArtifactResponse20Test.h | 3 ++- samltest/saml2/core/impl/AssertionIDRequest20Test.h | 3 ++- samltest/saml2/core/impl/AttributeQuery20Test.h | 3 ++- samltest/saml2/core/impl/AuthnQuery20Test.h | 3 ++- samltest/saml2/core/impl/AuthnRequest20Test.h | 3 ++- samltest/saml2/core/impl/AuthzDecisionQuery20Test.h | 3 ++- samltest/saml2/core/impl/LogoutRequest20Test.h | 6 ++++-- samltest/saml2/core/impl/LogoutResponse20Test.h | 3 ++- .../saml2/core/impl/ManageNameIDRequest20Test.h | 3 ++- .../saml2/core/impl/ManageNameIDResponse20Test.h | 3 ++- .../saml2/core/impl/NameIDMappingRequest20Test.h | 3 ++- .../saml2/core/impl/NameIDMappingResponse20Test.h | 3 ++- samltest/saml2/core/impl/Response20Test.h | 3 ++- samltest/saml2/core/impl/StatusResponse20Test.h | 3 ++- 22 files changed, 53 insertions(+), 36 deletions(-) diff --git a/samltest/saml1/core/impl/ActionTest.h b/samltest/saml1/core/impl/ActionTest.h index f2f92bc..643adf2 100644 --- a/samltest/saml1/core/impl/ActionTest.h +++ b/samltest/saml1/core/impl/ActionTest.h @@ -49,8 +49,8 @@ public: void testSingleElementOptionalAttributesUnmarshall() { auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); Action* action = dynamic_cast(xo.get()); - TSM_ASSERT_SAME_DATA("namespace attribute ", expectedNamespace, action->getNamespace(), XMLString::stringLen(expectedNamespace)); - TSM_ASSERT_SAME_DATA("Contents ", expectedContents, action->getAction(), XMLString::stringLen(expectedContents)); + assertEquals("namespace attribute ", expectedNamespace, action->getNamespace()); + assertEquals("Contents ", expectedContents, action->getAction()); } void testSingleElementMarshall() { diff --git a/samltest/saml1/core/impl/AssertionIDReferenceTest.h b/samltest/saml1/core/impl/AssertionIDReferenceTest.h index a2b9846..3cd2f92 100644 --- a/samltest/saml1/core/impl/AssertionIDReferenceTest.h +++ b/samltest/saml1/core/impl/AssertionIDReferenceTest.h @@ -45,7 +45,7 @@ public: void testSingleElementOptionalAttributesUnmarshall() { auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); AssertionIDReference* assertionIDReference = dynamic_cast(xo.get()); - TSM_ASSERT_SAME_DATA("NCName ", expectedNCName, assertionIDReference->getAssertionID(), XMLString::stringLen(expectedNCName)); + assertEquals("NCName ", expectedNCName, assertionIDReference->getAssertionID()); } void testSingleElementMarshall() { diff --git a/samltest/saml1/core/impl/AssertionTest.h b/samltest/saml1/core/impl/AssertionTest.h index 7387e34..94ba0ac 100644 --- a/samltest/saml1/core/impl/AssertionTest.h +++ b/samltest/saml1/core/impl/AssertionTest.h @@ -22,14 +22,15 @@ using namespace opensaml::saml1; class AssertionTest : public CxxTest::TestSuite, public SAMLObjectBaseTestCase { int expectedMinorVersion; XMLCh* expectedIssuer; - XMLCh* expectedIssueInstant; + DateTime* expectedIssueInstant; XMLCh* expectedID; public: void setUp() { expectedID=XMLString::transcode("ident"); expectedMinorVersion=1; - expectedIssueInstant=XMLString::transcode("1970-01-02T01:01:02.100Z"); + expectedIssueInstant=new DateTime(XMLString::transcode("1970-01-02T01:01:02.100Z")); + expectedIssueInstant->parseDateTime(); expectedIssuer=XMLString::transcode("issuer"); singleElementFile = data_path + "saml1/core/impl/singleAssertion.xml"; singleElementOptionalAttributesFile = data_path + "saml1/core/impl/singleAssertionAttributes.xml"; @@ -39,8 +40,8 @@ public: void tearDown() { XMLString::release(&expectedID); - XMLString::release(&expectedIssueInstant); XMLString::release(&expectedIssuer); + delete expectedIssueInstant; SAMLObjectBaseTestCase::tearDown(); } @@ -48,8 +49,8 @@ public: auto_ptr xo(unmarshallElement(singleElementFile)); Assertion& assertion = dynamic_cast(*xo.get()); TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL); - TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant)); - TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID)); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch()); + assertEquals("ID attribute", expectedID, assertion.getAssertionID()); TSM_ASSERT("Conditions element", assertion.getConditions()==NULL); TSM_ASSERT("Advice element", assertion.getAdvice()==NULL); @@ -65,9 +66,9 @@ public: auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); Assertion& assertion = dynamic_cast(*xo.get()); - TSM_ASSERT_SAME_DATA("Issuer attribute", expectedIssuer, assertion.getIssuer(), XMLString::stringLen(expectedIssuer)); - TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant)); - TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID)); + assertEquals("Issuer attribute", expectedIssuer, assertion.getIssuer()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch()); + assertEquals("ID attribute", expectedID, assertion.getAssertionID()); TSM_ASSERT_EQUALS("Issuer expectedMinorVersion", expectedMinorVersion, assertion.getMinorVersion().second); TSM_ASSERT("Conditions element", assertion.getConditions()==NULL); @@ -85,8 +86,8 @@ public: Assertion& assertion = dynamic_cast(*xo.get()); TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL); - TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant)); - TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID)); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch()); + assertEquals("ID attribute", expectedID, assertion.getAssertionID()); TSM_ASSERT("Conditions element null", assertion.getConditions()!=NULL); TSM_ASSERT("Advice element null", assertion.getAdvice()!=NULL); diff --git a/samltest/saml1/core/impl/AttributeDesignatorTest.h b/samltest/saml1/core/impl/AttributeDesignatorTest.h index b6f005b..9f09fc2 100644 --- a/samltest/saml1/core/impl/AttributeDesignatorTest.h +++ b/samltest/saml1/core/impl/AttributeDesignatorTest.h @@ -48,8 +48,8 @@ public: void testSingleElementOptionalAttributesUnmarshall() { auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); AttributeDesignator& ad = dynamic_cast(*xo.get()); - TSM_ASSERT_SAME_DATA("AttributeName", expectedAttributeName, ad.getAttributeName(), XMLString::stringLen(expectedAttributeName)); - TSM_ASSERT_SAME_DATA("AttributeNamespace", expectedAttributeNamespace, ad.getAttributeNamespace(), XMLString::stringLen(expectedAttributeNamespace)); + assertEquals("AttributeName", expectedAttributeName, ad.getAttributeName()); + assertEquals("AttributeNamespace", expectedAttributeNamespace, ad.getAttributeNamespace()); } void testSingleElementMarshall() { diff --git a/samltest/saml1/core/impl/AttributeTest.h b/samltest/saml1/core/impl/AttributeTest.h index 0e5afe8..8a99211 100644 --- a/samltest/saml1/core/impl/AttributeTest.h +++ b/samltest/saml1/core/impl/AttributeTest.h @@ -50,8 +50,8 @@ public: void testSingleElementOptionalAttributesUnmarshall() { auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); Attribute& a = dynamic_cast(*xo.get()); - TSM_ASSERT_SAME_DATA("AttributeName", expectedAttributeName, a.getAttributeName(), XMLString::stringLen(expectedAttributeName)); - TSM_ASSERT_SAME_DATA("AttributeNamespace", expectedAttributeNamespace, a.getAttributeNamespace(), XMLString::stringLen(expectedAttributeNamespace)); + assertEquals("AttributeName", expectedAttributeName, a.getAttributeName()); + assertEquals("AttributeNamespace", expectedAttributeNamespace, a.getAttributeNamespace()); } void testChildElementsUnmarshall() { diff --git a/samltest/saml1/core/impl/AudienceTest.h b/samltest/saml1/core/impl/AudienceTest.h index 4b45d4f..1a95e35 100644 --- a/samltest/saml1/core/impl/AudienceTest.h +++ b/samltest/saml1/core/impl/AudienceTest.h @@ -44,7 +44,7 @@ public: void testSingleElementOptionalAttributesUnmarshall() { auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); Audience& a = dynamic_cast(*xo.get()); - TSM_ASSERT_SAME_DATA("Uri", expectedUri, a.getAudienceURI(), XMLString::stringLen(expectedUri)); + assertEquals("Uri", expectedUri, a.getAudienceURI()); } void testSingleElementMarshall() { diff --git a/samltest/saml1/core/impl/AuthenticationStatementTest.h b/samltest/saml1/core/impl/AuthenticationStatementTest.h index f15eed2..0bf3df1 100644 --- a/samltest/saml1/core/impl/AuthenticationStatementTest.h +++ b/samltest/saml1/core/impl/AuthenticationStatementTest.h @@ -54,8 +54,8 @@ public: auto_ptr xo(unmarshallElement(singleElementOptionalAttributesFile)); AuthenticationStatement& as = dynamic_cast(*xo.get()); - TSM_ASSERT_SAME_DATA("AuthenticationMethod attribute", expectedAuthenticationMethod, as.getAuthenticationMethod(), XMLString::stringLen(expectedAuthenticationMethod)); - TSM_ASSERT_SAME_DATA("AuthenticationInstant attribute", expectedAuthenticationInstant, as.getAuthenticationInstant()->getRawData(), XMLString::stringLen(expectedAuthenticationInstant)); + assertEquals("AuthenticationMethod attribute", expectedAuthenticationMethod, as.getAuthenticationMethod()); + assertEquals("AuthenticationInstant attribute", expectedAuthenticationInstant, as.getAuthenticationInstant()->getRawData()); } void testChildElementsUnmarshall() { diff --git a/samltest/saml2/core/impl/ArtifactResolve20Test.h b/samltest/saml2/core/impl/ArtifactResolve20Test.h index ad2bb4e..670bdf2 100644 --- a/samltest/saml2/core/impl/ArtifactResolve20Test.h +++ b/samltest/saml2/core/impl/ArtifactResolve20Test.h @@ -35,6 +35,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/ArtifactResolve.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ArtifactResolveOptionalAttributes.xml"; @@ -57,7 +58,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/ArtifactResponse20Test.h b/samltest/saml2/core/impl/ArtifactResponse20Test.h index e01b9f9..2e46e21 100644 --- a/samltest/saml2/core/impl/ArtifactResponse20Test.h +++ b/samltest/saml2/core/impl/ArtifactResponse20Test.h @@ -42,6 +42,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); authnRequestID = XMLString::transcode("test1"); @@ -69,7 +70,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/AssertionIDRequest20Test.h b/samltest/saml2/core/impl/AssertionIDRequest20Test.h index 8a6dda1..8488000 100644 --- a/samltest/saml2/core/impl/AssertionIDRequest20Test.h +++ b/samltest/saml2/core/impl/AssertionIDRequest20Test.h @@ -35,6 +35,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/AssertionIDRequest.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AssertionIDRequestOptionalAttributes.xml"; @@ -57,7 +58,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/AttributeQuery20Test.h b/samltest/saml2/core/impl/AttributeQuery20Test.h index 7e9e4df..1b1fc9d 100644 --- a/samltest/saml2/core/impl/AttributeQuery20Test.h +++ b/samltest/saml2/core/impl/AttributeQuery20Test.h @@ -35,6 +35,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/AttributeQuery.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AttributeQueryOptionalAttributes.xml"; @@ -57,7 +58,7 @@ public: TS_ASSERT(query!=NULL); assertEquals("ID attribute", expectedID, query->getID()); assertEquals("Version attribute", expectedVersion, query->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch()); TS_ASSERT(query->getIssuer()==NULL); TS_ASSERT(query->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/AuthnQuery20Test.h b/samltest/saml2/core/impl/AuthnQuery20Test.h index 23275bd..5610d0d 100644 --- a/samltest/saml2/core/impl/AuthnQuery20Test.h +++ b/samltest/saml2/core/impl/AuthnQuery20Test.h @@ -36,6 +36,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedSessionIndex = XMLString::transcode("session12345"); singleElementFile = data_path + "saml2/core/impl/AuthnQuery.xml"; @@ -60,7 +61,7 @@ public: TS_ASSERT(query!=NULL); assertEquals("ID attribute", expectedID, query->getID()); assertEquals("Version attribute", expectedVersion, query->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch()); TS_ASSERT(query->getIssuer()==NULL); TS_ASSERT(query->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h index 979beac..5c5a689 100644 --- a/samltest/saml2/core/impl/AuthnRequest20Test.h +++ b/samltest/saml2/core/impl/AuthnRequest20Test.h @@ -40,6 +40,7 @@ public: expectedID = XMLString::transcode("abc123");; expectedVersion = XMLString::transcode("2.0"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedForceAuthn = true; @@ -74,7 +75,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TSM_ASSERT_EQUALS("ForceAuthn attribute presence", false, request->ForceAuthn().first); TSM_ASSERT_EQUALS("IsPassive attribute presence", false, request->IsPassive().first); TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first); diff --git a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h index 1e892a8..d1aea19 100644 --- a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h +++ b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h @@ -36,6 +36,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedResource = XMLString::transcode("urn:string:resource"); singleElementFile = data_path + "saml2/core/impl/AuthzDecisionQuery.xml"; @@ -60,7 +61,7 @@ public: TS_ASSERT(query!=NULL); assertEquals("ID attribute", expectedID, query->getID()); assertEquals("Version attribute", expectedVersion, query->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch()); assertEquals("Resource attribute", expectedResource, query->getResource()); TS_ASSERT(query->getIssuer()==NULL); diff --git a/samltest/saml2/core/impl/LogoutRequest20Test.h b/samltest/saml2/core/impl/LogoutRequest20Test.h index ab87823..10da621 100644 --- a/samltest/saml2/core/impl/LogoutRequest20Test.h +++ b/samltest/saml2/core/impl/LogoutRequest20Test.h @@ -35,10 +35,12 @@ public: expectedID = XMLString::transcode("abc123");; expectedVersion = XMLString::transcode("2.0"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); expectedReason = XMLString::transcode("urn:string:reason"); expectedNotOnOrAfter = new DateTime(XMLString::transcode("2006-02-21T20:45:00.000Z")); + expectedNotOnOrAfter->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/LogoutRequest.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutRequestOptionalAttributes.xml"; @@ -63,7 +65,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); @@ -82,7 +84,7 @@ public: assertEquals("Consent attribute", expectedConsent, request->getConsent()); assertEquals("Destination attribute", expectedDestination, request->getDestination()); assertEquals("Reason attribute", expectedReason, request->getReason()); - assertEquals("NotOnOrAfter attribute", expectedNotOnOrAfter->getFormattedString(), request->getNotOnOrAfter()->getFormattedString()); + TSM_ASSERT_EQUALS("NotOnOrAfter attribute", expectedNotOnOrAfter->getEpoch(), request->getNotOnOrAfter()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/LogoutResponse20Test.h b/samltest/saml2/core/impl/LogoutResponse20Test.h index 40c9a4e..3cd675d 100644 --- a/samltest/saml2/core/impl/LogoutResponse20Test.h +++ b/samltest/saml2/core/impl/LogoutResponse20Test.h @@ -37,6 +37,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/LogoutResponse.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutResponseOptionalAttributes.xml"; @@ -61,7 +62,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h index ad26ac1..f2cecec 100644 --- a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h +++ b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h @@ -33,6 +33,7 @@ public: expectedID = XMLString::transcode("abc123");; expectedVersion = XMLString::transcode("2.0"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); @@ -57,7 +58,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h index d7a9105..3cdea30 100644 --- a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h +++ b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h @@ -37,6 +37,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/ManageNameIDResponse.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ManageNameIDResponseOptionalAttributes.xml"; @@ -61,7 +62,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h index 877a0da..f14b05c 100644 --- a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h +++ b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h @@ -33,6 +33,7 @@ public: expectedID = XMLString::transcode("abc123");; expectedVersion = XMLString::transcode("2.0"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); @@ -57,7 +58,7 @@ public: TS_ASSERT(request!=NULL); assertEquals("ID attribute", expectedID, request->getID()); assertEquals("Version attribute", expectedVersion, request->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch()); TS_ASSERT(request->getIssuer()==NULL); TS_ASSERT(request->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h index 379ee7e..ddc8c52 100644 --- a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h +++ b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h @@ -37,6 +37,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); singleElementFile = data_path + "saml2/core/impl/NameIDMappingResponse.xml"; singleElementOptionalAttributesFile = data_path + "saml2/core/impl/NameIDMappingResponseOptionalAttributes.xml"; @@ -61,7 +62,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/Response20Test.h b/samltest/saml2/core/impl/Response20Test.h index 8989446..ee2153a 100644 --- a/samltest/saml2/core/impl/Response20Test.h +++ b/samltest/saml2/core/impl/Response20Test.h @@ -42,6 +42,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); assertionID1 = XMLString::transcode("test1"); assertionID2= XMLString::transcode("test2"); @@ -73,7 +74,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); diff --git a/samltest/saml2/core/impl/StatusResponse20Test.h b/samltest/saml2/core/impl/StatusResponse20Test.h index 834dbd4..6c85449 100644 --- a/samltest/saml2/core/impl/StatusResponse20Test.h +++ b/samltest/saml2/core/impl/StatusResponse20Test.h @@ -49,6 +49,7 @@ public: expectedConsent = XMLString::transcode("urn:string:consent"); expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z")); + expectedIssueInstant->parseDateTime(); elementName = XMLString::transcode("Foo");; elementNS = XMLString::transcode("http://www.example.org/test"); @@ -103,7 +104,7 @@ public: assertEquals("ID attribute", expectedID, response->getID()); assertEquals("Version attribute", expectedVersion, response->getVersion()); - assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString()); + TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch()); TS_ASSERT(response->getIssuer()==NULL); TS_ASSERT(response->getSignature()==NULL); -- 2.1.4