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.

diff --git a/samltest/saml1/core/impl/ActionTest.h b/samltest/saml1/core/impl/ActionTest.h
index f2f92bc..643adf2 100644 (file)
--- a/samltest/saml1/core/impl/ActionTest.h
+++ b/samltest/saml1/core/impl/ActionTest.h
@@ -49,8 +49,8 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Action* action = dynamic_cast<Action*>(xo.get());\r
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Action* action = dynamic_cast<Action*>(xo.get());\r

-        TSM_ASSERT_SAME_DATA("namespace attribute ", expectedNamespace, action->getNamespace(), XMLString::stringLen(expectedNamespace));\r
-        TSM_ASSERT_SAME_DATA("Contents ", expectedContents, action->getAction(), XMLString::stringLen(expectedContents));\r
+        assertEquals("namespace attribute ", expectedNamespace, action->getNamespace());\r
+        assertEquals("Contents ", expectedContents, action->getAction());\r

     }\r
 \r
     void testSingleElementMarshall() {\r
     }\r
 \r
     void testSingleElementMarshall() {\r

diff --git a/samltest/saml1/core/impl/AssertionIDReferenceTest.h b/samltest/saml1/core/impl/AssertionIDReferenceTest.h
index a2b9846..3cd2f92 100644 (file)
--- a/samltest/saml1/core/impl/AssertionIDReferenceTest.h
+++ b/samltest/saml1/core/impl/AssertionIDReferenceTest.h
@@ -45,7 +45,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AssertionIDReference* assertionIDReference = dynamic_cast<AssertionIDReference*>(xo.get());\r
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AssertionIDReference* assertionIDReference = dynamic_cast<AssertionIDReference*>(xo.get());\r

-        TSM_ASSERT_SAME_DATA("NCName ", expectedNCName, assertionIDReference->getAssertionID(), XMLString::stringLen(expectedNCName));\r
+        assertEquals("NCName ", expectedNCName, assertionIDReference->getAssertionID());\r

     }\r
 \r
     void testSingleElementMarshall() {\r
     }\r
 \r
     void testSingleElementMarshall() {\r

diff --git a/samltest/saml1/core/impl/AssertionTest.h b/samltest/saml1/core/impl/AssertionTest.h
index 7387e34..94ba0ac 100644 (file)
--- 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 {\r
     int expectedMinorVersion;\r
     XMLCh* expectedIssuer;\r
 class AssertionTest : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {\r
     int expectedMinorVersion;\r
     XMLCh* expectedIssuer;\r

-    XMLCh* expectedIssueInstant;\r
+    DateTime* expectedIssueInstant;\r

     XMLCh* expectedID;\r
 \r
 public:\r
     void setUp() {\r
         expectedID=XMLString::transcode("ident");\r
         expectedMinorVersion=1;\r
     XMLCh* expectedID;\r
 \r
 public:\r
     void setUp() {\r
         expectedID=XMLString::transcode("ident");\r
         expectedMinorVersion=1;\r

-        expectedIssueInstant=XMLString::transcode("1970-01-02T01:01:02.100Z");\r
+        expectedIssueInstant=new DateTime(XMLString::transcode("1970-01-02T01:01:02.100Z"));\r
+        expectedIssueInstant->parseDateTime();\r

         expectedIssuer=XMLString::transcode("issuer");\r
         singleElementFile = data_path + "saml1/core/impl/singleAssertion.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml1/core/impl/singleAssertionAttributes.xml";\r
         expectedIssuer=XMLString::transcode("issuer");\r
         singleElementFile = data_path + "saml1/core/impl/singleAssertion.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml1/core/impl/singleAssertionAttributes.xml";\r


@@ -39,8 +40,8 @@ public:
     \r
     void tearDown() {\r
         XMLString::release(&expectedID);\r
     \r
     void tearDown() {\r
         XMLString::release(&expectedID);\r

-        XMLString::release(&expectedIssueInstant);\r

         XMLString::release(&expectedIssuer);\r
         XMLString::release(&expectedIssuer);\r

+        delete expectedIssueInstant;\r

         SAMLObjectBaseTestCase::tearDown();\r
     }\r
 \r
         SAMLObjectBaseTestCase::tearDown();\r
     }\r
 \r


@@ -48,8 +49,8 @@ public:
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));\r
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
         TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));\r
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
         TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);\r

