[cpp-opensaml] branch master updated: Fix up DateTime usage in tests.
Scott Cantor
cantor.2 at osu.edu
Tue Jan 9 14:22:27 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=702626cb9fa9dd187927878a641bc65c6e182baa
The following commit(s) were added to refs/heads/master by this push:
new 702626c Fix up DateTime usage in tests.
702626c is described below
commit 702626cb9fa9dd187927878a641bc65c6e182baa
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 9 14:22:22 2018 -0500
Fix up DateTime usage in tests.
---
samltest/internal.h | 1 -
samltest/saml1/core/impl/AssertionTest.h | 4 ++--
samltest/saml2/core/impl/Advice20Test.h | 4 ++--
samltest/saml2/core/impl/ArtifactResolve20Test.h | 4 ++--
samltest/saml2/core/impl/ArtifactResponse20Test.h | 4 ++--
samltest/saml2/core/impl/Assertion20Test.h | 4 ++--
samltest/saml2/core/impl/AssertionIDRequest20Test.h | 4 ++--
samltest/saml2/core/impl/AttributeQuery20Test.h | 4 ++--
samltest/saml2/core/impl/AuthnQuery20Test.h | 4 ++--
samltest/saml2/core/impl/AuthnRequest20Test.h | 4 ++--
samltest/saml2/core/impl/AuthnStatement20Test.h | 8 ++++----
samltest/saml2/core/impl/AuthzDecisionQuery20Test.h | 4 ++--
samltest/saml2/core/impl/Conditions20Test.h | 8 ++++----
samltest/saml2/core/impl/Evidence20Test.h | 4 ++--
samltest/saml2/core/impl/KeyInfoConfirmationDataType20Test.h | 8 ++++----
samltest/saml2/core/impl/LogoutRequest20Test.h | 8 ++++----
samltest/saml2/core/impl/LogoutResponse20Test.h | 4 ++--
samltest/saml2/core/impl/ManageNameIDRequest20Test.h | 4 ++--
samltest/saml2/core/impl/ManageNameIDResponse20Test.h | 4 ++--
samltest/saml2/core/impl/NameIDMappingRequest20Test.h | 4 ++--
samltest/saml2/core/impl/NameIDMappingResponse20Test.h | 4 ++--
samltest/saml2/core/impl/Response20Test.h | 4 ++--
samltest/saml2/core/impl/SubjectConfirmationData20Test.h | 8 ++++----
samltest/samltest.h | 2 +-
24 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/samltest/internal.h b/samltest/internal.h
index 2389848..0352e8d 100644
--- a/samltest/internal.h
+++ b/samltest/internal.h
@@ -32,7 +32,6 @@
#include <xmltooling/XMLObject.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/util/DateTime.h>
#include <xmltooling/util/ParserPool.h>
#include <xmltooling/validation/Validator.h>
diff --git a/samltest/saml1/core/impl/AssertionTest.h b/samltest/saml1/core/impl/AssertionTest.h
index 2b079b7..70723cf 100644
--- a/samltest/saml1/core/impl/AssertionTest.h
+++ b/samltest/saml1/core/impl/AssertionTest.h
@@ -26,14 +26,14 @@ using namespace opensaml::saml1;
class AssertionTest : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
int expectedMinorVersion;
XMLCh* expectedIssuer;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedID;
public:
void setUp() {
expectedID=XMLString::transcode("ident");
expectedMinorVersion=1;
- expectedIssueInstant=new DateTime(XMLString::transcode("1970-01-02T01:01:02.100Z"));
+ expectedIssueInstant=new XMLDateTime(XMLString::transcode("1970-01-02T01:01:02.100Z"));
expectedIssueInstant->parseDateTime();
expectedIssuer=XMLString::transcode("issuer");
singleElementFile = data_path + "saml1/core/impl/singleAssertion.xml";
diff --git a/samltest/saml2/core/impl/Advice20Test.h b/samltest/saml2/core/impl/Advice20Test.h
index 5225431..dc3d92b 100644
--- a/samltest/saml2/core/impl/Advice20Test.h
+++ b/samltest/saml2/core/impl/Advice20Test.h
@@ -73,11 +73,11 @@ public:
Assertion* assertion1 = AssertionBuilder::buildAssertion();
assertion1->setID(XMLString::transcode("abc123"));
- assertion1->setIssueInstant(new DateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
+ assertion1->setIssueInstant(new XMLDateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
Assertion* assertion2 = AssertionBuilder::buildAssertion();
assertion2->setID(XMLString::transcode("def456"));
- assertion2->setIssueInstant(new DateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
+ assertion2->setIssueInstant(new XMLDateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
advice->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());
advice->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());
diff --git a/samltest/saml2/core/impl/ArtifactResolve20Test.h b/samltest/saml2/core/impl/ArtifactResolve20Test.h
index d4aa0f0..3ec11d1 100644
--- a/samltest/saml2/core/impl/ArtifactResolve20Test.h
+++ b/samltest/saml2/core/impl/ArtifactResolve20Test.h
@@ -30,7 +30,7 @@ class ArtifactResolve20Test : public CxxTest::TestSuite, public SAMLObjectBaseTe
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -38,7 +38,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/ArtifactResolve.xml";
diff --git a/samltest/saml2/core/impl/ArtifactResponse20Test.h b/samltest/saml2/core/impl/ArtifactResponse20Test.h
index 6fbecf0..077f4f9 100644
--- a/samltest/saml2/core/impl/ArtifactResponse20Test.h
+++ b/samltest/saml2/core/impl/ArtifactResponse20Test.h
@@ -31,7 +31,7 @@ class ArtifactResponse20Test : public CxxTest::TestSuite, public SAMLObjectBaseT
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
// The payload will be an AuthnRequest in this test.
// AuthnRequest marshaller autogenerates ID, Version and IssueInstant if they are nullptr,
@@ -45,7 +45,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
authnRequestID = XMLString::transcode("test1");
diff --git a/samltest/saml2/core/impl/Assertion20Test.h b/samltest/saml2/core/impl/Assertion20Test.h
index c3132ba..1899144 100644
--- a/samltest/saml2/core/impl/Assertion20Test.h
+++ b/samltest/saml2/core/impl/Assertion20Test.h
@@ -27,13 +27,13 @@ using namespace opensaml::saml2;
class Assertion20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
const XMLCh* expectedVersion;
XMLCh* expectedID;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
expectedVersion = samlconstants::SAML20_VERSION;
expectedID = XMLString::transcode("abc123");
- expectedIssueInstant = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
+ expectedIssueInstant = new XMLDateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
expectedIssueInstant->parseDateTime();
diff --git a/samltest/saml2/core/impl/AssertionIDRequest20Test.h b/samltest/saml2/core/impl/AssertionIDRequest20Test.h
index 58e27b2..d248606 100644
--- a/samltest/saml2/core/impl/AssertionIDRequest20Test.h
+++ b/samltest/saml2/core/impl/AssertionIDRequest20Test.h
@@ -30,7 +30,7 @@ class AssertionIDRequest20Test : public CxxTest::TestSuite, public SAMLObjectBas
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -38,7 +38,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/AssertionIDRequest.xml";
diff --git a/samltest/saml2/core/impl/AttributeQuery20Test.h b/samltest/saml2/core/impl/AttributeQuery20Test.h
index af1671a..20ccae8 100644
--- a/samltest/saml2/core/impl/AttributeQuery20Test.h
+++ b/samltest/saml2/core/impl/AttributeQuery20Test.h
@@ -30,7 +30,7 @@ class AttributeQuery20Test : public CxxTest::TestSuite, public SAMLObjectBaseTes
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -38,7 +38,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/AttributeQuery.xml";
diff --git a/samltest/saml2/core/impl/AuthnQuery20Test.h b/samltest/saml2/core/impl/AuthnQuery20Test.h
index 3a36d34..153bc9e 100644
--- a/samltest/saml2/core/impl/AuthnQuery20Test.h
+++ b/samltest/saml2/core/impl/AuthnQuery20Test.h
@@ -30,7 +30,7 @@ class AuthnQuery20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCas
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedSessionIndex;
public:
@@ -39,7 +39,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
expectedSessionIndex = XMLString::transcode("session12345");
diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h
index 585e384..ffd17ea 100644
--- a/samltest/saml2/core/impl/AuthnRequest20Test.h
+++ b/samltest/saml2/core/impl/AuthnRequest20Test.h
@@ -28,7 +28,7 @@ using namespace opensaml::saml2;
class AuthnRequest20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
XMLCh* expectedID;
XMLCh* expectedVersion;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
bool expectedForceAuthn;
@@ -43,7 +43,7 @@ public:
void setUp() {
expectedID = XMLString::transcode("abc123");;
expectedVersion = XMLString::transcode("2.0");
- expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
+ expectedIssueInstant = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
expectedConsent = XMLString::transcode("urn:string:consent");
expectedDestination = XMLString::transcode("http://idp.example.org/endpoint");
diff --git a/samltest/saml2/core/impl/AuthnStatement20Test.h b/samltest/saml2/core/impl/AuthnStatement20Test.h
index b11469c..71614d0 100644
--- a/samltest/saml2/core/impl/AuthnStatement20Test.h
+++ b/samltest/saml2/core/impl/AuthnStatement20Test.h
@@ -25,16 +25,16 @@
using namespace opensaml::saml2;
class AuthnStatement20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
- DateTime* expectedAuthnInstant;
+ XMLDateTime* expectedAuthnInstant;
XMLCh* expectedSessionIndex;
- DateTime* expectedSessionNotOnOrAfter;
+ XMLDateTime* expectedSessionNotOnOrAfter;
public:
void setUp() {
- expectedAuthnInstant = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
+ expectedAuthnInstant = new XMLDateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
expectedAuthnInstant->parseDateTime();
expectedSessionIndex = (XMLString::transcode("abc123"));
- expectedSessionNotOnOrAfter = new DateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
+ expectedSessionNotOnOrAfter = new XMLDateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
expectedSessionNotOnOrAfter->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/AuthnStatement.xml";
diff --git a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
index 3445bff..01fa247 100644
--- a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
+++ b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
@@ -30,7 +30,7 @@ class AuthzDecisionQuery20Test : public CxxTest::TestSuite, public SAMLObjectBas
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedResource;
public:
@@ -39,7 +39,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
expectedResource = XMLString::transcode("urn:string:resource");
diff --git a/samltest/saml2/core/impl/Conditions20Test.h b/samltest/saml2/core/impl/Conditions20Test.h
index 28898d7..ccc7d0e 100644
--- a/samltest/saml2/core/impl/Conditions20Test.h
+++ b/samltest/saml2/core/impl/Conditions20Test.h
@@ -25,14 +25,14 @@
using namespace opensaml::saml2;
class Conditions20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
- DateTime* expectedNotBefore;
- DateTime* expectedNotOnOrAfter;
+ XMLDateTime* expectedNotBefore;
+ XMLDateTime* expectedNotOnOrAfter;
public:
void setUp() {
- expectedNotBefore = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
+ expectedNotBefore = new XMLDateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
expectedNotBefore->parseDateTime();
- expectedNotOnOrAfter = new DateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
+ expectedNotOnOrAfter = new XMLDateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
expectedNotOnOrAfter->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/Conditions.xml";
diff --git a/samltest/saml2/core/impl/Evidence20Test.h b/samltest/saml2/core/impl/Evidence20Test.h
index d79ad1e..12723ef 100644
--- a/samltest/saml2/core/impl/Evidence20Test.h
+++ b/samltest/saml2/core/impl/Evidence20Test.h
@@ -69,11 +69,11 @@ public:
Assertion* assertion1 = AssertionBuilder::buildAssertion();
assertion1->setID(XMLString::transcode("abc123"));
- assertion1->setIssueInstant(new DateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
+ assertion1->setIssueInstant(new XMLDateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
Assertion* assertion2 = AssertionBuilder::buildAssertion();
assertion2->setID(XMLString::transcode("def456"));
- assertion2->setIssueInstant(new DateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
+ assertion2->setIssueInstant(new XMLDateTime(XMLString::transcode("2006-07-21T22:27:19Z")));
evidence->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());
evidence->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());
diff --git a/samltest/saml2/core/impl/KeyInfoConfirmationDataType20Test.h b/samltest/saml2/core/impl/KeyInfoConfirmationDataType20Test.h
index 683b7cd..2589868 100644
--- a/samltest/saml2/core/impl/KeyInfoConfirmationDataType20Test.h
+++ b/samltest/saml2/core/impl/KeyInfoConfirmationDataType20Test.h
@@ -29,17 +29,17 @@ using xmlsignature::KeyInfoBuilder;
//TODO need testing for ElementProxy and wildcard attributes/elements
class KeyInfoConfirmationDataType20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
- DateTime* expectedNotBefore;
- DateTime* expectedNotOnOrAfter;
+ XMLDateTime* expectedNotBefore;
+ XMLDateTime* expectedNotOnOrAfter;
XMLCh* expectedRecipient;
XMLCh* expectedInResponseTo;
XMLCh* expectedAddress;
public:
void setUp() {
- expectedNotBefore = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
+ expectedNotBefore = new XMLDateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
expectedNotBefore->parseDateTime();
- expectedNotOnOrAfter = new DateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
+ expectedNotOnOrAfter = new XMLDateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
expectedNotOnOrAfter->parseDateTime();
expectedRecipient = (XMLString::transcode("recipient"));
expectedInResponseTo = (XMLString::transcode("inresponse"));
diff --git a/samltest/saml2/core/impl/LogoutRequest20Test.h b/samltest/saml2/core/impl/LogoutRequest20Test.h
index 6e7465d..d6c43d2 100644
--- a/samltest/saml2/core/impl/LogoutRequest20Test.h
+++ b/samltest/saml2/core/impl/LogoutRequest20Test.h
@@ -28,22 +28,22 @@ using namespace opensaml::saml2;
class LogoutRequest20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
XMLCh* expectedID;
XMLCh* expectedVersion;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
XMLCh* expectedReason;
- DateTime* expectedNotOnOrAfter;
+ XMLDateTime* expectedNotOnOrAfter;
public:
void setUp() {
expectedID = XMLString::transcode("abc123");;
expectedVersion = XMLString::transcode("2.0");
- expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
+ expectedIssueInstant = new XMLDateTime(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 = new XMLDateTime(XMLString::transcode("2006-02-21T20:45:00.000Z"));
expectedNotOnOrAfter->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/LogoutRequest.xml";
diff --git a/samltest/saml2/core/impl/LogoutResponse20Test.h b/samltest/saml2/core/impl/LogoutResponse20Test.h
index 77ab803..27aba5c 100644
--- a/samltest/saml2/core/impl/LogoutResponse20Test.h
+++ b/samltest/saml2/core/impl/LogoutResponse20Test.h
@@ -31,7 +31,7 @@ class LogoutResponse20Test : public CxxTest::TestSuite, public SAMLObjectBaseTes
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -40,7 +40,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/LogoutResponse.xml";
diff --git a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
index 942a435..e220a71 100644
--- a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
+++ b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
@@ -28,7 +28,7 @@ using namespace opensaml::saml2;
class ManageNameIDRequest20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
XMLCh* expectedID;
XMLCh* expectedVersion;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
@@ -36,7 +36,7 @@ public:
void setUp() {
expectedID = XMLString::transcode("abc123");;
expectedVersion = XMLString::transcode("2.0");
- expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
+ expectedIssueInstant = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
expectedConsent = XMLString::transcode("urn:string:consent");
expectedDestination = XMLString::transcode("http://idp.example.org/endpoint");
diff --git a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
index ad9631b..3f019dd 100644
--- a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
+++ b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
@@ -31,7 +31,7 @@ class ManageNameIDResponse20Test : public CxxTest::TestSuite, public SAMLObjectB
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -40,7 +40,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/ManageNameIDResponse.xml";
diff --git a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
index d2a772b..9191ef2 100644
--- a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
@@ -28,7 +28,7 @@ using namespace opensaml::saml2;
class NameIDMappingRequest20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
XMLCh* expectedID;
XMLCh* expectedVersion;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
@@ -36,7 +36,7 @@ public:
void setUp() {
expectedID = XMLString::transcode("abc123");;
expectedVersion = XMLString::transcode("2.0");
- expectedIssueInstant = new DateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
+ expectedIssueInstant = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
expectedConsent = XMLString::transcode("urn:string:consent");
expectedDestination = XMLString::transcode("http://idp.example.org/endpoint");
diff --git a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
index 8ff26c8..bbe213d 100644
--- a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
@@ -31,7 +31,7 @@ class NameIDMappingResponse20Test : public CxxTest::TestSuite, public SAMLObject
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
public:
void setUp() {
@@ -40,7 +40,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
singleElementFile = data_path + "saml2/core/impl/NameIDMappingResponse.xml";
diff --git a/samltest/saml2/core/impl/Response20Test.h b/samltest/saml2/core/impl/Response20Test.h
index a33b33b..4d20af8 100644
--- a/samltest/saml2/core/impl/Response20Test.h
+++ b/samltest/saml2/core/impl/Response20Test.h
@@ -33,7 +33,7 @@ class Response20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase
XMLCh* expectedVersion;
XMLCh* expectedConsent;
XMLCh* expectedDestination;
- DateTime* expectedIssueInstant;
+ XMLDateTime* expectedIssueInstant;
// Assertion marshaller autogenerates ID, Version and IssueInstant if they are nullptr,
// so have to agree on something to put in the control XML
@@ -46,7 +46,7 @@ public:
expectedVersion = XMLString::transcode("2.0");
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 = new XMLDateTime(XMLString::transcode("2006-02-21T16:40:00.000Z"));
expectedIssueInstant->parseDateTime();
assertionID1 = XMLString::transcode("test1");
diff --git a/samltest/saml2/core/impl/SubjectConfirmationData20Test.h b/samltest/saml2/core/impl/SubjectConfirmationData20Test.h
index 3173e56..4580d7b 100644
--- a/samltest/saml2/core/impl/SubjectConfirmationData20Test.h
+++ b/samltest/saml2/core/impl/SubjectConfirmationData20Test.h
@@ -27,17 +27,17 @@ using namespace opensaml::saml2;
//TODO need testing for ElementProxy and wildcard attributes/elements
class SubjectConfirmationData20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
- DateTime* expectedNotBefore;
- DateTime* expectedNotOnOrAfter;
+ XMLDateTime* expectedNotBefore;
+ XMLDateTime* expectedNotOnOrAfter;
XMLCh* expectedRecipient;
XMLCh* expectedInResponseTo;
XMLCh* expectedAddress;
public:
void setUp() {
- expectedNotBefore = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
+ expectedNotBefore = new XMLDateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
expectedNotBefore->parseDateTime();
- expectedNotOnOrAfter = new DateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
+ expectedNotOnOrAfter = new XMLDateTime(XMLString::transcode("1984-08-26T10:11:30.043Z"));
expectedNotOnOrAfter->parseDateTime();
expectedRecipient = (XMLString::transcode("recipient"));
expectedInResponseTo = (XMLString::transcode("inresponse"));
diff --git a/samltest/samltest.h b/samltest/samltest.h
index 70f05c5..687e2f0 100644
--- a/samltest/samltest.h
+++ b/samltest/samltest.h
@@ -30,7 +30,7 @@ using namespace opensaml;
//#define SAML_LEAKCHECK
-std::string data_path = "../../../samltest/data/";
+std::string data_path = "../samltest/data/";
class SAMLFixture : public CxxTest::GlobalFixture
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list