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 [4/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/encryption/BaltimoreEncTest.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/encryption/BaltimoreEncTest.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/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Wed Jun 6 08:24:42 2018
@@ -33,7 +33,6 @@ import java.util.Map;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -107,8 +106,7 @@ public class BaltimoreEncTest extends or
}
File f = new File(filename);
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new java.io.FileInputStream(f));
+ Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
cardNumber = retrieveCCNumber(doc);
@@ -140,8 +138,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-tripledes-cbc.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
@@ -164,7 +161,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -175,8 +172,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes256-cbc-prop.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes("ASCII");
@@ -199,7 +195,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -210,8 +206,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
@@ -234,7 +229,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -245,8 +240,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes("ASCII");
@@ -269,7 +263,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -280,8 +274,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -300,7 +293,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -311,8 +304,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes128-cbc.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes("ASCII");
@@ -335,7 +327,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -344,8 +336,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
@@ -368,7 +359,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -377,8 +368,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes("ASCII");
@@ -401,7 +391,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -410,8 +400,7 @@ public class BaltimoreEncTest extends or
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -430,7 +419,7 @@ public class BaltimoreEncTest extends or
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = 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/encryption/DecryptionTest.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/encryption/DecryptionTest.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/encryption/DecryptionTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java Wed Jun 6 08:24:42 2018
@@ -39,7 +39,6 @@ import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
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;
@@ -128,8 +127,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -163,7 +161,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -184,8 +182,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -219,7 +216,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -239,8 +236,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -276,7 +272,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -296,8 +292,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -332,7 +327,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -360,8 +355,7 @@ public class DecryptionTest extends Asse
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
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -401,7 +395,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -427,8 +421,7 @@ public class DecryptionTest extends Asse
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
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -470,7 +463,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -492,8 +485,7 @@ public class DecryptionTest extends Asse
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
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -535,7 +527,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -561,8 +553,7 @@ public class DecryptionTest extends Asse
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
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -604,7 +595,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -626,8 +617,7 @@ public class DecryptionTest extends Asse
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
byte[] passPhrase = "24 Bytes per DESede key!".getBytes();
@@ -664,7 +654,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -684,8 +674,7 @@ public class DecryptionTest extends Asse
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
byte[] bits128 = {
@@ -724,7 +713,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -744,8 +733,7 @@ public class DecryptionTest extends Asse
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
byte[] bits192 = {
@@ -786,7 +774,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -806,8 +794,7 @@ public class DecryptionTest extends Asse
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
byte[] bits256 = {
@@ -850,7 +837,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -872,8 +859,7 @@ public class DecryptionTest extends Asse
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
byte[] passPhrase = "24 Bytes per DESede key!".getBytes();
@@ -910,7 +896,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -927,8 +913,7 @@ public class DecryptionTest extends Asse
public void testPhysicalRepresentation() throws Exception {
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document document = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")), false);
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -965,7 +950,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the element decrypted ok
nodeList = document.getElementsByTagNameNS("ns.com", "elem");
@@ -990,8 +975,7 @@ public class DecryptionTest extends Asse
public void testPhysicalRepresentation2() throws Exception {
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document document = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")), false);
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -1028,7 +1012,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the element decrypted ok
nodeList = document.getElementsByTagNameNS("", "elem");
@@ -1255,8 +1239,7 @@ public class DecryptionTest extends Asse
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);
for (int i = 0; i < 7; i++) {
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1291,7 +1274,7 @@ public class DecryptionTest extends Asse
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1306,8 +1289,7 @@ public class DecryptionTest extends Asse
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
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -1371,7 +1353,7 @@ public class DecryptionTest extends Asse
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} catch (XMLStreamException e) {
Assert.assertFalse(e.getMessage().contains("Unwrapping failed"));
}
@@ -1383,8 +1365,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1430,7 +1411,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1443,8 +1424,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1500,7 +1480,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1513,8 +1493,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1569,7 +1548,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1582,8 +1561,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1638,7 +1616,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1659,8 +1637,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1715,7 +1692,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1728,8 +1705,7 @@ public class DecryptionTest extends Asse
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1775,7 +1751,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1788,8 +1764,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -1824,7 +1799,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// XMLUtils.outputDOM(document, System.out);
@@ -1847,8 +1822,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -1883,7 +1857,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1903,8 +1877,7 @@ public class DecryptionTest extends Asse
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
SecretKey secretKey = generateSecretKey();
@@ -1939,7 +1912,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "PurchaseOrder");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.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/encryption/EncryptionCreationTest.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/encryption/EncryptionCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java Wed Jun 6 08:24:42 2018
@@ -110,8 +110,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -167,8 +166,7 @@ public class EncryptionCreationTest exte
// 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);
// Check the CreditCard encrypted ok
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -256,8 +254,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -313,8 +310,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -372,8 +368,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -428,8 +423,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -495,8 +489,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -562,8 +555,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -630,8 +622,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -700,8 +691,7 @@ public class EncryptionCreationTest exte
// 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);
// Check the CreditCard encrypted ok
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -761,8 +751,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -830,8 +819,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -907,8 +895,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -976,8 +963,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1045,8 +1031,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1108,8 +1093,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1167,8 +1151,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1228,8 +1211,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1291,8 +1273,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1357,7 +1338,7 @@ public class EncryptionCreationTest exte
// 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("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1417,8 +1398,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1477,8 +1457,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("ns.com", "elem");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1537,8 +1516,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("", "elem");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1595,8 +1573,7 @@ public class EncryptionCreationTest exte
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.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/encryption/KeyWrapEncryptionCreationTest.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/encryption/KeyWrapEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java Wed Jun 6 08:24:42 2018
@@ -143,8 +143,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -209,8 +208,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -275,8 +273,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -339,8 +336,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -402,8 +398,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -465,8 +460,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -528,8 +522,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -597,8 +590,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -666,8 +658,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -735,8 +726,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -804,8 +794,7 @@ public class KeyWrapEncryptionCreationTe
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.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/encryption/KeyWrapEncryptionVerificationTest.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/encryption/KeyWrapEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java Wed Jun 6 08:24:42 2018
@@ -32,7 +32,6 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -114,8 +113,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -158,7 +156,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -171,8 +169,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -215,7 +212,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -228,8 +225,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -272,7 +268,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -285,8 +281,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -327,7 +322,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -340,8 +335,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -381,7 +375,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -394,8 +388,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -435,7 +428,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -448,8 +441,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -489,7 +481,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -505,8 +497,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -549,7 +540,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -565,8 +556,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -609,7 +599,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -625,8 +615,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -669,7 +658,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -685,8 +674,7 @@ public class KeyWrapEncryptionVerificati
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
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -729,7 +717,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.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/encryption/SymmetricEncryptionCreationTest.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/encryption/SymmetricEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java Wed Jun 6 08:24:42 2018
@@ -128,8 +128,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -187,8 +186,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -246,8 +244,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -305,8 +302,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -364,8 +360,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -423,8 +418,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -481,8 +475,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -543,8 +536,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -604,8 +596,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -665,8 +656,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -726,8 +716,7 @@ public class SymmetricEncryptionCreation
// 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);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);