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

[noreply at shibboleth.net]

Author: iay
Date: Fri Nov 29 12:23:52 2013
New Revision: 304

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

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-1.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-2.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-3.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-1.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/xpathInput1.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-2.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/xpathInput2.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-3.xml
      - copied unchanged from r296, trunk/aggregator-pipeline/src/test/resources/data/xpathInput3.xml
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
    trunk/aggregator-pipeline/src/test/resources/data/xpathInput1.xml
    trunk/aggregator-pipeline/src/test/resources/data/xpathInput2.xml
    trunk/aggregator-pipeline/src/test/resources/data/xpathInput3.xml

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java?rev=304&r1=303&r2=304&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java Fri Nov 29 12:23:52 2013
@@ -26,11 +26,17 @@
 import net.shibboleth.utilities.java.support.xml.SimpleNamespaceContext;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
 /** {@link XPathFilteringStage} unit test. */
 public class XPathFilteringStageTest extends BaseDOMTest {
+
+    @BeforeClass
+    private void init() {
+        setTestingClass(XPathFilteringStage.class);
+    }
 
     /**
      * Test XPathFilteringStage using an example from the UK federation build process.
@@ -50,9 +56,9 @@
 
         // Construct the input metadata
         final List<Item<Element>> metadataCollection = new ArrayList<>();
-        metadataCollection.add(new DOMElementItem(readXmlData("xpathInput1.xml")));
-        metadataCollection.add(new DOMElementItem(readXmlData("xpathInput2.xml")));
-        metadataCollection.add(new DOMElementItem(readXmlData("xpathInput3.xml")));
+        metadataCollection.add(new DOMElementItem(readXmlData("1.xml")));
+        metadataCollection.add(new DOMElementItem(readXmlData("2.xml")));
+        metadataCollection.add(new DOMElementItem(readXmlData("3.xml")));
         Assert.assertEquals(metadataCollection.size(), 3);
 
         // Filter the metadata collection

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java?rev=304&r1=303&r2=304&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java Fri Nov 29 12:23:52 2013
@@ -23,10 +23,16 @@
 import net.shibboleth.utilities.java.support.xml.SimpleNamespaceContext;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /** {@link XPathItemSelectionStrategy} unit test. */
 public class XPathItemSelectionStrategyTest extends BaseDOMTest {
+
+    @BeforeClass
+    private void init() {
+        setTestingClass(XPathItemSelectionStrategy.class);
+    }
 
     /**
      * Test XPathItemSelectionStrategy using an example from the UK federation build process.
@@ -43,9 +49,9 @@
                 new XPathItemSelectionStrategy("//ukfedlabel:DeletedEntity", new SimpleNamespaceContext(prefixMappings));
 
         // Construct the input metadata
-        DOMElementItem item1 = new DOMElementItem(readXmlData("xpathInput1.xml"));
-        DOMElementItem item2 = new DOMElementItem(readXmlData("xpathInput2.xml"));

[... 8 lines stripped ...]