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 15:09:43 UTC
svn commit: r1833038 [2/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/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Wed Jun 6 15:09:42 2018
@@ -29,6 +29,7 @@ import java.util.UUID;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -87,7 +88,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -107,7 +109,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -127,7 +130,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -147,7 +151,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -167,7 +172,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -187,7 +193,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -210,7 +217,8 @@ public class HMACSignatureAlgorithmTest
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java Wed Jun 6 15:09:42 2018
@@ -30,6 +30,7 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -94,7 +95,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -134,7 +136,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -174,7 +177,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -214,7 +218,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -252,7 +257,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -288,7 +294,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -324,7 +331,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -363,7 +371,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -406,7 +415,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -449,7 +459,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -492,7 +503,8 @@ public class KeyWrapEncryptionAlgorithmT
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Wed Jun 6 15:09:42 2018
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -94,7 +95,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -110,7 +112,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -126,7 +129,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -142,7 +146,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -158,7 +163,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -174,7 +180,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -193,7 +200,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -212,7 +220,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -231,7 +240,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -250,7 +260,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -269,7 +280,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -288,7 +300,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -306,7 +319,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -324,7 +338,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -342,7 +357,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -360,7 +376,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -376,7 +393,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -392,7 +410,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -408,7 +427,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -424,7 +444,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -440,7 +461,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
@@ -459,7 +481,8 @@ public class PKSignatureAlgorithmTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java Wed Jun 6 15:09:42 2018
@@ -38,7 +38,7 @@ public class SignatureAlgorithmTest exte
@org.junit.Test
public void testSameKeySeveralAlgorithmSigning() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
SignatureAlgorithm signatureAlgorithm =
new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1);
PrivateKey pk = KeyPairGenerator.getInstance("RSA").genKeyPair().getPrivate();
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Wed Jun 6 15:09:42 2018
@@ -28,6 +28,7 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -86,7 +87,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -118,7 +120,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -150,7 +153,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -182,7 +186,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -214,7 +219,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -246,7 +252,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -278,7 +285,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -312,7 +320,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -347,7 +356,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -382,7 +392,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -417,7 +428,8 @@ public class SymmetricEncryptionAlgorith
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java Wed Jun 6 15:09:42 2018
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.test.dom.c14n.helper;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.security.c14n.helper.AttrCompare;
@@ -216,7 +217,9 @@ public class AttrCompareTest extends org
private static Document createDoc(
String documentElement
) throws ParserConfigurationException {
- Document doc = XMLUtils.newDocument(false);
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
+
+ Document doc = documentBuilder.newDocument();
Element root = doc.createElementNS(null, documentElement);
doc.appendChild(root);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java Wed Jun 6 15:09:42 2018
@@ -23,6 +23,8 @@ import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.xml.security.Init;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.keys.KeyInfo;
@@ -43,12 +45,14 @@ public class Bug45961Test extends org.ju
MockCanonicalizationMethod.MOCK_CANONICALIZATION_METHOD;
private static final char[] PASSWORD = "changeit".toCharArray();
private static final String ALIAS = "mullan";
+ private DocumentBuilder _builder;
private ObjectContainer object;
public Bug45961Test() throws Exception {
Init.init();
Canonicalizer.register(MOCK_CANONICALIZATION_METHOD,
MockCanonicalizationMethod.class.getName());
+ _builder = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
@@ -78,7 +82,7 @@ public class Bug45961Test extends org.ju
X509Certificate signingCert = (X509Certificate) ks
.getCertificate(ALIAS);
- Document document = XMLUtils.newDocument(false);
+ Document document = _builder.newDocument();
XMLSignature signature = new XMLSignature(document, null,
XMLSignature.ALGO_ID_SIGNATURE_DSA,
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Wed Jun 6 15:09:42 2018
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -40,6 +39,7 @@ import org.apache.xml.security.c14n.Inva
import org.apache.xml.security.test.dom.DSNamespaceContext;
import org.apache.xml.security.utils.IgnoreAllErrorHandler;
import org.apache.xml.security.utils.JavaUtils;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -355,21 +355,18 @@ public class Canonicalizer11Test extends
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(validating, false);
+
+ // throw away all warnings and errors
+ documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
+
// org.xml.sax.EntityResolver resolver = new TestVectorResolver();
// documentBuilder.setEntityResolver(resolver);
// Document doc = documentBuilder.parse(resolver.resolveEntity(null, fileIn));
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
- dbf.setValidating(validating);
-
- DocumentBuilder documentBuilder = dbf.newDocumentBuilder();
-
- // throw away all warnings and errors
- documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
Document doc = documentBuilder.parse(fileIn);
+
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
byte c14nBytes[] = null;
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Wed Jun 6 15:09:42 2018
@@ -19,13 +19,13 @@
package org.apache.xml.security.test.dom.c14n.implementations;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringReader;
import java.util.HashSet;
import java.util.Set;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -70,6 +70,13 @@ public class Canonicalizer20010315Exclus
Canonicalizer20010315ExclusiveTest.class
);
+ /** Field db */
+ DocumentBuilder db;
+
+ public Canonicalizer20010315ExclusiveTest() throws ParserConfigurationException {
+ this.db = XMLUtils.createDocumentBuilder(false);
+ }
+
/**
* Method testA
*
@@ -98,7 +105,7 @@ public class Canonicalizer20010315Exclus
// File fileIn = new File("signature.xml");
assertTrue("file exists", fileIn.exists());
- Document doc = XMLUtils.parse(new FileInputStream(fileIn), false);
+ Document doc = this.db.parse(fileIn);
Element signatureElement =
(Element) doc.getElementsByTagNameNS(
Constants.SignatureSpecNS, Constants._TAG_SIGNATURE).item(0);
@@ -143,8 +150,8 @@ public class Canonicalizer20010315Exclus
XMLSignatureException, XMLSecurityException {
Document doc =
- XMLUtils.parse(
- new FileInputStream(getAbsolutePath("src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")), false
+ this.db.parse(
+ getAbsolutePath("src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")
);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315 c = new Canonicalizer20010315WithComments();
@@ -176,8 +183,8 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- XMLUtils.parse(new FileInputStream(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml")), false
+ this.db.parse(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml")
);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315 c = new Canonicalizer20010315WithComments();
@@ -209,8 +216,8 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- XMLUtils.parse(new FileInputStream(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")), false);
+ this.db.parse(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml"));
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
@@ -241,8 +248,8 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- XMLUtils.parse(new FileInputStream(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml")), false);
+ this.db.parse(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml"));
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
@@ -276,8 +283,8 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException, XPathExpressionException {
Document doc =
- XMLUtils.parse(new FileInputStream(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_3.xml")), false);
+ this.db.parse(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_3.xml"));
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -328,7 +335,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
Set<Node> nodeSet = new HashSet<Node>();
@@ -346,9 +353,9 @@ public class Canonicalizer20010315Exclus
@org.junit.Test
public void test24excl() throws Exception {
Document doc =
- XMLUtils.parse(
- new FileInputStream(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_4.xml")), false);
+ this.db.parse(
+ getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_4.xml"));
Node root =
doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
@@ -368,7 +375,7 @@ public class Canonicalizer20010315Exclus
*/
@org.junit.Test
public void test24Aexcl() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Element local = doc.createElementNS("foo:bar", "dsig:local");
Element test = doc.createElementNS("http://example.net", "etsi:test");
Element elem2 = doc.createElementNS("http://example.net", "etsi:elem2");
@@ -421,7 +428,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -484,7 +491,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -534,7 +541,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -584,7 +591,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -634,7 +641,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -669,7 +676,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -704,7 +711,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -739,7 +746,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -769,7 +776,7 @@ public class Canonicalizer20010315Exclus
+ "<ns0:text xsi:type=\"xsd:string\">hello</ns0:text>"
+ "</ns0:Ping>";
- Document doc = XMLUtils.parse(new InputSource(new StringReader(XML)), false);
+ Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild().getFirstChild(), "#default", true);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Wed Jun 6 15:09:42 2018
@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -609,12 +608,7 @@ public class Canonicalizer20010315Test e
//String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
//boolean validating = true;
- DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();
- f.setNamespaceAware(true);
- f.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
- f.setValidating(false);
-
- DocumentBuilder db = f.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
org.xml.sax.EntityResolver resolver = new TestVectorResolver();
db.setEntityResolver(resolver);
@@ -681,7 +675,8 @@ public class Canonicalizer20010315Test e
+ "";
//J+
- Document doc = XMLUtils.parse(new ByteArrayInputStream(inputStr.getBytes()), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new ByteArrayInputStream(inputStr.getBytes()));
boolean weCatchedTheRelativeNS = false;
try {
@@ -989,8 +984,11 @@ public class Canonicalizer20010315Test e
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
- Document doc = XMLUtils.parse(new ByteArrayInputStream(input.getBytes()), true, true, true);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
+
+ db.setErrorHandler(new IgnoreAllErrorHandler());
+ Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
Canonicalizer c14nizer =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
@@ -1038,21 +1036,18 @@ public class Canonicalizer20010315Test e
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(validating, false);
+
+ // throw away all warnings and errors
+ documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
+
// org.xml.sax.EntityResolver resolver = new TestVectorResolver();
// documentBuilder.setEntityResolver(resolver);
// Document doc = documentBuilder.parse(resolver.resolveEntity(null, fileIn));
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
- dbf.setValidating(validating);
-
- DocumentBuilder documentBuilder = dbf.newDocumentBuilder();
-
- // throw away all warnings and errors
- documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
Document doc = documentBuilder.parse(fileIn);
+
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
byte c14nBytes[] = null;
@@ -1079,7 +1074,7 @@ public class Canonicalizer20010315Test e
// if everything is OK, result is true; we do a binary compare, byte by byte
boolean result = java.security.MessageDigest.isEqual(refBytes, c14nBytes);
- if (!result) {
+ if (!result) {
File f = new File(fileOut);
if (!f.exists()) {
File parent = new File(f.getParent());
@@ -1115,8 +1110,8 @@ public class Canonicalizer20010315Test e
//String ENCODING_ISO8859_1 = "ISO-8859-1";
//String ENCODING_UTF8 = "UTF-8";
String ENCODING_UTF16 = "UTF-16";
- Document doc = XMLUtils.parse(new ByteArrayInputStream(input), false);
-
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new ByteArrayInputStream(input));
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer transformer = tFactory.newTransformer();
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Wed Jun 6 15:09:42 2018
@@ -19,7 +19,6 @@
package org.apache.xml.security.test.dom.c14n.implementations;
import java.io.File;
-import java.io.FileInputStream;
import org.apache.xml.security.signature.Reference;
import org.apache.xml.security.signature.XMLSignature;
@@ -126,7 +125,8 @@ public class ExclusiveC14NInteropTest ex
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(f);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java Wed Jun 6 15:09:42 2018
@@ -30,7 +30,7 @@ public class NameSpaceSymbTableTest exte
static Attr node1,node2;
static {
try {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
node1 = doc.createAttributeNS("a","b");
node2 = doc.createAttributeNS("b","c");
} catch (Exception e) {
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Wed Jun 6 15:09:42 2018
@@ -21,6 +21,8 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import javax.xml.parsers.DocumentBuilder;
+
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.apache.xml.security.c14n.implementations.Canonicalizer11;
@@ -50,6 +52,8 @@ public class Santuario191Test extends or
+ " <user2>Bob</user2>"
+ "</data>";
+ private DocumentBuilder db;
+
static {
org.apache.xml.security.Init.init();
}
@@ -59,7 +63,8 @@ public class Santuario191Test extends or
//
// Parse the Data
//
- Document doc = XMLUtils.parse(new ByteArrayInputStream(INPUT_DATA.getBytes("UTF8")), false);
+ db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new ByteArrayInputStream(INPUT_DATA.getBytes("UTF8")));
//
// Canonicalize the data
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Wed Jun 6 15:09:42 2018
@@ -20,6 +20,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -75,9 +76,12 @@ public class Santuario273Test extends or
@org.junit.Test
public void testC14n11Base() throws Exception {
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(true);
+
+ documentBuilder.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
byte inputBytes[] = input.getBytes();
Document doc =
- XMLUtils.parse(new ByteArrayInputStream(inputBytes), true, true, true);
+ documentBuilder.parse(new ByteArrayInputStream(inputBytes));
Canonicalizer c14n =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/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/dom/encryption/BaltimoreEncTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Wed Jun 6 15:09:42 2018
@@ -32,6 +32,7 @@ import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -88,7 +89,8 @@ public class BaltimoreEncTest extends or
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
cardNumber = retrieveCCNumber(doc);
@@ -388,7 +390,8 @@ public class BaltimoreEncTest extends or
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
// Now we have the document, lets build the XMLCipher element
Element ee = null;
@@ -427,7 +430,8 @@ public class BaltimoreEncTest extends or
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
// Now we have the document, lets build the XMLCipher element
Element ee = null;
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java Wed Jun 6 15:09:42 2018
@@ -26,6 +26,7 @@ import javax.crypto.NoSuchPaddingExcepti
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.TransformerFactory;
import org.apache.xml.security.algorithms.JCEMapper;
@@ -66,11 +67,13 @@ public class EncryptContentTest extends
" </user>\n" +
"</users>\n";
+ private DocumentBuilder db;
private SecretKey secretKey;
private boolean haveISOPadding;
public EncryptContentTest() throws Exception {
org.apache.xml.security.Init.init();
+ db = XMLUtils.createDocumentBuilder(false);
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
DESedeKeySpec keySpec = new DESedeKeySpec(bits192);
@@ -109,8 +112,7 @@ public class EncryptContentTest extends
return;
}
- Document doc = XMLUtils.parse(new ByteArrayInputStream(DATA.getBytes("UTF8")), false);
-
+ Document doc = db.parse(new ByteArrayInputStream(DATA.getBytes("UTF8")));
NodeList dataToEncrypt = doc.getElementsByTagName("user");
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -159,8 +161,7 @@ public class EncryptContentTest extends
return;
}
- Document doc = XMLUtils.parse(new ByteArrayInputStream(MULTIPLE_USER_DATA.getBytes("UTF8")), false);
-
+ Document doc = db.parse(new ByteArrayInputStream(MULTIPLE_USER_DATA.getBytes("UTF8")));
NodeList dataToEncrypt = doc.getElementsByTagName("user");
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java Wed Jun 6 15:09:42 2018
@@ -20,6 +20,8 @@ package org.apache.xml.security.test.dom
import java.util.Iterator;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.xml.security.encryption.Reference;
import org.apache.xml.security.encryption.ReferenceList;
import org.apache.xml.security.encryption.XMLCipher;
@@ -33,13 +35,16 @@ public class ReferenceListTest extends o
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class);
+ private DocumentBuilder db;
+
public ReferenceListTest() throws Exception {
org.apache.xml.security.Init.init();
+ db = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
public void testReferenceList() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
XMLCipher dataCipher = XMLCipher.getInstance();
dataCipher.init(XMLCipher.DECRYPT_MODE, null);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java Wed Jun 6 15:09:42 2018
@@ -34,6 +34,7 @@ import org.w3c.dom.Element;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.TransformerFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -99,7 +100,8 @@ public class SignedEncryptedTest extends
}
public void secureAndVerify(TransformerFactory transformerFactory, boolean useDocumentSerializer) throws Exception {
- Document document = XMLUtils.parse(new ByteArrayInputStream(SAMPLE_MSG.getBytes("UTF-8")), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(new ByteArrayInputStream(SAMPLE_MSG.getBytes("UTF-8")));
// Set up the Key
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Wed Jun 6 15:09:42 2018
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.lang.reflect.Constructor;
-import java.io.FileInputStream;
import java.security.Key;
import java.security.KeyPairGenerator;
import java.security.KeyPair;
@@ -39,6 +38,7 @@ import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.c14n.Canonicalizer;
@@ -651,8 +651,9 @@ public class XMLCipherTest extends org.j
public void testSameDocumentCipherReference() throws Exception {
if (haveISOPadding) {
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document d = XMLUtils.newDocument(false);
+ Document d = db.newDocument();
Element docElement = d.createElement("EncryptedDoc");
d.appendChild(docElement);
@@ -723,6 +724,7 @@ public class XMLCipherTest extends org.j
public void testPhysicalRepresentation() throws Exception {
if (haveISOPadding) {
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
DESedeKeySpec keySpec = new DESedeKeySpec(bits192);
@@ -732,7 +734,7 @@ public class XMLCipherTest extends org.j
// Test inherited namespaces don't add extra attributes
// Test unused namespaces are preserved
final String DATA1 = "<ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
- Document doc = XMLUtils.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")), false);
+ Document doc = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
Element elem = (Element)doc.getDocumentElement().getFirstChild();
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -756,7 +758,7 @@ public class XMLCipherTest extends org.j
// Test default namespace undeclaration is preserved
final String DATA2 = "<ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
- doc = XMLUtils.parse(new ByteArrayInputStream(DATA2.getBytes("UTF8")), false);
+ doc = db.parse(new ByteArrayInputStream(DATA2.getBytes("UTF8")));
elem = (Element)doc.getDocumentElement().getFirstChild();
dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -781,9 +783,8 @@ public class XMLCipherTest extends org.j
// Test comments and PIs are not treated specially when serializing element content.
// Other c14n algorithms add a newline after comments and PIs, when they are before or after the document element.
final String DATA3 = "<root><!--comment1--><?pi1 target1?><elem/><!--comment2--><?pi2 target2?></root>";
-
- doc = XMLUtils.parse(new ByteArrayInputStream(DATA3.getBytes("UTF8")), false);
- elem = doc.getDocumentElement();
+ doc = db.parse(new ByteArrayInputStream(DATA3.getBytes("UTF8")));
+ elem = (Element)doc.getDocumentElement();
dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
dataCipher.init(XMLCipher.ENCRYPT_MODE, secretKey);
@@ -876,7 +877,8 @@ public class XMLCipherTest extends org.j
}
File f = new File(filename);
- Document document = XMLUtils.parse(new FileInputStream(f), false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(f);
XMLCipher keyCipher = XMLCipher.getInstance();
keyCipher.init(XMLCipher.UNWRAP_MODE, null);
@@ -1000,8 +1002,9 @@ public class XMLCipherTest extends org.j
private Document document() {
Document d = null;
try {
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(documentName);
- d = XMLUtils.parse(new FileInputStream(f), false);
+ d = db.parse(f);
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Wed Jun 6 15:09:42 2018
@@ -34,6 +34,7 @@ import java.util.Map;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.NoSuchPaddingException;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -105,7 +106,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
cardNumber = retrieveCCNumber(doc);
@@ -205,7 +207,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes128-gcm");
EncryptedKey encryptedKey =
@@ -306,7 +309,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes192-gcm");
EncryptedKey encryptedKey =
@@ -407,7 +411,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes256-gcm");
EncryptedKey encryptedKey =
@@ -508,7 +513,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes256-gcm");
EncryptedKey encryptedKey =
@@ -560,7 +566,8 @@ public class XMLEncryption11Test extends
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
return decryptElement(doc, rsaKey, rsaCert);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Wed Jun 6 15:09:42 2018
@@ -19,7 +19,6 @@
package org.apache.xml.security.test.dom.interop;
import java.io.File;
-import java.io.FileInputStream;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.Iterator;
@@ -59,7 +58,8 @@ public class InteropTestBase extends org
String filename, ResourceResolverSpi resolver, boolean followManifests, byte[] hmacKey
) throws Exception {
File f = new File(filename);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -92,7 +92,8 @@ public class InteropTestBase extends org
public boolean verify(String filename, ResourceResolverSpi resolver, boolean followManifests)
throws Exception {
File f = new File(filename);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(f);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java Wed Jun 6 15:09:42 2018
@@ -26,6 +26,8 @@ import java.security.PublicKey;
import java.security.Security;
import java.security.spec.X509EncodedKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.xml.security.keys.content.DEREncodedKeyValue;
import org.apache.xml.security.utils.Base64;
import org.apache.xml.security.utils.Constants;
@@ -41,6 +43,8 @@ public class DEREncodedKeyValueTest exte
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
+ private DocumentBuilder documentBuilder;
+
private PublicKey rsaKeyControl;
private PublicKey dsaKeyControl;
private PublicKey ecKeyControl;
@@ -48,6 +52,7 @@ public class DEREncodedKeyValueTest exte
private final String idControl = "abc123";
public DEREncodedKeyValueTest() throws Exception {
+ documentBuilder = XMLUtils.createDocumentBuilder(false);
//
// If the BouncyCastle provider is not installed, then try to load it
@@ -79,7 +84,7 @@ public class DEREncodedKeyValueTest exte
@org.junit.Test
public void testSchema() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(false), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
Element element = derEncodedKeyValue.getElement();
assertEquals("http://www.w3.org/2009/xmldsig11#", element.getNamespaceURI());
@@ -128,14 +133,14 @@ public class DEREncodedKeyValueTest exte
@org.junit.Test
public void testRSAPublicKeyFromKey() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(false), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
assertEquals(rsaKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(rsaKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@org.junit.Test
public void testDSAPublicKeyFromKey() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(false), dsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), dsaKeyControl);
assertEquals(dsaKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(dsaKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@@ -146,14 +151,14 @@ public class DEREncodedKeyValueTest exte
return;
}
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(false), ecKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), ecKeyControl);
assertEquals(ecKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(ecKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@org.junit.Test
public void testId() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(false), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
assertEquals("", derEncodedKeyValue.getId());
assertNull(derEncodedKeyValue.getElement().getAttributeNodeNS(null, Constants._ATT_ID));
@@ -176,7 +181,7 @@ public class DEREncodedKeyValueTest exte
}
private Document loadXML(String fileName) throws Exception {
- return XMLUtils.parse(new FileInputStream(getControlFilePath(fileName)), false);
+ return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
}
private PublicKey loadPublicKey(String filePath, String algorithm) throws Exception {
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java?rev=1833038&r1=1833037&r2=1833038&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java Wed Jun 6 15:09:42 2018
@@ -20,6 +20,8 @@ package org.apache.xml.security.test.dom
import java.io.FileInputStream;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.xml.security.keys.content.KeyInfoReference;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
@@ -33,12 +35,18 @@ public class KeyInfoReferenceTest extend
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
+ private DocumentBuilder documentBuilder;
+
private final String idControl = "abc123";
private final String uriControl = "http://www.example.org/keyinfo.xml";
+ public KeyInfoReferenceTest() throws Exception {
+ documentBuilder = XMLUtils.createDocumentBuilder(false);
+ }
+
@org.junit.Test
public void testSchema() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(false), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
Element element = keyInfoReference.getElement();
assertEquals("http://www.w3.org/2009/xmldsig11#", element.getNamespaceURI());
@@ -58,13 +66,13 @@ public class KeyInfoReferenceTest extend
@org.junit.Test
public void testURIOnConstruction() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(false), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
assertEquals(uriControl, keyInfoReference.getURI());
}
@org.junit.Test
public void testId() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(false), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
assertEquals("", keyInfoReference.getId());
assertNull(keyInfoReference.getElement().getAttributeNodeNS(null, Constants._ATT_ID));
@@ -87,7 +95,7 @@ public class KeyInfoReferenceTest extend
}
private Document loadXML(String fileName) throws Exception {
- return XMLUtils.parse(new FileInputStream(getControlFilePath(fileName)), false);
+ return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
}
}