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 2018/06/06 08:24:44 UTC
svn commit: r1832986 [6/7] - in
/santuario/xml-security-java/branches/2.0.x-fixes: ./
src/main/java/org/apache/jcp/xml/dsig/internal/dom/
src/main/java/org/apache/xml/security/
src/main/java/org/apache/xml/security/c14n/
src/main/java/org/apache/xml/se...
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java Wed Jun 6 08:24:42 2018
@@ -29,7 +29,6 @@ import java.security.Security;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -104,8 +103,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
List<String> localNames = new ArrayList<String>();
@@ -133,7 +131,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -142,8 +140,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
List<String> localNames = new ArrayList<String>();
@@ -171,7 +168,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -180,8 +177,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384";
List<String> localNames = new ArrayList<String>();
@@ -209,7 +205,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -218,8 +214,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
List<String> localNames = new ArrayList<String>();
@@ -247,7 +242,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -259,8 +254,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160";
List<String> localNames = new ArrayList<String>();
@@ -288,7 +282,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -300,8 +294,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha1-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -329,7 +322,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -341,8 +334,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha224-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -370,7 +362,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -382,8 +374,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha256-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -411,7 +402,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -423,8 +414,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha384-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -452,7 +442,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -464,8 +454,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#sha512-rsa-MGF1";
List<String> localNames = new ArrayList<String>();
@@ -493,7 +482,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -502,8 +491,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1";
List<String> localNames = new ArrayList<String>();
@@ -531,7 +519,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -540,8 +528,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224";
List<String> localNames = new ArrayList<String>();
@@ -569,7 +556,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -578,8 +565,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256";
List<String> localNames = new ArrayList<String>();
@@ -607,7 +593,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -616,8 +602,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384";
List<String> localNames = new ArrayList<String>();
@@ -645,7 +630,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -654,8 +639,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512";
List<String> localNames = new ArrayList<String>();
@@ -683,7 +667,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -695,8 +679,7 @@ public class PKSignatureVerificationTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
String signatureAlgorithm = "http://www.w3.org/2007/05/xmldsig-more#ecdsa-ripemd160";
List<String> localNames = new ArrayList<String>();
@@ -724,7 +707,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Wed Jun 6 08:24:42 2018
@@ -37,7 +37,6 @@ import org.w3c.dom.Document;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -90,8 +89,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-detached.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -109,7 +107,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -123,8 +121,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-enveloped.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -142,7 +139,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -151,8 +148,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-dsa-enveloping.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -170,7 +166,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
// See SANTUARIO-319
@@ -192,8 +188,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-hmac-sha1-exclusive-c14n-comments-detached.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -216,7 +211,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -230,8 +225,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-hmac-sha1-exclusive-c14n-enveloped.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -254,7 +248,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -263,8 +257,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-detached-b64-transform.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the key
byte[] hmacKey = "test".getBytes("ASCII");
@@ -289,7 +282,7 @@ public class PhaosTest extends Assert {
try {
TestUtils.switchDoNotThrowExceptionForManifests(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchDoNotThrowExceptionForManifests(false);
}
@@ -314,8 +307,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-detached.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -333,7 +325,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -347,8 +339,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloped-bad-digest-val.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -365,7 +356,7 @@ public class PhaosTest extends Assert {
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a bad digest");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -380,8 +371,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloped.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -399,7 +389,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -408,8 +398,7 @@ public class PhaosTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/phaos/phaos-xmldsig-three/signature-rsa-enveloping.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -427,7 +416,7 @@ public class PhaosTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java Wed Jun 6 08:24:42 2018
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -67,8 +66,7 @@ public class RSASecurityTest extends Abs
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/rsasecurity/bdournaee/certj201_enveloping.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -86,7 +84,7 @@ public class RSASecurityTest extends Abs
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, null, null,
@@ -100,8 +98,7 @@ public class RSASecurityTest extends Abs
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"com/rsasecurity/bdournaee/certj201_enveloped.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -119,7 +116,7 @@ public class RSASecurityTest extends Abs
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, null, null,
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java Wed Jun 6 08:24:42 2018
@@ -98,8 +98,7 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -147,8 +146,7 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -202,8 +200,7 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), resolverDirectHTTP);
@@ -247,8 +244,7 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Reference");
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java Wed Jun 6 08:24:42 2018
@@ -95,9 +95,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -199,9 +198,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -262,8 +260,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -350,8 +347,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document
- = XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
//find first child element:
Node childNode = XMLUtils.getNextElement(document.getDocumentElement().getFirstChild());
@@ -401,7 +397,7 @@ public class SignatureCreationTest exten
// Specify the signature position
properties.setIdAttributeNS(new QName(null, "ID"));
-
+
// Set the key up
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(
@@ -438,14 +434,13 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document
- = XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(),null,true,"ID");
}
-
-
+
+
@Test
public void testMultipleElements() throws Exception {
// Set up the Configuration
@@ -484,9 +479,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -538,9 +532,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
XPathFactory xpf = XPathFactory.newInstance();
@@ -600,9 +593,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -646,9 +638,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -704,9 +695,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -763,9 +753,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -808,9 +797,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -854,9 +842,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -920,9 +907,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -985,9 +971,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1031,9 +1016,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getNamespaceURI(), XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getLocalPart());
Assert.assertEquals(2, nodeList.getLength());
@@ -1080,9 +1064,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1133,9 +1116,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1177,9 +1159,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1221,9 +1202,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1267,9 +1247,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1313,9 +1292,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), null, false, "Id");
@@ -1359,9 +1337,8 @@ public class SignatureCreationTest exten
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
@@ -1411,7 +1388,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
@@ -1466,7 +1443,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Wed Jun 6 08:24:42 2018
@@ -122,9 +122,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -175,9 +174,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -228,9 +226,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -281,9 +278,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -334,9 +330,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -390,9 +385,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -446,9 +440,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -502,9 +495,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -558,9 +550,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -614,9 +605,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -670,9 +660,8 @@ public class SignatureDigestCreationTest
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Wed Jun 6 08:24:42 2018
@@ -30,7 +30,6 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -98,8 +97,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -138,7 +136,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -147,8 +145,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -187,7 +184,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -196,8 +193,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -236,7 +232,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -245,8 +241,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -285,7 +280,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -294,8 +289,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -334,7 +328,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -346,8 +340,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -386,7 +379,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -398,8 +391,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -438,7 +430,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -450,8 +442,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -490,7 +481,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -502,8 +493,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -542,7 +532,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -554,8 +544,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -594,7 +583,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -606,8 +595,7 @@ public class SignatureDigestVerification
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -646,7 +634,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java Wed Jun 6 08:24:42 2018
@@ -97,9 +97,8 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Decrypt using DOM API
Document doc =
@@ -164,9 +163,8 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Decrypt using DOM API
Document doc =
@@ -239,9 +237,8 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Decrypt using DOM API
Document doc =
@@ -314,9 +311,8 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Decrypt using DOM API
Document doc =
@@ -389,9 +385,8 @@ public class SignatureEncryptionTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -490,7 +485,7 @@ public class SignatureEncryptionTest ext
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, testSecurityEventListener);
- Document document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ Document document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// javax.xml.transform.Transformer transformer = TransformerFactory.newInstance().newTransformer();
// transformer.transform(new DOMSource(document), new StreamResult(System.out));
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Wed Jun 6 08:24:42 2018
@@ -113,9 +113,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()) , false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -156,9 +155,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -199,9 +197,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -242,9 +239,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -285,9 +281,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -331,9 +326,8 @@ public class SignatureHMACCreationTest e
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());