From bc5c7d933bb9e24de0b52cb66e977a277f6d75e4 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Tue, 26 May 2009 17:39:22 +0000 Subject: [PATCH 1/1] Allow expired metadata during tests. --- samltest/saml2/metadata/XMLMetadataProviderTest.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/samltest/saml2/metadata/XMLMetadataProviderTest.h b/samltest/saml2/metadata/XMLMetadataProviderTest.h index 582a0a3..00494f7 100644 --- a/samltest/saml2/metadata/XMLMetadataProviderTest.h +++ b/samltest/saml2/metadata/XMLMetadataProviderTest.h @@ -70,7 +70,7 @@ public: } Locker locker(metadataProvider.get()); - const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID)).first; + const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID,NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL); assertEquals("Entity's ID does not match requested ID", entityID, descriptor->getEntityID()); TSM_ASSERT_EQUALS("Unexpected number of roles", 1, descriptor->getIDPSSODescriptors().size()); @@ -80,7 +80,7 @@ public: auto_ptr artifact( new SAML2ArtifactType0004(SAMLConfig::getConfig().hashSHA1("urn:mace:incommon:washington.edu"),1) ); - descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(artifact.get())).first; + descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(artifact.get(),NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL); assertEquals("Entity's ID does not match requested ID", entityID, descriptor->getEntityID()); } @@ -108,9 +108,9 @@ public: } Locker locker(metadataProvider.get()); - const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID)).first; + const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID,NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was not null", descriptor==NULL); - descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID2)).first; + descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID2,NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL); assertEquals("Entity's ID does not match requested ID", entityID2, descriptor->getEntityID()); } @@ -138,9 +138,9 @@ public: } Locker locker(metadataProvider.get()); - const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID2)).first; + const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID2,NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was not null", descriptor==NULL); - descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID)).first; + descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria(entityID,NULL,NULL,false)).first; TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL); assertEquals("Entity's ID does not match requested ID", entityID, descriptor->getEntityID()); } -- 2.1.4