You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/01/12 13:14:06 UTC
svn commit: r1058104 [3/3] -
/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1058104&r1=1058103&r2=1058104&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java Wed Jan 12 12:14:05 2011
@@ -144,41 +144,37 @@ public class ExclusiveC14NInteropTest ex
int failures = 0;
// if (!verify) {
- if (true) {
- StringBuffer sb = new StringBuffer();
+ StringBuffer sb = new StringBuffer();
- for (int i = 0; i < signature.getSignedInfo().getLength(); i++) {
- boolean refVerify =
- signature.getSignedInfo().getVerificationResult(i);
+ for (int i = 0; i < signature.getSignedInfo().getLength(); i++) {
+ boolean refVerify =
+ signature.getSignedInfo().getVerificationResult(i);
+ JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
+
+ if (refVerify) {
+ log.debug("Reference " + i + " was OK");
+ } else {
+ failures++;
+
+ sb.append(i + " ");
+
+ JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
- if (refVerify) {
- log.debug("Reference " + i + " was OK");
- } else {
- failures++;
-
- sb.append(i + " ");
-
- JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
- JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
-
- Reference reference = signature.getSignedInfo().item(i);
- int length = reference.getTransforms().getLength();
- String algo = reference.getTransforms().item(length - 1).getURI();
+ Reference reference = signature.getSignedInfo().item(i);
+ int length = reference.getTransforms().getLength();
+ String algo = reference.getTransforms().item(length - 1).getURI();
- log.debug("Reference " + i + " failed: " + algo);
- }
+ log.debug("Reference " + i + " failed: " + algo);
}
+ }
- String r = sb.toString().trim();
+ String r = sb.toString().trim();
- if (r.length() == 0) {
- return null;
- } else {
- return r;
- }
- } else {
+ if (r.length() == 0) {
return null;
+ } else {
+ return r;
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java?rev=1058104&r1=1058103&r2=1058104&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java Wed Jan 12 12:14:05 2011
@@ -27,44 +27,45 @@ import org.w3c.dom.Node;
public class MockCanonicalizationMethod extends CanonicalizerSpi {
- public static final String MOCK_CANONICALIZATION_METHOD = "mock.canonicalization.method";
- private Canonicalizer11_OmitComments _impl;
+ public static final String MOCK_CANONICALIZATION_METHOD = "mock.canonicalization.method";
+ private Canonicalizer11_OmitComments _impl;
- public MockCanonicalizationMethod() {
- _impl = new Canonicalizer11_OmitComments();
- }
-
- public byte[] engineCanonicalizeSubTree(Node rootNode)
- throws CanonicalizationException {
- return _impl.engineCanonicalizeSubTree(rootNode);
- }
-
- public byte[] engineCanonicalizeSubTree(Node rootNode,
- String inclusiveNamespaces) throws CanonicalizationException {
- return _impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces);
- }
-
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
- throws CanonicalizationException {
- return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet);
- }
-
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
- String inclusiveNamespaces) throws CanonicalizationException {
- return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet,
- inclusiveNamespaces);
- }
-
- public boolean engineGetIncludeComments() {
- return _impl.engineGetIncludeComments();
- }
-
- public String engineGetURI() {
- return MOCK_CANONICALIZATION_METHOD;
- }
-
- public void setWriter(OutputStream os) {
- _impl.setWriter(os);
- }
+ public MockCanonicalizationMethod() {
+ _impl = new Canonicalizer11_OmitComments();
+ }
+
+ public byte[] engineCanonicalizeSubTree(Node rootNode)
+ throws CanonicalizationException {
+ return _impl.engineCanonicalizeSubTree(rootNode);
+ }
+
+ public byte[] engineCanonicalizeSubTree(Node rootNode, String inclusiveNamespaces)
+ throws CanonicalizationException {
+ return _impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces);
+ }
+
+ @SuppressWarnings("unchecked")
+ public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
+ throws CanonicalizationException {
+ return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+ }
+
+ @SuppressWarnings("unchecked")
+ public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet, String inclusiveNamespaces)
+ throws CanonicalizationException {
+ return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces);
+ }
+
+ public boolean engineGetIncludeComments() {
+ return _impl.engineGetIncludeComments();
+ }
+
+ public String engineGetURI() {
+ return MOCK_CANONICALIZATION_METHOD;
+ }
+
+ public void setWriter(OutputStream os) {
+ _impl.setWriter(os);
+ }
}