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

[noreply at shibboleth.net]

Author: iay
Date: Sat Oct 12 09:25:34 2013
New Revision: 265

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=265&view=rev
Log:
Refactor resource usage for XMLSignatureSigningStage test.

Added:
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-input.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-output.xml
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/data/signedSamlMetadata.xml
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingCert.pem
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/data/signingCert.pem
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingKey.pem
      - copied unchanged from r259, trunk/aggregator-pipeline/src/test/resources/data/signingKey.pem
Modified:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
    trunk/aggregator-pipeline/src/test/resources/data/signedSamlMetadata.xml
    trunk/aggregator-pipeline/src/test/resources/data/signingCert.pem
    trunk/aggregator-pipeline/src/test/resources/data/signingKey.pem

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java?rev=265&r1=264&r2=265&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java Sat Oct 12 09:25:34 2013
@@ -25,6 +25,7 @@
 import net.shibboleth.metadata.AssertSupport;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -33,18 +34,23 @@
 /** {@link XMLSignatureSigningStage} unit test. */
 public class XMLSignatureSigningStageTest extends BaseDomTest {
 
+    @BeforeClass
+    private void init() {
+        setTestingClass(XMLSignatureSigningStage.class);
+    }
+
     /** Test signing with and verifying the result against a known good. */
     @Test
     public void testSigning() throws Exception {
-        Element testInput = readXmlData("samlMetadata.xml");
+        Element testInput = readXmlData("input.xml");
 
         final List<DomElementItem> mdCol = new ArrayList<>();
         mdCol.add(new DomElementItem(testInput));
 
         PrivateKey signingKey = CryptReader.readPrivateKey(XMLSignatureSigningStageTest.class
-                .getResourceAsStream("/data/signingKey.pem"));
+                .getResourceAsStream(classRelativeResource("signingKey.pem")));
         X509Certificate signingCert = (X509Certificate) CryptReader.readCertificate(XMLSignatureSigningStageTest.class
-                .getResourceAsStream("/data/signingCert.pem"));
+                .getResourceAsStream(classRelativeResource("signingCert.pem")));
         final List<X509Certificate> certs = new ArrayList<>();
         certs.add(signingCert);
 
@@ -62,7 +68,7 @@
         DomElementItem result = mdCol.iterator().next();
         AssertSupport.assertValidComponentInfo(result, 1, XMLSignatureSigningStage.class, "test");
 
-        Element expected = readXmlData("signedSamlMetadata.xml");
+        Element expected = readXmlData("output.xml");
         assertXmlIdentical(expected, result.unwrap());
     }
 }