-        TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant));\r
-        TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID));\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch());\r
+        assertEquals("ID attribute", expectedID, assertion.getAssertionID());\r

 \r
         TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);\r
         TSM_ASSERT("Advice element", assertion.getAdvice()==NULL);\r
 \r
         TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);\r
         TSM_ASSERT("Advice element", assertion.getAdvice()==NULL);\r


@@ -65,9 +66,9 @@ public:
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
 \r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
 \r

-        TSM_ASSERT_SAME_DATA("Issuer attribute", expectedIssuer, assertion.getIssuer(), XMLString::stringLen(expectedIssuer));\r
-        TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant));\r
-        TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID));\r
+        assertEquals("Issuer attribute", expectedIssuer, assertion.getIssuer());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch());\r
+        assertEquals("ID attribute", expectedID, assertion.getAssertionID());\r

         TSM_ASSERT_EQUALS("Issuer expectedMinorVersion", expectedMinorVersion, assertion.getMinorVersion().second);\r
 \r
         TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);\r
         TSM_ASSERT_EQUALS("Issuer expectedMinorVersion", expectedMinorVersion, assertion.getMinorVersion().second);\r
 \r
         TSM_ASSERT("Conditions element", assertion.getConditions()==NULL);\r


@@ -85,8 +86,8 @@ public:
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
 \r
         TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);\r
         Assertion& assertion = dynamic_cast<Assertion&>(*xo.get());\r
 \r
         TSM_ASSERT("Issuer attribute", assertion.getIssuer()==NULL);\r

-        TSM_ASSERT_SAME_DATA("IssueInstant attribute", expectedIssueInstant, assertion.getIssueInstant()->getRawData(), XMLString::stringLen(expectedIssueInstant));\r
-        TSM_ASSERT_SAME_DATA("ID attribute", expectedID, assertion.getAssertionID(), XMLString::stringLen(expectedID));\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), assertion.getIssueInstant()->getEpoch());\r
+        assertEquals("ID attribute", expectedID, assertion.getAssertionID());\r

 \r
         TSM_ASSERT("Conditions element null", assertion.getConditions()!=NULL);\r
         TSM_ASSERT("Advice element null", assertion.getAdvice()!=NULL);\r
 \r
         TSM_ASSERT("Conditions element null", assertion.getConditions()!=NULL);\r
         TSM_ASSERT("Advice element null", assertion.getAdvice()!=NULL);\r

diff --git a/samltest/saml1/core/impl/AttributeDesignatorTest.h b/samltest/saml1/core/impl/AttributeDesignatorTest.h
index b6f005b..9f09fc2 100644 (file)
--- a/samltest/saml1/core/impl/AttributeDesignatorTest.h
+++ b/samltest/saml1/core/impl/AttributeDesignatorTest.h
@@ -48,8 +48,8 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AttributeDesignator& ad = dynamic_cast<AttributeDesignator&>(*xo.get());\r
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AttributeDesignator& ad = dynamic_cast<AttributeDesignator&>(*xo.get());\r

