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

[noreply at shibboleth.net]

Author: iay
Date: Fri Nov 29 14:53:06 2013
New Revision: 309

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=309&view=rev
Log:
MDA-82: refactor unit test data by class
Simplify base test classes now that everything has been rationalized.

Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.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/MultiOutputXSLTransformationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
    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/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.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/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/SetCacheDurationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java?rev=309&r1=308&r2=309&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java Fri Nov 29 14:53:06 2013
@@ -6,24 +6,32 @@
 public abstract class BaseTest {
 
     /** Class being tested. */
-    protected Class<?> testingClass;
+    protected final Class<?> testingClass;
     
     /**
      * Base path for class-relative test resource references.
      * 
      * Will <em>not<em> end in a '/'.
      */
-    private String baseClassPath;
+    private final String baseClassPath;
     
     /** Package for the class being tested. */
-    private Package testingPackage;
+    private final Package testingPackage;
     
     /**
      * Base path for package-relative test resource references.
      * 
      * Will always end in a '/'.
      */
-    private String basePackagePath;
+    private final String basePackagePath;
+    
+    /** Constructor */
+    protected BaseTest(final Class<?> clazz) {
+        testingClass = clazz;
+        baseClassPath = nameToPath(testingClass.getName());
+        testingPackage = testingClass.getPackage();
+        basePackagePath = nameToPath(testingPackage.getName()) + "/";
+    }
     
     /**
      * Converts the "."-separated name of a class or package into an
@@ -35,20 +43,7 @@

[... 774 lines stripped ...]