[java-shib-common COMMIT] in /branches/REL_1/src/test: java/edu/internet2/middleware/shibboleth/common/config/attribu...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 23 14:54:30 2013
New Revision: 1051

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1051&view=rev
Log:
JOST-200: Remove dependency on large remote metadata files for unit tests.

Modified:
    branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java
    branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java
    branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProviderTest.java
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider1.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider2.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider3.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProvider1.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProvider2.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPResourceMetadataProvider1.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPResourceMetadataProvider2.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/metadata.switchaai_signed.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/relying-party1.xml

Modified: branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java?rev=1051&r1=1050&r2=1051&view=diff
==============================================================================
--- branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java (original)
+++ branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java Wed Jan 23 14:54:30 2013
@@ -35,14 +35,21 @@
  */
 public class SAML1AttributeAuthorityTest extends BaseConfigTestCase {
 
+    private String inCommonMDURL;
+    
+    public void setUp() throws Exception {
+        super.setUp();
+        inCommonMDURL = "https://svn.shibboleth.net/java-opensaml2"
+                + "/branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/InCommon-metadata.xml";
+    }
+    
     public void testResolution() throws Exception {
         ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
                 DATA_PATH + "/config/attribute/service-config.xml", });
 
         ParserPool parserPool = new BasicParserPool();
 
-        HTTPMetadataProvider mdProvider = new HTTPMetadataProvider(
-                "http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml", 5000);
+        HTTPMetadataProvider mdProvider = new HTTPMetadataProvider(inCommonMDURL, 5000);
         mdProvider.setParserPool(parserPool);
         mdProvider.initialize();
 

Modified: branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java?rev=1051&r1=1050&r2=1051&view=diff
==============================================================================
--- branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java (original)
+++ branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java Wed Jan 23 14:54:30 2013
@@ -33,14 +33,21 @@
 /** Unit tests for {@link SAML2AttributeAuthority}. */
 public class SAML2AttributeAuthorityTest extends BaseConfigTestCase {
 
+    private String inCommonMDURL;
+    
+    public void setUp() throws Exception {
+        super.setUp();
+        inCommonMDURL = "https://svn.shibboleth.net/java-opensaml2"
+                + "/branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/InCommon-metadata.xml";
+    }
+    
     public void testResolution() throws Exception {
         ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
                 DATA_PATH + "/config/attribute/service-config.xml", });
 
         ParserPool parserPool = new BasicParserPool();
 
-        HTTPMetadataProvider mdProvider = new HTTPMetadataProvider(

[... 152 lines stripped ...]