-        TSM_ASSERT_SAME_DATA("AttributeName", expectedAttributeName, ad.getAttributeName(), XMLString::stringLen(expectedAttributeName));\r
-        TSM_ASSERT_SAME_DATA("AttributeNamespace", expectedAttributeNamespace, ad.getAttributeNamespace(), XMLString::stringLen(expectedAttributeNamespace));\r
+        assertEquals("AttributeName", expectedAttributeName, ad.getAttributeName());\r
+        assertEquals("AttributeNamespace", expectedAttributeNamespace, ad.getAttributeNamespace());\r

     }\r
 \r
     void testSingleElementMarshall() {\r
     }\r
 \r
     void testSingleElementMarshall() {\r

diff --git a/samltest/saml1/core/impl/AttributeTest.h b/samltest/saml1/core/impl/AttributeTest.h
index 0e5afe8..8a99211 100644 (file)
--- a/samltest/saml1/core/impl/AttributeTest.h
+++ b/samltest/saml1/core/impl/AttributeTest.h
@@ -50,8 +50,8 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Attribute& a = dynamic_cast<Attribute&>(*xo.get());\r
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Attribute& a = dynamic_cast<Attribute&>(*xo.get());\r

-        TSM_ASSERT_SAME_DATA("AttributeName", expectedAttributeName, a.getAttributeName(), XMLString::stringLen(expectedAttributeName));\r
-        TSM_ASSERT_SAME_DATA("AttributeNamespace", expectedAttributeNamespace, a.getAttributeNamespace(), XMLString::stringLen(expectedAttributeNamespace));\r
+        assertEquals("AttributeName", expectedAttributeName, a.getAttributeName());\r
+        assertEquals("AttributeNamespace", expectedAttributeNamespace, a.getAttributeNamespace());\r

     }\r
 \r
     void testChildElementsUnmarshall() {\r
     }\r
 \r
     void testChildElementsUnmarshall() {\r

diff --git a/samltest/saml1/core/impl/AudienceTest.h b/samltest/saml1/core/impl/AudienceTest.h
index 4b45d4f..1a95e35 100644 (file)
--- a/samltest/saml1/core/impl/AudienceTest.h
+++ b/samltest/saml1/core/impl/AudienceTest.h
@@ -44,7 +44,7 @@ public:
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Audience& a = dynamic_cast<Audience&>(*xo.get());\r
     void testSingleElementOptionalAttributesUnmarshall() {\r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         Audience& a = dynamic_cast<Audience&>(*xo.get());\r

-        TSM_ASSERT_SAME_DATA("Uri", expectedUri, a.getAudienceURI(), XMLString::stringLen(expectedUri));\r
+        assertEquals("Uri", expectedUri, a.getAudienceURI());\r

     }\r
 \r
     void testSingleElementMarshall() {\r
     }\r
 \r
     void testSingleElementMarshall() {\r

diff --git a/samltest/saml1/core/impl/AuthenticationStatementTest.h b/samltest/saml1/core/impl/AuthenticationStatementTest.h
index f15eed2..0bf3df1 100644 (file)
--- a/samltest/saml1/core/impl/AuthenticationStatementTest.h
+++ b/samltest/saml1/core/impl/AuthenticationStatementTest.h
@@ -54,8 +54,8 @@ public:
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AuthenticationStatement& as = dynamic_cast<AuthenticationStatement&>(*xo.get());\r
 \r
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
         AuthenticationStatement& as = dynamic_cast<AuthenticationStatement&>(*xo.get());\r
 \r

-        TSM_ASSERT_SAME_DATA("AuthenticationMethod attribute", expectedAuthenticationMethod, as.getAuthenticationMethod(), XMLString::stringLen(expectedAuthenticationMethod));\r
-        TSM_ASSERT_SAME_DATA("AuthenticationInstant attribute", expectedAuthenticationInstant, as.getAuthenticationInstant()->getRawData(), XMLString::stringLen(expectedAuthenticationInstant));\r
+        assertEquals("AuthenticationMethod attribute", expectedAuthenticationMethod, as.getAuthenticationMethod());\r
+        assertEquals("AuthenticationInstant attribute", expectedAuthenticationInstant, as.getAuthenticationInstant()->getRawData());\r

     }\r
 \r
     void testChildElementsUnmarshall() {\r
     }\r
 \r
     void testChildElementsUnmarshall() {\r

diff --git a/samltest/saml2/core/impl/ArtifactResolve20Test.h b/samltest/saml2/core/impl/ArtifactResolve20Test.h
index ad2bb4e..670bdf2 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/ArtifactResolve.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ArtifactResolveOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/ArtifactResolve.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ArtifactResolveOptionalAttributes.xml";\r


@@ -57,7 +58,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/ArtifactResponse20Test.h b/samltest/saml2/core/impl/ArtifactResponse20Test.h
index e01b9f9..2e46e21 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         authnRequestID = XMLString::transcode("test1"); \r
 \r
 \r
         authnRequestID = XMLString::transcode("test1"); \r
 \r


@@ -69,7 +70,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/AssertionIDRequest20Test.h b/samltest/saml2/core/impl/AssertionIDRequest20Test.h
index 8a6dda1..8488000 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/AssertionIDRequest.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AssertionIDRequestOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/AssertionIDRequest.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AssertionIDRequestOptionalAttributes.xml";\r


@@ -57,7 +58,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/AttributeQuery20Test.h b/samltest/saml2/core/impl/AttributeQuery20Test.h
index 7e9e4df..1b1fc9d 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/AttributeQuery.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AttributeQueryOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/AttributeQuery.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/AttributeQueryOptionalAttributes.xml";\r


@@ -57,7 +58,7 @@ public:
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(query->getIssuer()==NULL);\r
         TS_ASSERT(query->getSignature()==NULL);\r
 \r
         TS_ASSERT(query->getIssuer()==NULL);\r
         TS_ASSERT(query->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/AuthnQuery20Test.h b/samltest/saml2/core/impl/AuthnQuery20Test.h
index 23275bd..5610d0d 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedSessionIndex = XMLString::transcode("session12345"); \r
 \r
         singleElementFile = data_path + "saml2/core/impl/AuthnQuery.xml";\r
         expectedSessionIndex = XMLString::transcode("session12345"); \r
 \r
         singleElementFile = data_path + "saml2/core/impl/AuthnQuery.xml";\r


@@ -60,7 +61,7 @@ public:
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(query->getIssuer()==NULL);\r
         TS_ASSERT(query->getSignature()==NULL);\r
 \r
         TS_ASSERT(query->getIssuer()==NULL);\r
         TS_ASSERT(query->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h
index 979beac..5c5a689 100644 (file)
--- a/samltest/saml2/core/impl/AuthnRequest20Test.h
+++ b/samltest/saml2/core/impl/AuthnRequest20Test.h
@@ -40,6 +40,7 @@ public:
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedForceAuthn = true;\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedForceAuthn = true;\r


@@ -74,7 +75,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\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("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);\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("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);\r

diff --git a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
index 1e892a8..d1aea19 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedResource = XMLString::transcode("urn:string:resource");\r
 \r
         singleElementFile = data_path + "saml2/core/impl/AuthzDecisionQuery.xml";\r
         expectedResource = XMLString::transcode("urn:string:resource");\r
 \r
         singleElementFile = data_path + "saml2/core/impl/AuthzDecisionQuery.xml";\r


@@ -60,7 +61,7 @@ public:
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r
         TS_ASSERT(query!=NULL);\r
         assertEquals("ID attribute", expectedID, query->getID());\r
         assertEquals("Version attribute", expectedVersion, query->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), query->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), query->getIssueInstant()->getEpoch());\r

         assertEquals("Resource attribute", expectedResource, query->getResource());\r
 \r
         TS_ASSERT(query->getIssuer()==NULL);\r
         assertEquals("Resource attribute", expectedResource, query->getResource());\r
 \r
         TS_ASSERT(query->getIssuer()==NULL);\r

diff --git a/samltest/saml2/core/impl/LogoutRequest20Test.h b/samltest/saml2/core/impl/LogoutRequest20Test.h
index ab87823..10da621 100644 (file)
--- a/samltest/saml2/core/impl/LogoutRequest20Test.h
+++ b/samltest/saml2/core/impl/LogoutRequest20Test.h
@@ -35,10 +35,12 @@ public:
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedReason = XMLString::transcode("urn:string:reason"); \r
         expectedNotOnOrAfter = new DateTime(XMLString::transcode("2006-02-21T20:45:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
         expectedReason = XMLString::transcode("urn:string:reason"); \r
         expectedNotOnOrAfter = new DateTime(XMLString::transcode("2006-02-21T20:45:00.000Z"));\r

+        expectedNotOnOrAfter->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/LogoutRequest.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutRequestOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/LogoutRequest.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutRequestOptionalAttributes.xml";\r


@@ -63,7 +65,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r


@@ -82,7 +84,7 @@ public:
         assertEquals("Consent attribute", expectedConsent, request->getConsent());\r
         assertEquals("Destination attribute", expectedDestination, request->getDestination());\r
         assertEquals("Reason attribute", expectedReason, request->getReason());\r
         assertEquals("Consent attribute", expectedConsent, request->getConsent());\r
         assertEquals("Destination attribute", expectedDestination, request->getDestination());\r
         assertEquals("Reason attribute", expectedReason, request->getReason());\r

-        assertEquals("NotOnOrAfter attribute", expectedNotOnOrAfter->getFormattedString(), request->getNotOnOrAfter()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("NotOnOrAfter attribute", expectedNotOnOrAfter->getEpoch(), request->getNotOnOrAfter()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/LogoutResponse20Test.h b/samltest/saml2/core/impl/LogoutResponse20Test.h
index 40c9a4e..3cd675d 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/LogoutResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutResponseOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/LogoutResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/LogoutResponseOptionalAttributes.xml";\r


@@ -61,7 +62,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
index ad26ac1..f2cecec 100644 (file)
--- a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
+++ b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
@@ -33,6 +33,7 @@ public:
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
 \r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
 \r


@@ -57,7 +58,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
index d7a9105..3cdea30 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/ManageNameIDResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ManageNameIDResponseOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/ManageNameIDResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/ManageNameIDResponseOptionalAttributes.xml";\r


@@ -61,7 +62,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
index 877a0da..f14b05c 100644 (file)
--- a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
@@ -33,6 +33,7 @@ public:
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedID = XMLString::transcode("abc123");; \r
         expectedVersion = XMLString::transcode("2.0"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
 \r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://idp.example.org/endpoint"); \r
 \r


@@ -57,7 +58,7 @@ public:
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r
         TS_ASSERT(request!=NULL);\r
         assertEquals("ID attribute", expectedID, request->getID());\r
         assertEquals("Version attribute", expectedVersion, request->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), request->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r
 \r
         TS_ASSERT(request->getIssuer()==NULL);\r
         TS_ASSERT(request->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
index 379ee7e..ddc8c52 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         singleElementFile = data_path + "saml2/core/impl/NameIDMappingResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/NameIDMappingResponseOptionalAttributes.xml";\r
 \r
         singleElementFile = data_path + "saml2/core/impl/NameIDMappingResponse.xml";\r
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/NameIDMappingResponseOptionalAttributes.xml";\r


@@ -61,7 +62,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/Response20Test.h b/samltest/saml2/core/impl/Response20Test.h
index 8989446..ee2153a 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         assertionID1 = XMLString::transcode("test1"); \r
         assertionID2= XMLString::transcode("test2"); \r
 \r
         assertionID1 = XMLString::transcode("test1"); \r
         assertionID2= XMLString::transcode("test2"); \r


@@ -73,7 +74,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r

diff --git a/samltest/saml2/core/impl/StatusResponse20Test.h b/samltest/saml2/core/impl/StatusResponse20Test.h
index 834dbd4..6c85449 100644 (file)
--- 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"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r
         expectedConsent = XMLString::transcode("urn:string:consent"); \r
         expectedDestination = XMLString::transcode("http://sp.example.org/endpoint"); \r
         expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));\r

+        expectedIssueInstant->parseDateTime();\r

 \r
         elementName = XMLString::transcode("Foo");;\r
         elementNS = XMLString::transcode("http://www.example.org/test");\r
 \r
         elementName = XMLString::transcode("Foo");;\r
         elementNS = XMLString::transcode("http://www.example.org/test");\r


@@ -103,7 +104,7 @@ public:
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r
 \r
         assertEquals("ID attribute", expectedID, response->getID());\r
         assertEquals("Version attribute", expectedVersion, response->getVersion());\r

-        assertEquals("IssueInstant attribute", expectedIssueInstant->getFormattedString(), response->getIssueInstant()->getFormattedString());\r
+        TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), response->getIssueInstant()->getEpoch());\r

 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r
 \r
         TS_ASSERT(response->getIssuer()==NULL);\r
         TS_ASSERT(response->getSignature()==NULL);\r