[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 11:09:59 2013
New Revision: 302

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

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-lorem.txt
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/loremIpsum.txt
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-in.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/elementStripIn.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-out.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/elementStripOut.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-in.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/emptyExtensionsIn.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-out.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/emptyExtensionsOut.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-in.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/namespaceStripIn.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-out.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/namespaceStripOut.xml
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
    trunk/aggregator-pipeline/src/test/resources/data/elementStripIn.xml
    trunk/aggregator-pipeline/src/test/resources/data/elementStripOut.xml
    trunk/aggregator-pipeline/src/test/resources/data/emptyExtensionsIn.xml
    trunk/aggregator-pipeline/src/test/resources/data/emptyExtensionsOut.xml
    trunk/aggregator-pipeline/src/test/resources/data/loremIpsum.txt
    trunk/aggregator-pipeline/src/test/resources/data/namespaceStripIn.xml
    trunk/aggregator-pipeline/src/test/resources/data/namespaceStripOut.xml

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=302&r1=301&r2=302&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 11:09:59 2013
@@ -22,6 +22,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 
+import net.shibboleth.metadata.BaseTest;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -29,11 +30,17 @@
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
 /** Unit test for {@link DOMFilesystemSourceStage}. */
-public class DOMFilesystemSourceTest {
+public class DOMFilesystemSourceTest extends BaseTest {
+
+    @BeforeClass
+    private void init() {
+        setTestingClass(DOMFilesystemSourceStage.class);
+    }
 
     @Test public void testSuccessfulFileFetchAndParse() throws Exception {
         URL sourceUrl = DOMFilesystemSourceTest.class.getResource("/data/samlMetadata/entityDescriptor1.xml");
@@ -100,7 +107,7 @@
     }
 
     @Test public void testSuccessfulFetchAndFailedParse() throws Exception {
-        URL sourceUrl = DOMFilesystemSourceTest.class.getResource("/data/loremIpsum.txt");
+        final URL sourceUrl = getClasspathResource("lorem.txt").getURL();
         File sourceFile = new File(sourceUrl.toURI());
 
         BasicParserPool parserPool = new BasicParserPool();

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java?rev=302&r1=301&r2=302&view=diff
==============================================================================

[... 108 lines stripped ...]