You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2005/04/02 20:58:39 UTC
cvs commit: xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations Canonicalizer20010315ExclusiveTest.java Canonicalizer20010315Test.java
raul 2005/04/02 10:58:39
Modified: src_unitTests/org/apache/xml/security/test/c14n/implementations
Canonicalizer20010315ExclusiveTest.java
Canonicalizer20010315Test.java
Log:
move binaryCompare funcionality to the class where this funcionality is needed.
Revision Changes Path
1.11 +5 -5 xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
Index: Canonicalizer20010315ExclusiveTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Canonicalizer20010315ExclusiveTest.java 8 Feb 2004 06:08:22 -0000 1.10
+++ Canonicalizer20010315ExclusiveTest.java 2 Apr 2005 18:58:39 -0000 1.11
@@ -199,7 +199,7 @@
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
"data/org/apache/xml/security/c14n/inExcl/example2_2_1_c14nized.xml") );
byte[] result = c.engineCanonicalizeSubTree(root);
- boolean equals = JavaUtils.binaryCompare(reference, result);
+ boolean equals = java.security.MessageDigest.isEqual(reference, result);
/*
if (!equals) {
@@ -238,7 +238,7 @@
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
"data/org/apache/xml/security/c14n/inExcl/example2_2_2_c14nized.xml"));
byte[] result = c.engineCanonicalizeSubTree(root);
- boolean equals = JavaUtils.binaryCompare(reference, result);
+ boolean equals = java.security.MessageDigest.isEqual(reference, result);
assertTrue(equals);
}
@@ -271,7 +271,7 @@
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
"data/org/apache/xml/security/c14n/inExcl/example2_2_c14nized_exclusive.xml") );
byte[] result = c.engineCanonicalizeSubTree(root);
- boolean equals = JavaUtils.binaryCompare(reference, result);
+ boolean equals = java.security.MessageDigest.isEqual(reference, result);
assertTrue(equals);
}
@@ -304,7 +304,7 @@
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
"data/org/apache/xml/security/c14n/inExcl/example2_2_c14nized_exclusive.xml") );
byte[] result = c.engineCanonicalizeSubTree(root);
- boolean equals = JavaUtils.binaryCompare(reference, result);
+ boolean equals = java.security.MessageDigest.isEqual(reference, result);
assertTrue(equals);
}
@@ -340,7 +340,7 @@
byte[] reference = JavaUtils.getBytesFromFile(
getAbsolutePath("data/org/apache/xml/security/c14n/inExcl/example2_2_3_c14nized_exclusive.xml") );
byte[] result = c.engineCanonicalizeXPathNodeSet(nodes);
- boolean equals = JavaUtils.binaryCompare(reference, result);
+ boolean equals = java.security.MessageDigest.isEqual(reference, result);
if (!equals) {
log.warn("Error output = " + new String(result));
}
1.22 +4 -4 xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java
Index: Canonicalizer20010315Test.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Canonicalizer20010315Test.java 7 Mar 2005 20:39:33 -0000 1.21
+++ Canonicalizer20010315Test.java 2 Apr 2005 18:58:39 -0000 1.22
@@ -667,7 +667,7 @@
InputStream refStream = resolver.resolveEntity(null,
fileRef).getByteStream();
byte refBytes[] = JavaUtils.getBytesFromStream(refStream);
- boolean equal = JavaUtils.binaryCompare(refBytes, c14nBytes);
+ boolean equal = java.security.MessageDigest.isEqual(refBytes, c14nBytes);
assertTrue(equal);
}
@@ -827,7 +827,7 @@
prefix + "/in/testTranslationFromUTF16toUTF8.xml")
.getByteStream();
byte refBytes[] = JavaUtils.getBytesFromStream(refStream);
- boolean equal = JavaUtils.binaryCompare(refBytes, c14nBytes);
+ boolean equal = java.security.MessageDigest.isEqual(refBytes, c14nBytes);
assertTrue("Parser does not translate to UCS character domain", equal);
}
@@ -1091,7 +1091,7 @@
byte result[] = c14nizer.canonicalizeXPathNodeSet(nodes);
byte defined[] = definedOutput.getBytes();
- return JavaUtils.binaryCompare(defined, result);
+ return java.security.MessageDigest.isEqual(defined, result);
}
/**
@@ -1162,7 +1162,7 @@
byte refBytes[] = JavaUtils.getBytesFromFile(fileRef);
// if everything is OK, result is true; we do a binary compare, byte by byte
- boolean result = JavaUtils.binaryCompare(refBytes, c14nBytes);
+ boolean result = java.security.MessageDigest.isEqual(refBytes, c14nBytes);
if (result == false) {
File f = new File(fileOut);