X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=samltest%2Fsaml2%2Fmetadata%2FFilesystemMetadataProviderTest.h;h=3e736baeffe841527fa51b77b1060dcb79ac9158;hp=a9c1f838b70c0f06045dda84cb24c9c7062c92df;hb=71425c1586a07281fdddd2fc2faa60d97d7f1df8;hpb=0b9c2825fb2fad1b6eadde350c799c10e31ace78

diff --git a/samltest/saml2/metadata/FilesystemMetadataProviderTest.h b/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
index a9c1f83..3e736ba 100644
--- a/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
+++ b/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
@@ -15,7 +15,9 @@
  */
 
 #include "internal.h"
-#include <saml/saml2/core/SAML2ArtifactType0004.h>
+#include <saml/SAMLConfig.h>
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>
+#include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
 
 using namespace opensaml::saml2md;
@@ -58,9 +60,14 @@ public:
         auto_ptr<MetadataProvider> metadataProvider(
             SAMLConfig::getConfig().MetadataProviderManager.newPlugin(FILESYSTEM_METADATA_PROVIDER,doc->getDocumentElement())
             );
-        metadataProvider->init();
+        try {
+            metadataProvider->init();
+        }
+        catch (XMLToolingException& ex) {
+            TS_TRACE(ex.what());
+            throw;
+        }
         
-
         Locker locker(metadataProvider.get());
         const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(entityID);
         TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
@@ -91,8 +98,13 @@ public:
         auto_ptr<MetadataProvider> metadataProvider(
             SAMLConfig::getConfig().MetadataProviderManager.newPlugin(FILESYSTEM_METADATA_PROVIDER,doc->getDocumentElement())
             );
-        metadataProvider->init();
-        
+        try {
+            metadataProvider->init();
+        }
+        catch (XMLToolingException& ex) {
+            TS_TRACE(ex.what());
+            throw;
+        }
 
         Locker locker(metadataProvider.get());
         const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(entityID);
@@ -116,8 +128,13 @@ public:
         auto_ptr<MetadataProvider> metadataProvider(
             SAMLConfig::getConfig().MetadataProviderManager.newPlugin(FILESYSTEM_METADATA_PROVIDER,doc->getDocumentElement())
             );
-        metadataProvider->init();
-        
+        try {
+            metadataProvider->init();
+        }
+        catch (XMLToolingException& ex) {
+            TS_TRACE(ex.what());
+            throw;
+        }
 
         Locker locker(metadataProvider.get());
         const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(entityID2);