Author: sebb
Date: Sun Mar 30 16:12:06 2008
New Revision: 642837
URL: http://svn.apache.org/viewvc?rev=642837&view=rev
Log:
Local baToHex() method replaced by JOrphanUtils.baToHexString()
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/PackageTest.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java?rev=642837&r1=642836&r2=642837&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
Sun Mar 30 16:12:06 2008
@@ -36,6 +36,7 @@
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
public class MD5HexAssertion extends AbstractTestElement implements
Serializable, Assertion {
@@ -94,18 +95,6 @@
}
// package protected so can be accessed by test class
- static String baToHex(byte ba[]) {
- StringBuffer sb = new StringBuffer(32);
- for (int i = 0; i < ba.length; i++) {
- int j = ba[i] & 0xff;
- if (j < 16)
- sb.append("0");
- sb.append(Integer.toHexString(j));
- }
- return sb.toString();
- }
-
- // package protected so can be accessed by test class
static String baMD5Hex(byte ba[]) {
byte[] md5Result = {};
@@ -116,6 +105,6 @@
} catch (NoSuchAlgorithmException e) {
log.error("", e);
}
- return baToHex(md5Result);
+ return JOrphanUtils.baToHexString(md5Result);
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/PackageTest.java?rev=642837&r1=642836&r2=642837&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/PackageTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/PackageTest.java
Sun Mar 30 16:12:06 2008
@@ -36,11 +36,6 @@
public PackageTest(String arg0) {
super(arg0);
}
- public void testHex() throws Exception {
- assertEquals("00010203", MD5HexAssertion.baToHex(new byte[] {
0, 1, 2, 3 }));
- assertEquals("03020100", MD5HexAssertion.baToHex(new byte[] {
3, 2, 1, 0 }));
- assertEquals("0f807fff", MD5HexAssertion.baToHex(new byte[] {
0xF, -128, 127, -1 }));
- }
public void testMD5() throws Exception {
assertEquals("D41D8CD98F00B204E9800998ECF8427E",
MD5HexAssertion.baMD5Hex(new byte[] {}).toUpperCase());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
