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

[noreply at shibboleth.net]

Author: iay
Date: Fri Oct 11 10:07:23 2013
New Revision: 262

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=262&view=rev
Log:
MDA-82 (partial): refactor unit tests by class
Implement revised conventions for class-relative resource access.

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-prettyPrint.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage/prettyPrint.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-singleLine.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage/singleLine.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-unformatted.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage/unformatted.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage-entities.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage/entitiesDescriptor.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entities.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity1.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity2.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-name.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2Name.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-reversed.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/entitiesDescriptor2Reversed.xml
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDomTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage/
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage/
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage/

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=262&r1=261&r2=262&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 Fri Oct 11 10:07:23 2013
@@ -43,6 +43,76 @@
     /** Initialized parser pool used to parser data. */
     private BasicParserPool parserPool;
 
+    /** Class being tested. */
+    private Class<?> testingClass;
+    
+    /**
+     * Base path for class-relative test resource references.
+     * 
+     * Will <em>not<em> end in a '/'.
+     */
+    private String baseClassPath;
+    
+    /** Package for the class being tested. */
+    private Package testingPackage;
+    
+    /**
+     * Base path for package-relative test resource references.
+     * 
+     * Will always end in a '/'.
+     */
+    private String basePackagePath;
+    
+    /**
+     * Converts the "."-separated name of a class or package into an
+     * absolute path.
+     * 
+     * @param name name to be converted
+     * @return path to resources associated with the name
+     */
+    private String nameToPath(final String name) {
+        return "/" + name.replace('.', '/');
+    }
+    
+    /**
+     * Sets the class being tested, so that references can be made to testing resources
+     * relative to it.
+     * 
+     * @param clazz class being tested
+     */
+    protected void setTestingClass(final Class<?> clazz) {
+        testingClass = clazz;

[... 225 lines stripped ...]