[java-identity-provider COMMIT] /trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr 11 23:43:29 2012
New Revision: 4172

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4172&view=rev
Log:
Bye bye, DefaultBootstrap. Stay in touch.

Modified:
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java

Modified: trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java?rev=4172&r1=4171&r2=4172&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java (original)
+++ trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java Wed Apr 11 23:43:29 2012
@@ -31,11 +31,13 @@
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
 import org.joda.time.DateTime;
+import org.opensaml.core.config.InitializationException;
+import org.opensaml.core.config.InitializationService;
 import org.opensaml.core.xml.config.XMLConfigurationException;
-import org.opensaml.saml.config.DefaultBootstrap;
 import org.opensaml.saml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.saml.saml2.metadata.provider.MetadataProviderException;
 import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
+import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 
 import edu.vt.middleware.crypt.digest.SHA256;
@@ -187,10 +189,11 @@
     }
 
     private static MetadataProvider createMetadataProvider(String file) {
+        //TODO this probably shouldn't be here, this should be taken care of by the tested class, not by this data provider class
         try {
-            DefaultBootstrap.bootstrap();
-        } catch (XMLConfigurationException e) {
-            e.printStackTrace();
+            InitializationService.initialize();
+        } catch (InitializationException e) {
+            Assert.fail("Initialization of OpenSAML failed");
         }
 
         FilesystemMetadataProvider metadataProvider = null;