Multi-line svn commit, see body.

[shibboleth/cpp-opensaml.git] / samltest / saml1 / core / impl / AssertionTest.h

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
-    XMLCh* expectedIssueInstant;\r
+    DateTime* expectedIssueInstant;\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
@@ -39,8 +40,8 @@ public:
     \r
     void tearDown() {\r
         XMLString::release(&expectedID);\r
-        XMLString::release(&expectedIssueInstant);\r
         XMLString::release(&expectedIssuer);\r
+        delete expectedIssueInstant;\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
-        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
@@ -65,9 +66,9 @@ public:
         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
@@ -85,8 +86,8 @@ public:
         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