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

[noreply at shibboleth.net]

Author: iay
Date: Sun Oct 13 16:38:33 2013
New Revision: 275

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

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTRansformationStage-output.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-includeMain.xsl   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included.xsl   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-input.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-paramOutput.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xsl   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transformListener1.xsl   (with props)
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java?rev=275&r1=274&r2=275&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java Sun Oct 13 16:38:33 2013
@@ -113,17 +113,6 @@
         return basePackagePath + which;
     }
     
-    /**
-     * Return a {@link ClasspathResource} named relative to the currently tested class.
-     * 
-     * @param relativeName local name of the resource
-     * @return resolved {@link ClasspathResource} with the given name
-     */
-    protected Resource classRelativeClasspathResource(final String relativeName) {
-        // ClasspathResource needs a path that does *not* start with a '/'
-        return new ClasspathResource(classRelativeResource(relativeName).substring(1));
-    }
-
     
     /**
      * Setup test class. Creates and initializes the parser pool. Set BouncyCastle as a JCE provider.
@@ -171,11 +160,17 @@
     /**
      * Helper method to acquire a ClasspathResource based on the given resource path.
      * 
+     * Uses class-relative resource names if there is a known class under test.
+     * 
      * @param resourcePath classpath path to the resource
      * @return the data file as a resource
      */
     public Resource getClasspathResource(final String resourcePath) {
-        return new FixedClasspathResource(resourcePath);
+        if (testingClass != null) {
+            return new FixedClasspathResource(classRelativeResource(resourcePath).substring(1));
+        } else {
+            return new FixedClasspathResource(resourcePath);
+        }
     }
     
     /**

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java?rev=275&r1=274&r2=275&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java Sun Oct 13 16:38:33 2013
@@ -29,11 +29,11 @@
 import net.shibboleth.metadata.InfoStatus;
 import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.utilities.java.support.resource.ClasspathResource;
 import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -41,6 +41,11 @@
 /** {@link XSLTransformationStage} unit test. */
 public class XSLTtransformationStageTest extends BaseDOMTest {
 
+    @BeforeClass
+    private void init() {
+        setTestingClass(XSLTransformationStage.class);
+    }
+
     /**
      * Utility method to grab our standard input file and turn it into a {@link DOMElementItem}.
      * 
@@ -49,8 +54,8 @@
      * @throws XMLParserException if there is a problem reading the input file
      */
     private DOMElementItem makeInput() throws XMLParserException {

[... 193 lines stripped ...]