[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src/test: java/net/shibboleth/metadata/dom/DOMFilesys...

[noreply at shibboleth.net]

Author: iay
Date: Fri Nov 29 13:16:15 2013
New Revision: 306

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=306&view=rev
Log:
MDA-82: refactor unit test data by class

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-1.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-2.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-different.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityFilterStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRegistrationAuthorityFilterStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage-in.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage-in.xml   (with props)
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRegistrationAuthorityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java?rev=306&r1=305&r2=306&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java Fri Nov 29 13:16:15 2013
@@ -43,7 +43,7 @@
     }
 
     @Test public void testSuccessfulFileFetchAndParse() throws Exception {
-        URL sourceUrl = DOMFilesystemSourceTest.class.getResource("/data/samlMetadata/entityDescriptor1.xml");
+        URL sourceUrl = getClasspathResource("in.xml").getURL();
         File sourceFile = new File(sourceUrl.toURI());
 
         BasicParserPool parserPool = new BasicParserPool();

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java?rev=306&r1=305&r2=306&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java Fri Nov 29 13:16:15 2013
@@ -24,15 +24,21 @@
 import net.shibboleth.metadata.dom.DOMElementItem;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
 /** {@link EntitiesDescriptorDisassemblerStage} unit test. */
 public class EntitiesDescriptorDisassemblerStageTest extends BaseDOMTest {
 
+    @BeforeClass
+    private void init() {
+        setTestingClass(EntitiesDescriptorDisassemblerStage.class);
+    }
+

[... 421 lines stripped ...]