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/05 11:54:02 UTC
svn commit: r1832932 [5/6] - in /santuario/xml-security-java/trunk: ./
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/security/encrypti...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Tue Jun 5 11:54:00 2018
@@ -38,7 +38,6 @@ import java.security.spec.RSAPublicKeySp
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;
@@ -125,8 +124,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -152,7 +150,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -165,8 +163,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1-40.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -191,7 +188,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -206,8 +203,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloped-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -228,7 +224,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -241,8 +237,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -263,7 +258,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -276,8 +271,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -298,7 +292,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -311,8 +305,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-rsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -333,7 +326,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 15),
@@ -358,8 +351,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -384,7 +376,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -414,8 +406,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -440,7 +431,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -457,8 +448,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -484,7 +474,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -497,8 +487,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -523,7 +512,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -538,8 +527,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -564,7 +552,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -577,8 +565,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -603,7 +590,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -616,8 +603,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -638,7 +624,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -651,8 +637,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-rsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -673,7 +658,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -699,8 +684,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -725,7 +709,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -755,8 +739,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -781,7 +764,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -811,8 +794,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-keyname.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -842,7 +824,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -872,8 +854,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -901,7 +882,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -927,8 +908,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt-crl.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -947,7 +927,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -973,8 +953,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -993,7 +972,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1019,8 +998,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-is.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1050,7 +1028,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1080,8 +1058,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-ski.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1109,7 +1086,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1135,8 +1112,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-sn.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1166,7 +1142,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1183,8 +1159,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-exc-c14n-one/exc-signature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1203,7 +1178,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -1224,8 +1199,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-keyname.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1255,7 +1229,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1285,8 +1259,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-retrievalmethod-rawx509crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1314,7 +1287,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1340,8 +1313,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt-crl.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1360,7 +1332,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1386,8 +1358,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1406,7 +1377,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1432,8 +1403,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-is.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1463,7 +1433,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1493,8 +1463,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-ski.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1522,7 +1491,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1548,8 +1517,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-sn.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1579,7 +1547,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Tue Jun 5 11:54:00 2018
@@ -34,7 +34,6 @@ import java.security.spec.RSAPublicKeySp
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;
@@ -108,8 +107,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -135,7 +133,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key, SecurityTokenConstants.KeyIdentifier_NoKeyInfo);
@@ -147,8 +145,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACShortSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -170,7 +167,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -184,8 +181,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/dSASignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -206,7 +202,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA"),
@@ -219,8 +215,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/rSASignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -241,7 +236,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
@@ -272,7 +267,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -306,7 +301,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -322,8 +317,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/transforms/signatures/envelopedSignatureSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("RSA");
@@ -348,7 +342,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java Tue Jun 5 11:54:00 2018
@@ -123,7 +123,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -166,7 +166,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -209,7 +209,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -252,7 +252,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -297,7 +297,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -342,7 +342,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -387,7 +387,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -432,7 +432,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -477,7 +477,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -522,7 +522,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -565,7 +565,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -608,7 +608,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -651,7 +651,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -694,7 +694,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -737,7 +737,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -782,7 +782,7 @@ public class PKSignatureCreationTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java Tue Jun 5 11:54:00 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<>();
@@ -136,7 +134,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -145,8 +143,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<>();
@@ -177,7 +174,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -186,8 +183,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<>();
@@ -218,7 +214,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -227,8 +223,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<>();
@@ -259,7 +254,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -270,8 +265,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<>();
@@ -302,7 +296,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -313,8 +307,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<>();
@@ -345,7 +338,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -356,8 +349,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<>();
@@ -388,7 +380,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -399,8 +391,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<>();
@@ -431,7 +422,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -442,8 +433,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<>();
@@ -474,7 +464,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -485,8 +475,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<>();
@@ -517,7 +506,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -526,8 +515,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<>();
@@ -558,7 +546,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -567,8 +555,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<>();
@@ -599,7 +586,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -608,8 +595,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<>();
@@ -640,7 +626,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -649,8 +635,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<>();
@@ -681,7 +666,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -690,8 +675,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<>();
@@ -722,7 +706,7 @@ public class PKSignatureVerificationTest
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -733,8 +717,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<>();
@@ -765,7 +748,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/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Tue Jun 5 11:54:00 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;
@@ -91,8 +90,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);
@@ -113,7 +111,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();
@@ -127,8 +125,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);
@@ -149,7 +146,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
@@ -158,8 +155,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);
@@ -180,7 +176,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
@@ -202,8 +198,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(StandardCharsets.US_ASCII);
@@ -229,7 +224,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();
@@ -243,8 +238,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(StandardCharsets.US_ASCII);
@@ -270,7 +264,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
@@ -279,8 +273,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(StandardCharsets.US_ASCII);
@@ -308,7 +301,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);
}
@@ -333,8 +326,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);
@@ -355,7 +347,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();
@@ -369,8 +361,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);
@@ -390,7 +381,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);
@@ -405,8 +396,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);
@@ -427,7 +417,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
@@ -436,8 +426,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);
@@ -458,7 +447,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/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java Tue Jun 5 11:54:00 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);
@@ -89,7 +87,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,
@@ -103,8 +101,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);
@@ -125,7 +122,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/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java Tue Jun 5 11:54:00 2018
@@ -99,7 +99,7 @@ public class SignatureCreationReferenceU
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -150,7 +150,7 @@ public class SignatureCreationReferenceU
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -207,7 +207,7 @@ public class SignatureCreationReferenceU
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -254,7 +254,7 @@ public class SignatureCreationReferenceU
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Reference");