Moved artifact source code into binding folders.

[shibboleth/cpp-opensaml.git] / samltest / saml2 / metadata / FilesystemMetadataProviderTest.h

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